diff --git a/OAS/tapi-connectivity@2020-06-16.yaml b/OAS/tapi-connectivity@2020-06-16.yaml
index 6cc5d390..d801f477 100644
--- a/OAS/tapi-connectivity@2020-06-16.yaml
+++ b/OAS/tapi-connectivity@2020-06-16.yaml
@@ -13110,7 +13110,7 @@ definitions:
   tapi.connectivity.ContextAugmentation3:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -13150,7 +13150,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.CepList"
     x-augmentation:
@@ -13554,7 +13554,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -13987,7 +13987,7 @@ definitions:
   tapi.path.computation.ContextAugmentation2:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -14379,7 +14379,7 @@ definitions:
   tapi.topology.ContextAugmentation4:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-dsr@2020-04-23.yaml b/OAS/tapi-dsr@2020-04-23.yaml
index ed756b3f..da0189cf 100644
--- a/OAS/tapi-dsr@2020-04-23.yaml
+++ b/OAS/tapi-dsr@2020-04-23.yaml
@@ -16125,7 +16125,7 @@ definitions:
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -16165,7 +16165,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
     x-augmentation:
@@ -16591,7 +16591,7 @@ definitions:
   tapi.notification.ContextAugmentation2:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -17019,7 +17019,7 @@ definitions:
   tapi.oam.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      mep-mip-list:
+      tapi-oam:mep-mip-list:
         description: "none"
         $ref: "#/definitions/tapi.oam.MepMipList"
     x-augmentation:
@@ -17028,7 +17028,7 @@ definitions:
   tapi.oam.ContextAugmentation1:
     type: "object"
     properties:
-      oam-context:
+      tapi-oam:oam-context:
         description: "Augments the base TAPI Context with OamService information"
         $ref: "#/definitions/tapi.oam.OamContext"
     x-augmentation:
@@ -17740,7 +17740,7 @@ definitions:
   tapi.path.computation.ContextAugmentation3:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -18132,7 +18132,7 @@ definitions:
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-equipment@2020-04-23.yaml b/OAS/tapi-equipment@2020-04-23.yaml
index a0aa77bc..c73aea41 100644
--- a/OAS/tapi-equipment@2020-04-23.yaml
+++ b/OAS/tapi-equipment@2020-04-23.yaml
@@ -7391,7 +7391,7 @@ definitions:
   tapi.equipment.ContextAugmentation2:
     type: "object"
     properties:
-      physical-context:
+      tapi-equipment:physical-context:
         description: "none"
         $ref: "#/definitions/tapi.equipment.PhysicalContext"
     x-augmentation:
@@ -7567,7 +7567,7 @@ definitions:
   tapi.equipment.NodeAugmentation1:
     type: "object"
     properties:
-      supporting-physical-span:
+      tapi-equipment:supporting-physical-span:
         description: "none"
         $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpan"
     x-augmentation:
@@ -7576,7 +7576,7 @@ definitions:
   tapi.equipment.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      supporting-access-port:
+      tapi-equipment:supporting-access-port:
         description: "none"
         $ref: "#/definitions/tapi.equipment.SupportingAccessPort"
     x-augmentation:
@@ -7764,7 +7764,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -8209,7 +8209,7 @@ definitions:
   tapi.topology.ContextAugmentation3:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-eth@2020-04-23.yaml b/OAS/tapi-eth@2020-04-23.yaml
index f8c04164..f8176122 100644
--- a/OAS/tapi-eth@2020-04-23.yaml
+++ b/OAS/tapi-eth@2020-04-23.yaml
@@ -21269,7 +21269,7 @@ definitions:
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -21309,7 +21309,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
     x-augmentation:
@@ -21743,7 +21743,7 @@ definitions:
   tapi.eth.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
-      eth-connection-end-point-spec:
+      tapi-eth:eth-connection-end-point-spec:
         description: "Augments the base LayerProtocol information in ConnectionEndPoint\
           \ with ETH-specific information"
         $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpec"
@@ -22963,7 +22963,7 @@ definitions:
   tapi.eth.MegAugmentation1:
     type: "object"
     properties:
-      eth-meg-spec:
+      tapi-eth:eth-meg-spec:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMegSpec"
     x-augmentation:
@@ -22972,7 +22972,7 @@ definitions:
   tapi.eth.MepAugmentation1:
     type: "object"
     properties:
-      eth-mep-spec:
+      tapi-eth:eth-mep-spec:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMepSpec"
     x-augmentation:
@@ -22989,7 +22989,7 @@ definitions:
   tapi.eth.MipAugmentation1:
     type: "object"
     properties:
-      eth-mip-spec:
+      tapi-eth:eth-mip-spec:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMipSpec"
     x-augmentation:
@@ -22998,7 +22998,7 @@ definitions:
   tapi.eth.OamJobAugmentation1:
     type: "object"
     properties:
-      eth-link-trace-job:
+      tapi-eth:eth-link-trace-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
     x-augmentation:
@@ -23007,7 +23007,7 @@ definitions:
   tapi.eth.OamJobAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-2way-measurement-job:
+      tapi-eth:eth-on-demand-2way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
     x-augmentation:
@@ -23016,7 +23016,7 @@ definitions:
   tapi.eth.OamJobAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-1way-measurement-job:
+      tapi-eth:eth-pro-active-1way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
     x-augmentation:
@@ -23025,7 +23025,7 @@ definitions:
   tapi.eth.OamJobAugmentation4:
     type: "object"
     properties:
-      eth-pro-active-2way-measurement-job:
+      tapi-eth:eth-pro-active-2way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
     x-augmentation:
@@ -23034,7 +23034,7 @@ definitions:
   tapi.eth.OamJobAugmentation5:
     type: "object"
     properties:
-      eth-test-job:
+      tapi-eth:eth-test-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthTestJob"
     x-augmentation:
@@ -23043,7 +23043,7 @@ definitions:
   tapi.eth.OamJobAugmentation6:
     type: "object"
     properties:
-      eth-loopback-job:
+      tapi-eth:eth-loopback-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLoopbackJob"
     x-augmentation:
@@ -23052,7 +23052,7 @@ definitions:
   tapi.eth.OamJobAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1way-measurement-job:
+      tapi-eth:eth-on-demand-1way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
     x-augmentation:
@@ -23135,7 +23135,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation1:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      tapi-eth:eth-pro-active-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
@@ -23144,7 +23144,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation10:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      tapi-eth:eth-pro-active-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
@@ -23153,7 +23153,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation11:
     type: "object"
     properties:
-      eth-test-result-data:
+      tapi-eth:eth-test-result-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthTestResultData"
     x-augmentation:
@@ -23162,7 +23162,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      tapi-eth:eth-on-demand-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
@@ -23171,7 +23171,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      tapi-eth:eth-pro-active-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
@@ -23180,7 +23180,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation4:
     type: "object"
     properties:
-      eth-link-trace-result-data:
+      tapi-eth:eth-link-trace-result-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
     x-augmentation:
@@ -23189,7 +23189,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation5:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      tapi-eth:eth-on-demand-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
@@ -23198,7 +23198,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation6:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      tapi-eth:eth-pro-active-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
@@ -23207,7 +23207,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      tapi-eth:eth-on-demand-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
@@ -23216,7 +23216,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation8:
     type: "object"
     properties:
-      eth-loopback-result-data:
+      tapi-eth:eth-loopback-result-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
     x-augmentation:
@@ -23225,7 +23225,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation9:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      tapi-eth:eth-on-demand-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
@@ -23234,7 +23234,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation1:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      tapi-eth:eth-pro-active-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
@@ -23243,7 +23243,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation2:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      tapi-eth:eth-on-demand-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
@@ -23252,7 +23252,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      tapi-eth:eth-pro-active-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
@@ -23261,7 +23261,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation4:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      tapi-eth:eth-on-demand-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
@@ -23270,7 +23270,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation5:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      tapi-eth:eth-on-demand-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
@@ -23279,7 +23279,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation6:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      tapi-eth:eth-pro-active-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
@@ -23288,7 +23288,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      tapi-eth:eth-on-demand-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
@@ -23297,7 +23297,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation8:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      tapi-eth:eth-pro-active-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
@@ -23306,7 +23306,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation1:
     type: "object"
     properties:
-      eth-lm-threshold-data:
+      tapi-eth:eth-lm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLmThresholdData"
     x-augmentation:
@@ -23315,7 +23315,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation2:
     type: "object"
     properties:
-      eth-dm-threshold-data:
+      tapi-eth:eth-dm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthDmThresholdData"
     x-augmentation:
@@ -23324,7 +23324,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation3:
     type: "object"
     properties:
-      eth-1-dm-threshold-data:
+      tapi-eth:eth-1-dm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
     x-augmentation:
@@ -23333,7 +23333,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation4:
     type: "object"
     properties:
-      eth-1-lm-threshold-data:
+      tapi-eth:eth-1-lm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
     x-augmentation:
@@ -23648,7 +23648,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -24076,7 +24076,7 @@ definitions:
   tapi.oam.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      mep-mip-list:
+      tapi-oam:mep-mip-list:
         description: "none"
         $ref: "#/definitions/tapi.oam.MepMipList"
     x-augmentation:
@@ -24085,7 +24085,7 @@ definitions:
   tapi.oam.ContextAugmentation2:
     type: "object"
     properties:
-      oam-context:
+      tapi-oam:oam-context:
         description: "Augments the base TAPI Context with OamService information"
         $ref: "#/definitions/tapi.oam.context.OamContext"
     x-augmentation:
@@ -24969,7 +24969,7 @@ definitions:
   tapi.path.computation.ContextAugmentation3:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -25361,7 +25361,7 @@ definitions:
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-notification@2020-06-16.yaml b/OAS/tapi-notification@2020-06-16.yaml
index 3d1e76ae..3ac4e85d 100644
--- a/OAS/tapi-notification@2020-06-16.yaml
+++ b/OAS/tapi-notification@2020-06-16.yaml
@@ -1969,7 +1969,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
diff --git a/OAS/tapi-oam@2020-04-23.yaml b/OAS/tapi-oam@2020-04-23.yaml
index 55c525c6..71accfee 100644
--- a/OAS/tapi-oam@2020-04-23.yaml
+++ b/OAS/tapi-oam@2020-04-23.yaml
@@ -16108,7 +16108,7 @@ definitions:
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -16148,7 +16148,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
     x-augmentation:
@@ -16574,7 +16574,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -17002,7 +17002,7 @@ definitions:
   tapi.oam.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      mep-mip-list:
+      tapi-oam:mep-mip-list:
         description: "none"
         $ref: "#/definitions/tapi.oam.MepMipList"
     x-augmentation:
@@ -17011,7 +17011,7 @@ definitions:
   tapi.oam.ContextAugmentation2:
     type: "object"
     properties:
-      oam-context:
+      tapi-oam:oam-context:
         description: "Augments the base TAPI Context with OamService information"
         $ref: "#/definitions/tapi.oam.OamContext"
     x-augmentation:
@@ -17723,7 +17723,7 @@ definitions:
   tapi.path.computation.ContextAugmentation3:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -18115,7 +18115,7 @@ definitions:
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-odu@2020-04-23.yaml b/OAS/tapi-odu@2020-04-23.yaml
index cc67f6cc..0a7cec28 100644
--- a/OAS/tapi-odu@2020-04-23.yaml
+++ b/OAS/tapi-odu@2020-04-23.yaml
@@ -17222,7 +17222,7 @@ definitions:
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -17262,7 +17262,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation2:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
     x-augmentation:
@@ -17722,7 +17722,7 @@ definitions:
   tapi.notification.ContextAugmentation2:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -18150,7 +18150,7 @@ definitions:
   tapi.oam.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      mep-mip-list:
+      tapi-oam:mep-mip-list:
         description: "none"
         $ref: "#/definitions/tapi.oam.MepMipList"
     x-augmentation:
@@ -18159,7 +18159,7 @@ definitions:
   tapi.oam.ContextAugmentation1:
     type: "object"
     properties:
-      oam-context:
+      tapi-oam:oam-context:
         description: "Augments the base TAPI Context with OamService information"
         $ref: "#/definitions/tapi.oam.OamContext"
     x-augmentation:
@@ -18907,7 +18907,7 @@ definitions:
   tapi.odu.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
-      odu-connection-end-point-spec:
+      tapi-odu:odu-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
     x-augmentation:
@@ -18938,7 +18938,7 @@ definitions:
   tapi.odu.EndPointAugmentation1:
     type: "object"
     properties:
-      odu-connectivity-service-end-point-spec:
+      tapi-odu:odu-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -18987,7 +18987,7 @@ definitions:
   tapi.odu.MepAugmentation1:
     type: "object"
     properties:
-      odu-connection-end-point-spec:
+      tapi-odu:odu-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
     x-augmentation:
@@ -18996,7 +18996,7 @@ definitions:
   tapi.odu.MipAugmentation1:
     type: "object"
     properties:
-      odu-mip-spec:
+      tapi-odu:odu-mip-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduMipSpec"
     x-augmentation:
@@ -19544,7 +19544,7 @@ definitions:
   tapi.odu.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      odu-node-edge-point-spec:
+      tapi-odu:odu-node-edge-point-spec:
         description: "Augments the base LayerProtocol information in NodeEdgePoint\
           \ with ODU-specific information"
         $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
@@ -19596,7 +19596,7 @@ definitions:
   tapi.path.computation.ContextAugmentation3:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -19988,7 +19988,7 @@ definitions:
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-path-computation@2020-04-23.yaml b/OAS/tapi-path-computation@2020-04-23.yaml
index 3ab9abc5..3146bf53 100644
--- a/OAS/tapi-path-computation@2020-04-23.yaml
+++ b/OAS/tapi-path-computation@2020-04-23.yaml
@@ -8518,7 +8518,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -8951,7 +8951,7 @@ definitions:
   tapi.path.computation.ContextAugmentation2:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -9343,7 +9343,7 @@ definitions:
   tapi.topology.ContextAugmentation3:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-photonic-media@2020-06-16.yaml b/OAS/tapi-photonic-media@2020-06-16.yaml
index 0384d566..661c5aad 100644
--- a/OAS/tapi-photonic-media@2020-06-16.yaml
+++ b/OAS/tapi-photonic-media@2020-06-16.yaml
@@ -24352,7 +24352,7 @@ definitions:
   tapi.connectivity.ContextAugmentation4:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -24392,7 +24392,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation2:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
     x-augmentation:
@@ -24956,7 +24956,7 @@ definitions:
   tapi.notification.ContextAugmentation2:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -25384,7 +25384,7 @@ definitions:
   tapi.oam.ConnectionEndPointAugmentation6:
     type: "object"
     properties:
-      mep-mip-list:
+      tapi-oam:mep-mip-list:
         description: "none"
         $ref: "#/definitions/tapi.oam.MepMipList"
     x-augmentation:
@@ -25393,7 +25393,7 @@ definitions:
   tapi.oam.ContextAugmentation1:
     type: "object"
     properties:
-      oam-context:
+      tapi-oam:oam-context:
         description: "Augments the base TAPI Context with OamService information"
         $ref: "#/definitions/tapi.oam.OamContext"
     x-augmentation:
@@ -26141,7 +26141,7 @@ definitions:
   tapi.odu.ConnectionEndPointAugmentation7:
     type: "object"
     properties:
-      odu-connection-end-point-spec:
+      tapi-odu:odu-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
     x-augmentation:
@@ -26172,7 +26172,7 @@ definitions:
   tapi.odu.EndPointAugmentation5:
     type: "object"
     properties:
-      odu-connectivity-service-end-point-spec:
+      tapi-odu:odu-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -26221,7 +26221,7 @@ definitions:
   tapi.odu.MepAugmentation1:
     type: "object"
     properties:
-      odu-connection-end-point-spec:
+      tapi-odu:odu-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
     x-augmentation:
@@ -26230,7 +26230,7 @@ definitions:
   tapi.odu.MipAugmentation1:
     type: "object"
     properties:
-      odu-mip-spec:
+      tapi-odu:odu-mip-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduMipSpec"
     x-augmentation:
@@ -26778,7 +26778,7 @@ definitions:
   tapi.odu.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      odu-node-edge-point-spec:
+      tapi-odu:odu-node-edge-point-spec:
         description: "Augments the base LayerProtocol information in NodeEdgePoint\
           \ with ODU-specific information"
         $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
@@ -26830,7 +26830,7 @@ definitions:
   tapi.path.computation.ContextAugmentation3:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -27275,7 +27275,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      otsi-connection-end-point-spec:
+      tapi-photonic-media:otsi-connection-end-point-spec:
         description: "Augments the base LayerProtocol information in ConnectionEndPoint\
           \ with OCH-specific information"
         $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
@@ -27285,7 +27285,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
-      media-channel-assembly-spec:
+      tapi-photonic-media:media-channel-assembly-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
     x-augmentation:
@@ -27294,7 +27294,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation3:
     type: "object"
     properties:
-      media-channel-connection-end-point-spec:
+      tapi-photonic-media:media-channel-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
     x-augmentation:
@@ -27303,7 +27303,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation4:
     type: "object"
     properties:
-      otsi-assembly-connection-end-point-spec:
+      tapi-photonic-media:otsi-assembly-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
     x-augmentation:
@@ -27312,7 +27312,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation5:
     type: "object"
     properties:
-      ots-connection-end-point-spec:
+      tapi-photonic-media:ots-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
     x-augmentation:
@@ -27321,7 +27321,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation1:
     type: "object"
     properties:
-      otsia-connectivity-service-end-point-spec:
+      tapi-photonic-media:otsia-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -27330,7 +27330,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation2:
     type: "object"
     properties:
-      otsi-connectivity-service-end-point-spec:
+      tapi-photonic-media:otsi-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -27339,7 +27339,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation3:
     type: "object"
     properties:
-      media-channel-connectivity-service-end-point-spec:
+      tapi-photonic-media:media-channel-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -27348,7 +27348,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation4:
     type: "object"
     properties:
-      mca-connectivity-service-end-point-spec:
+      tapi-photonic-media:mca-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -27593,7 +27593,7 @@ definitions:
   tapi.photonic.media.NodeEdgePointAugmentation1:
     type: "object"
     properties:
-      media-channel-node-edge-point-spec:
+      tapi-photonic-media:media-channel-node-edge-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
     x-augmentation:
@@ -27802,7 +27802,7 @@ definitions:
   tapi.photonic.media.OwnedNodeEdgePointAugmentation3:
     type: "object"
     properties:
-      media-channel-node-edge-point-spec:
+      tapi-photonic-media:media-channel-node-edge-point-spec:
         description: "Augments the base LayerProtocol information in NodeEdgePoint\
           \ with OCH-specific information"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
@@ -27907,7 +27907,7 @@ definitions:
   tapi.photonic.media.ServiceInterfacePointAugmentation1:
     type: "object"
     properties:
-      otsi-service-interface-point-spec:
+      tapi-photonic-media:otsi-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
     x-augmentation:
@@ -27916,7 +27916,7 @@ definitions:
   tapi.photonic.media.ServiceInterfacePointAugmentation2:
     type: "object"
     properties:
-      media-channel-service-interface-point-spec:
+      tapi-photonic-media:media-channel-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
     x-augmentation:
@@ -27925,7 +27925,7 @@ definitions:
   tapi.photonic.media.SipAugmentation1:
     type: "object"
     properties:
-      otsi-service-interface-point-spec:
+      tapi-photonic-media:otsi-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
     x-augmentation:
@@ -27934,7 +27934,7 @@ definitions:
   tapi.photonic.media.SipAugmentation2:
     type: "object"
     properties:
-      media-channel-service-interface-point-spec:
+      tapi-photonic-media:media-channel-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
     x-augmentation:
@@ -28005,7 +28005,7 @@ definitions:
   tapi.topology.ContextAugmentation5:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-streaming@2020-06-16.yaml b/OAS/tapi-streaming@2020-06-16.yaml
index c947d1ee..d2a3d5b3 100644
--- a/OAS/tapi-streaming@2020-06-16.yaml
+++ b/OAS/tapi-streaming@2020-06-16.yaml
@@ -33456,7 +33456,7 @@ definitions:
   tapi.connectivity.ContextAugmentation8:
     type: "object"
     properties:
-      connectivity-context:
+      tapi-connectivity:connectivity-context:
         description: "Augments the base TAPI Context with ConnectivityService information"
         $ref: "#/definitions/tapi.connectivity.ConnectivityContext"
     x-augmentation:
@@ -33496,7 +33496,7 @@ definitions:
   tapi.connectivity.OwnedNodeEdgePointAugmentation4:
     type: "object"
     properties:
-      cep-list:
+      tapi-connectivity:cep-list:
         description: "none"
         $ref: "#/definitions/tapi.connectivity.context.topologycontext.topology.node.ownednodeedgepoint.CepList"
     x-augmentation:
@@ -34283,7 +34283,7 @@ definitions:
   tapi.equipment.ContextAugmentation7:
     type: "object"
     properties:
-      physical-context:
+      tapi-equipment:physical-context:
         description: "none"
         $ref: "#/definitions/tapi.equipment.PhysicalContext"
     x-augmentation:
@@ -34459,7 +34459,7 @@ definitions:
   tapi.equipment.NodeAugmentation1:
     type: "object"
     properties:
-      supporting-physical-span:
+      tapi-equipment:supporting-physical-span:
         description: "none"
         $ref: "#/definitions/tapi.equipment.SupportingPhysicalSpan"
     x-augmentation:
@@ -34468,7 +34468,7 @@ definitions:
   tapi.equipment.OwnedNodeEdgePointAugmentation3:
     type: "object"
     properties:
-      supporting-access-port:
+      tapi-equipment:supporting-access-port:
         description: "none"
         $ref: "#/definitions/tapi.equipment.SupportingAccessPort"
     x-augmentation:
@@ -34663,7 +34663,7 @@ definitions:
   tapi.eth.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
-      eth-connection-end-point-spec:
+      tapi-eth:eth-connection-end-point-spec:
         description: "Augments the base LayerProtocol information in ConnectionEndPoint\
           \ with ETH-specific information"
         $ref: "#/definitions/tapi.eth.EthConnectionEndPointSpec"
@@ -35883,7 +35883,7 @@ definitions:
   tapi.eth.MegAugmentation1:
     type: "object"
     properties:
-      eth-meg-spec:
+      tapi-eth:eth-meg-spec:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMegSpec"
     x-augmentation:
@@ -35892,7 +35892,7 @@ definitions:
   tapi.eth.MepAugmentation1:
     type: "object"
     properties:
-      eth-mep-spec:
+      tapi-eth:eth-mep-spec:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMepSpec"
     x-augmentation:
@@ -35909,7 +35909,7 @@ definitions:
   tapi.eth.MipAugmentation1:
     type: "object"
     properties:
-      eth-mip-spec:
+      tapi-eth:eth-mip-spec:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthMipSpec"
     x-augmentation:
@@ -35918,7 +35918,7 @@ definitions:
   tapi.eth.OamJobAugmentation1:
     type: "object"
     properties:
-      eth-on-demand-2way-measurement-job:
+      tapi-eth:eth-on-demand-2way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand2wayMeasurementJob"
     x-augmentation:
@@ -35927,7 +35927,7 @@ definitions:
   tapi.eth.OamJobAugmentation2:
     type: "object"
     properties:
-      eth-loopback-job:
+      tapi-eth:eth-loopback-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLoopbackJob"
     x-augmentation:
@@ -35936,7 +35936,7 @@ definitions:
   tapi.eth.OamJobAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-2way-measurement-job:
+      tapi-eth:eth-pro-active-2way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive2wayMeasurementJob"
     x-augmentation:
@@ -35945,7 +35945,7 @@ definitions:
   tapi.eth.OamJobAugmentation4:
     type: "object"
     properties:
-      eth-on-demand-1way-measurement-job:
+      tapi-eth:eth-on-demand-1way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1wayMeasurementJob"
     x-augmentation:
@@ -35954,7 +35954,7 @@ definitions:
   tapi.eth.OamJobAugmentation5:
     type: "object"
     properties:
-      eth-pro-active-1way-measurement-job:
+      tapi-eth:eth-pro-active-1way-measurement-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1wayMeasurementJob"
     x-augmentation:
@@ -35963,7 +35963,7 @@ definitions:
   tapi.eth.OamJobAugmentation6:
     type: "object"
     properties:
-      eth-test-job:
+      tapi-eth:eth-test-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthTestJob"
     x-augmentation:
@@ -35972,7 +35972,7 @@ definitions:
   tapi.eth.OamJobAugmentation7:
     type: "object"
     properties:
-      eth-link-trace-job:
+      tapi-eth:eth-link-trace-job:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLinkTraceJob"
     x-augmentation:
@@ -36055,7 +36055,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation1:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      tapi-eth:eth-pro-active-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
@@ -36064,7 +36064,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation10:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      tapi-eth:eth-on-demand-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
@@ -36073,7 +36073,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation11:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      tapi-eth:eth-pro-active-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
@@ -36082,7 +36082,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation2:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      tapi-eth:eth-pro-active-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
@@ -36091,7 +36091,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation3:
     type: "object"
     properties:
-      eth-loopback-result-data:
+      tapi-eth:eth-loopback-result-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLoopbackResultData"
     x-augmentation:
@@ -36100,7 +36100,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation4:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      tapi-eth:eth-on-demand-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
@@ -36109,7 +36109,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation5:
     type: "object"
     properties:
-      eth-link-trace-result-data:
+      tapi-eth:eth-link-trace-result-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLinkTraceResultData"
     x-augmentation:
@@ -36118,7 +36118,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation6:
     type: "object"
     properties:
-      eth-test-result-data:
+      tapi-eth:eth-test-result-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthTestResultData"
     x-augmentation:
@@ -36127,7 +36127,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation7:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      tapi-eth:eth-on-demand-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
@@ -36136,7 +36136,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation8:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      tapi-eth:eth-on-demand-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
@@ -36145,7 +36145,7 @@ definitions:
   tapi.eth.PmCurrentDataAugmentation9:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      tapi-eth:eth-pro-active-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
@@ -36154,7 +36154,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation1:
     type: "object"
     properties:
-      eth-on-demand-lm-performance-data:
+      tapi-eth:eth-on-demand-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandLmPerformanceData"
     x-augmentation:
@@ -36163,7 +36163,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation2:
     type: "object"
     properties:
-      eth-pro-active-1-lm-performance-data:
+      tapi-eth:eth-pro-active-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1LmPerformanceData"
     x-augmentation:
@@ -36172,7 +36172,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation3:
     type: "object"
     properties:
-      eth-pro-active-dm-performance-data:
+      tapi-eth:eth-pro-active-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveDmPerformanceData"
     x-augmentation:
@@ -36181,7 +36181,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation4:
     type: "object"
     properties:
-      eth-on-demand-1-dm-performance-data:
+      tapi-eth:eth-on-demand-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1DmPerformanceData"
     x-augmentation:
@@ -36190,7 +36190,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation5:
     type: "object"
     properties:
-      eth-pro-active-1-dm-performance-data:
+      tapi-eth:eth-pro-active-1-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActive1DmPerformanceData"
     x-augmentation:
@@ -36199,7 +36199,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation6:
     type: "object"
     properties:
-      eth-on-demand-1-lm-performance-data:
+      tapi-eth:eth-on-demand-1-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemand1LmPerformanceData"
     x-augmentation:
@@ -36208,7 +36208,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation7:
     type: "object"
     properties:
-      eth-pro-active-lm-performance-data:
+      tapi-eth:eth-pro-active-lm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthProActiveLmPerformanceData"
     x-augmentation:
@@ -36217,7 +36217,7 @@ definitions:
   tapi.eth.PmHistoryDataAugmentation8:
     type: "object"
     properties:
-      eth-on-demand-dm-performance-data:
+      tapi-eth:eth-on-demand-dm-performance-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthOnDemandDmPerformanceData"
     x-augmentation:
@@ -36226,7 +36226,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation1:
     type: "object"
     properties:
-      eth-1-dm-threshold-data:
+      tapi-eth:eth-1-dm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.Eth1DmThresholdData"
     x-augmentation:
@@ -36235,7 +36235,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation2:
     type: "object"
     properties:
-      eth-1-lm-threshold-data:
+      tapi-eth:eth-1-lm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.Eth1LmThresholdData"
     x-augmentation:
@@ -36244,7 +36244,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation3:
     type: "object"
     properties:
-      eth-dm-threshold-data:
+      tapi-eth:eth-dm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthDmThresholdData"
     x-augmentation:
@@ -36253,7 +36253,7 @@ definitions:
   tapi.eth.PmThresholdDataAugmentation4:
     type: "object"
     properties:
-      eth-lm-threshold-data:
+      tapi-eth:eth-lm-threshold-data:
         description: "none"
         $ref: "#/definitions/tapi.eth.EthLmThresholdData"
     x-augmentation:
@@ -36568,7 +36568,7 @@ definitions:
   tapi.notification.ContextAugmentation4:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -36996,7 +36996,7 @@ definitions:
   tapi.oam.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      mep-mip-list:
+      tapi-oam:mep-mip-list:
         description: "none"
         $ref: "#/definitions/tapi.oam.MepMipList"
     x-augmentation:
@@ -37005,7 +37005,7 @@ definitions:
   tapi.oam.ContextAugmentation3:
     type: "object"
     properties:
-      oam-context:
+      tapi-oam:oam-context:
         description: "Augments the base TAPI Context with OamService information"
         $ref: "#/definitions/tapi.oam.context.OamContext"
     x-augmentation:
@@ -37886,7 +37886,7 @@ definitions:
   tapi.odu.ConnectionEndPointAugmentation3:
     type: "object"
     properties:
-      odu-connection-end-point-spec:
+      tapi-odu:odu-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
     x-augmentation:
@@ -37917,7 +37917,7 @@ definitions:
   tapi.odu.EndPointAugmentation1:
     type: "object"
     properties:
-      odu-connectivity-service-end-point-spec:
+      tapi-odu:odu-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -37966,7 +37966,7 @@ definitions:
   tapi.odu.MepAugmentation2:
     type: "object"
     properties:
-      odu-connection-end-point-spec:
+      tapi-odu:odu-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduConnectionEndPointSpec"
     x-augmentation:
@@ -37975,7 +37975,7 @@ definitions:
   tapi.odu.MipAugmentation2:
     type: "object"
     properties:
-      odu-mip-spec:
+      tapi-odu:odu-mip-spec:
         description: "none"
         $ref: "#/definitions/tapi.odu.OduMipSpec"
     x-augmentation:
@@ -38523,7 +38523,7 @@ definitions:
   tapi.odu.OwnedNodeEdgePointAugmentation1:
     type: "object"
     properties:
-      odu-node-edge-point-spec:
+      tapi-odu:odu-node-edge-point-spec:
         description: "Augments the base LayerProtocol information in NodeEdgePoint\
           \ with ODU-specific information"
         $ref: "#/definitions/tapi.odu.OduNodeEdgePointSpec"
@@ -38575,7 +38575,7 @@ definitions:
   tapi.path.computation.ContextAugmentation5:
     type: "object"
     properties:
-      path-computation-context:
+      tapi-path-computation:path-computation-context:
         description: "Augments the base TAPI Context with PathComputationService information"
         $ref: "#/definitions/tapi.path.computation.PathComputationContext"
     x-augmentation:
@@ -39020,7 +39020,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation1:
     type: "object"
     properties:
-      otsi-assembly-connection-end-point-spec:
+      tapi-photonic-media:otsi-assembly-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
     x-augmentation:
@@ -39029,7 +39029,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation2:
     type: "object"
     properties:
-      media-channel-connection-end-point-spec:
+      tapi-photonic-media:media-channel-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
     x-augmentation:
@@ -39038,7 +39038,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation3:
     type: "object"
     properties:
-      otsi-connection-end-point-spec:
+      tapi-photonic-media:otsi-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
     x-augmentation:
@@ -39047,7 +39047,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation4:
     type: "object"
     properties:
-      ots-connection-end-point-spec:
+      tapi-photonic-media:ots-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsConnectionEndPointSpec"
     x-augmentation:
@@ -39056,7 +39056,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation5:
     type: "object"
     properties:
-      media-channel-connection-end-point-spec:
+      tapi-photonic-media:media-channel-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectionEndPointSpec"
     x-augmentation:
@@ -39065,7 +39065,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation6:
     type: "object"
     properties:
-      otsi-connection-end-point-spec:
+      tapi-photonic-media:otsi-connection-end-point-spec:
         description: "Augments the base LayerProtocol information in ConnectionEndPoint\
           \ with OCH-specific information"
         $ref: "#/definitions/tapi.photonic.media.OtsiConnectionEndPointSpec"
@@ -39075,7 +39075,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation7:
     type: "object"
     properties:
-      otsi-assembly-connection-end-point-spec:
+      tapi-photonic-media:otsi-assembly-connection-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiAssemblyConnectionEndPointSpec"
     x-augmentation:
@@ -39084,7 +39084,7 @@ definitions:
   tapi.photonic.media.ConnectionEndPointAugmentation8:
     type: "object"
     properties:
-      media-channel-assembly-spec:
+      tapi-photonic-media:media-channel-assembly-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelAssemblySpec"
     x-augmentation:
@@ -39093,7 +39093,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation1:
     type: "object"
     properties:
-      media-channel-connectivity-service-end-point-spec:
+      tapi-photonic-media:media-channel-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -39102,7 +39102,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation2:
     type: "object"
     properties:
-      mca-connectivity-service-end-point-spec:
+      tapi-photonic-media:mca-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.McaConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -39111,7 +39111,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation3:
     type: "object"
     properties:
-      otsi-connectivity-service-end-point-spec:
+      tapi-photonic-media:otsi-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -39120,7 +39120,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation4:
     type: "object"
     properties:
-      media-channel-connectivity-service-end-point-spec:
+      tapi-photonic-media:media-channel-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -39129,7 +39129,7 @@ definitions:
   tapi.photonic.media.EndPointAugmentation5:
     type: "object"
     properties:
-      otsia-connectivity-service-end-point-spec:
+      tapi-photonic-media:otsia-connectivity-service-end-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiaConnectivityServiceEndPointSpec"
     x-augmentation:
@@ -39374,7 +39374,7 @@ definitions:
   tapi.photonic.media.NodeEdgePointAugmentation1:
     type: "object"
     properties:
-      media-channel-node-edge-point-spec:
+      tapi-photonic-media:media-channel-node-edge-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
     x-augmentation:
@@ -39583,7 +39583,7 @@ definitions:
   tapi.photonic.media.OwnedNodeEdgePointAugmentation2:
     type: "object"
     properties:
-      media-channel-node-edge-point-spec:
+      tapi-photonic-media:media-channel-node-edge-point-spec:
         description: "Augments the base LayerProtocol information in NodeEdgePoint\
           \ with OCH-specific information"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelNodeEdgePointSpec"
@@ -39688,7 +39688,7 @@ definitions:
   tapi.photonic.media.ServiceInterfacePointAugmentation1:
     type: "object"
     properties:
-      media-channel-service-interface-point-spec:
+      tapi-photonic-media:media-channel-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
     x-augmentation:
@@ -39697,7 +39697,7 @@ definitions:
   tapi.photonic.media.ServiceInterfacePointAugmentation2:
     type: "object"
     properties:
-      otsi-service-interface-point-spec:
+      tapi-photonic-media:otsi-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
     x-augmentation:
@@ -39706,7 +39706,7 @@ definitions:
   tapi.photonic.media.SipAugmentation1:
     type: "object"
     properties:
-      otsi-service-interface-point-spec:
+      tapi-photonic-media:otsi-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.OtsiServiceInterfacePointSpec"
     x-augmentation:
@@ -39715,7 +39715,7 @@ definitions:
   tapi.photonic.media.SipAugmentation2:
     type: "object"
     properties:
-      media-channel-service-interface-point-spec:
+      tapi-photonic-media:media-channel-service-interface-point-spec:
         description: "none"
         $ref: "#/definitions/tapi.photonic.media.MediaChannelServiceInterfacePointSpec"
     x-augmentation:
@@ -39849,7 +39849,7 @@ definitions:
   tapi.streaming.ContextAugmentation1:
     type: "object"
     properties:
-      stream-admin-context:
+      tapi-streaming:stream-admin-context:
         description: "none"
         $ref: "#/definitions/tapi.streaming.StreamAdminContext"
     x-augmentation:
@@ -39858,7 +39858,7 @@ definitions:
   tapi.streaming.ContextAugmentation2:
     type: "object"
     properties:
-      stream-context:
+      tapi-streaming:stream-context:
         description: "none"
         $ref: "#/definitions/tapi.streaming.context.StreamContext"
     x-augmentation:
@@ -40008,7 +40008,7 @@ definitions:
   tapi.streaming.SupportedStreamTypeAugmentation1:
     type: "object"
     properties:
-      compacted-log-details:
+      tapi-streaming:compacted-log-details:
         description: "none"
         $ref: "#/definitions/tapi.streaming.CompactedLogDetails"
     x-augmentation:
@@ -40017,7 +40017,7 @@ definitions:
   tapi.streaming.SupportedStreamTypeAugmentation2:
     type: "object"
     properties:
-      connection-protocol-details:
+      tapi-streaming:connection-protocol-details:
         description: "none"
         $ref: "#/definitions/tapi.streaming.ConnectionProtocolDetails"
     x-augmentation:
@@ -40107,7 +40107,7 @@ definitions:
   tapi.topology.ContextAugmentation9:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
@@ -40954,7 +40954,7 @@ definitions:
   tapi.virtual.network.ContextAugmentation6:
     type: "object"
     properties:
-      virtual-network-context:
+      tapi-virtual-network:virtual-network-context:
         description: "Augments the base TAPI Context with VirtualNetworkService information"
         $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
     x-augmentation:
diff --git a/OAS/tapi-topology@2020-04-23.yaml b/OAS/tapi-topology@2020-04-23.yaml
index ca35d677..505819c7 100644
--- a/OAS/tapi-topology@2020-04-23.yaml
+++ b/OAS/tapi-topology@2020-04-23.yaml
@@ -5766,7 +5766,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -6211,7 +6211,7 @@ definitions:
   tapi.topology.ContextAugmentation2:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
diff --git a/OAS/tapi-virtual-network@2020-06-16.yaml b/OAS/tapi-virtual-network@2020-06-16.yaml
index 1b1134f2..345bb5a4 100644
--- a/OAS/tapi-virtual-network@2020-06-16.yaml
+++ b/OAS/tapi-virtual-network@2020-06-16.yaml
@@ -7846,7 +7846,7 @@ definitions:
   tapi.notification.ContextAugmentation1:
     type: "object"
     properties:
-      notification-context:
+      tapi-notification:notification-context:
         description: "Augments the base TAPI Context with NotificationService information"
         $ref: "#/definitions/tapi.notification.NotificationContext"
     x-augmentation:
@@ -8291,7 +8291,7 @@ definitions:
   tapi.topology.ContextAugmentation3:
     type: "object"
     properties:
-      topology-context:
+      tapi-topology:topology-context:
         description: "Augments the base TAPI Context with TopologyService information"
         $ref: "#/definitions/tapi.topology.TopologyContext"
     x-augmentation:
@@ -9057,7 +9057,7 @@ definitions:
   tapi.virtual.network.ContextAugmentation2:
     type: "object"
     properties:
-      virtual-network-context:
+      tapi-virtual-network:virtual-network-context:
         description: "Augments the base TAPI Context with VirtualNetworkService information"
         $ref: "#/definitions/tapi.virtual.network.VirtualNetworkContext"
     x-augmentation: