diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 7a11bca8e482056c1f6e004e7f05c83799b441af..979e81619f9d5fc71b87c223719bc559e13d43c6 100644
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -423,6 +423,7 @@ components:
             - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm'
             - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm'
             - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm'
+            - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm'            
 
     MoiChange:
       type: object
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 131f97f2a66bdfe7c02f4c450eebc523ffc617c2..c57e9a26165fc16a03cb40de40deb557fe651eef 100644
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -538,6 +538,8 @@ components:
               - N10
               - N11
               - S5-C
+              - N16
+              - N16a
         SMSFInterfaces:
           type: array
           items:
@@ -593,7 +595,7 @@ components:
             enum:
               - F1-C
 
-    listOfNeTypes-Type:
+    listOfNETypes-Type:
       description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details.
       type: array
       items:
@@ -622,7 +624,7 @@ components:
           - HSS
           - UDM
 
-    plmnTarget-Type:
+    pLMNTarget-Type:
       type: object
       description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details.
       properties:
@@ -849,14 +851,14 @@ components:
               - UEauthentication
               - EventExposure
     
-    anonymizationOfMdtData-Type:
+    anonymizationOfMDTData-Type:
       description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12.
       type: string
       enum:
         - NO_IDENTITY
         - TAC_OF_IMEI
     
-    collectionPeriodRrmLte-Type:
+    collectionPeriodRRMLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.20.
       type: string
       enum:
@@ -871,7 +873,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Lte-Type:
+    collectionPeriodM6LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.32.
       type: string
       enum:
@@ -880,13 +882,13 @@ components:
         - 5120ms
         - 10240ms
 
-    collectionPeriodM7Lte-Type:
+    collectionPeriodM7LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.33.
       type: integer
       minimum: 1
       maximum: 60
 
-    collectionPeriodRrmUmts-Type:
+    collectionPeriodRRMUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.21.
       type: string
       enum:
@@ -899,7 +901,7 @@ components:
         - 4000ms
         - 6000ms
     
-    collectionPeriodRrmNr-Type:
+    collectionPeriodRRMNR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.30.
       type: string
       enum:
@@ -909,7 +911,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Nr-Type:
+    collectionPeriodM6NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.34.
       type: string
       enum:
@@ -928,7 +930,7 @@ components:
         - 12min
         - 30min
 
-    collectionPeriodM7Nr-Type:
+    collectionPeriodM7NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.35.
       type: integer
       minimum: 1
@@ -1128,7 +1130,7 @@ components:
         - 2560ms
         - 5120ms
 
-    measurementPeriodLte-Type:
+    measurementPeriodLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.23.
       type: string
       enum:
@@ -1138,7 +1140,7 @@ components:
         - 10240ms
         - 1min
 
-    measurementPeriodUmts-Type:
+    measurementPeriodUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.22.
       type: string
       enum:
@@ -1164,13 +1166,13 @@ components:
         - CPICH_RSCP
         - PathLoss
 
-    eventThresholdUphUmts-Type:
+    eventThresholdUphUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.A.
       type: integer
       minimum: 0
       maximum: 31
 
-    plmnList-Type:
+    pLMNList-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.24.
       type: array
       items:
@@ -1465,12 +1467,12 @@ components:
         listOfInterfaces:
           $ref: '#/components/schemas/listOfInterfaces-Type'                  
         listOfNeTypes:
-          $ref: '#/components/schemas/listOfNeTypes-Type'
+          $ref: '#/components/schemas/listOfNETypes-Type'
         plmnTarget:
-          $ref: '#/components/schemas/plmnTarget-Type'
+          $ref: '#/components/schemas/pLMNTarget-Type'
         traceReportingConsumerUri:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-        traceCollectionEntityIpAddress:
+        traceCollectionEntityIPAddress:
           $ref: '#/components/schemas/IpAddr'
         traceDepth:
           $ref: '#/components/schemas/traceDepth-Type'
@@ -1484,28 +1486,28 @@ components:
           $ref: '#/components/schemas/traceTarget-Type'
         triggeringEvents:
           $ref: '#/components/schemas/triggeringEvents-Type'
-        anonymizationOfMdtData:
-          $ref: '#/components/schemas/anonymizationOfMdtData-Type'
+        anonymizationOfMDTData:
+          $ref: '#/components/schemas/anonymizationOfMDTData-Type'
         areaConfigurationForNeighCell:
           $ref: '#/components/schemas/AreaConfig'
         areaScope:
           type: array
           items:
             $ref: '#/components/schemas/AreaScope'
-        collectionPeriodRrmLte:
-          $ref: '#/components/schemas/collectionPeriodRrmLte-Type'
-        collectionPeriodM6Lte:
-          $ref: '#/components/schemas/collectionPeriodM6Lte-Type'
-        collectionPeriodM7Lte:
-          $ref: '#/components/schemas/collectionPeriodM7Lte-Type'
-        collectionPeriodRrmUmts:
-          $ref: '#/components/schemas/collectionPeriodRrmUmts-Type'
-        collectionPeriodRrmNr:
-          $ref: '#/components/schemas/collectionPeriodRrmNr-Type'
-        collectionPeriodM6Nr:
-          $ref: '#/components/schemas/collectionPeriodM6Nr-Type'
-        collectionPeriodM7Nr:
-          $ref: '#/components/schemas/collectionPeriodM7Nr-Type'
+        collectionPeriodRRMLTE:
+          $ref: '#/components/schemas/collectionPeriodRRMLTE-Type'
+        collectionPeriodM6LTE:
+          $ref: '#/components/schemas/collectionPeriodM6LTE-Type'
+        collectionPeriodM7LTE:
+          $ref: '#/components/schemas/collectionPeriodM7LTE-Type'
+        collectionPeriodRRMUMTS:
+          $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type'
+        collectionPeriodRRMNR:
+          $ref: '#/components/schemas/collectionPeriodRRMNR-Type'
+        collectionPeriodM6NR:
+          $ref: '#/components/schemas/collectionPeriodM6NR-Type'
+        collectionPeriodM7NR:
+          $ref: '#/components/schemas/collectionPeriodM7NR-Type'
         eventListForEventTriggeredMeasurement:
           $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type'
         eventThreshold:
@@ -1522,20 +1524,20 @@ components:
           $ref: '#/components/schemas/hysteresisL1-Type'
         timeToTriggerL1:
           $ref: '#/components/schemas/timeToTriggerL1-Type'
-        mbsfnAreaList:
+        mBSFNAreaList:
           type: array
           items:
             $ref: '#/components/schemas/MbsfnArea'
-        measurementPeriodLte:
-          $ref: '#/components/schemas/measurementPeriodLte-Type'
-        measurementPeriodUmts:
-          $ref: '#/components/schemas/measurementPeriodUmts-Type'
+        measurementPeriodLTE:
+          $ref: '#/components/schemas/measurementPeriodLTE-Type'
+        measurementPeriodUMTS:
+          $ref: '#/components/schemas/measurementPeriodUMTS-Type'
         measurementQuantity:
           $ref: '#/components/schemas/measurementQuantity-Type'
-        eventThresholdUphUmts:
-          $ref: '#/components/schemas/eventThresholdUphUmts-Type'
-        plmnList:
-          $ref: '#/components/schemas/plmnList-Type'
+        eventThresholdUphUMTS:
+          $ref: '#/components/schemas/eventThresholdUphUMTS-Type'
+        pLMNList:
+          $ref: '#/components/schemas/pLMNList-Type'
         positioningMethod:
           $ref: '#/components/schemas/positioningMethod-Type'
         reportAmount: