diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 05519d00118cfecf7a4819a654ade5b88fd4053e..36891a599a353104e59c41c0890837779c66e559 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -641,7 +641,7 @@ components:
       description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40.
       type: boolean
     
-    collectionPeriodRrmLte-Type:
+    collectionPeriodRRMLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.20.
       type: string
       enum:
@@ -656,7 +656,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Lte-Type:
+    collectionPeriodM6LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.32.
       type: string
       enum:
@@ -665,13 +665,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:
@@ -684,7 +684,7 @@ components:
         - 4000ms
         - 6000ms
     
-    collectionPeriodRrmNr-Type:
+    collectionPeriodRRMNR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.30.
       type: string
       enum:
@@ -694,7 +694,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Nr-Type:
+    collectionPeriodM6NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.34.
       type: string
       enum:
@@ -713,7 +713,7 @@ components:
         - 12min
         - 30min
 
-    collectionPeriodM7Nr-Type:
+    collectionPeriodM7NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.35.
       type: integer
       minimum: 1
@@ -917,7 +917,7 @@ components:
         - 2560ms
         - 5120ms
 
-    measurementPeriodLte-Type:
+    measurementPeriodLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.23.
       type: string
       enum:
@@ -927,7 +927,7 @@ components:
         - 10240ms
         - 1min
 
-    measurementPeriodUmts-Type:
+    measurementPeriodUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.22.
       type: string
       enum:
@@ -953,7 +953,7 @@ components:
         - CPICH_RSCP
         - PathLoss
 
-    eventThresholdUphUmts-Type:
+    eventThresholdUphUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.39.
       type: integer
       minimum: 0
@@ -1302,26 +1302,26 @@ components:
           $ref: '#/components/schemas/reportInterval-Type'
         eventThreshold:
           $ref: '#/components/schemas/eventThreshold-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'
-        eventThresholdUphUmts:
-          $ref: '#/components/schemas/eventThresholdUphUmts-Type'
-        measurementPeriodUmts:
-          $ref: '#/components/schemas/measurementPeriodUmts-Type'
-        measurementPeriodLte:
-          $ref: '#/components/schemas/measurementPeriodLte-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'
+        eventThresholdUphUMTS:
+          $ref: '#/components/schemas/eventThresholdUphUMTS-Type'
+        measurementPeriodUMTS:
+          $ref: '#/components/schemas/measurementPeriodUMTS-Type'
+        measurementPeriodLTE:
+          $ref: '#/components/schemas/measurementPeriodLTE-Type'
         measurementQuantity:
           $ref: '#/components/schemas/measurementQuantity-Type'
         beamLevelMeasurement: