diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index e681c5c53657d20147c9f58805923f86d0c90894..c9c2ec4fd57eb374917b7faba35bbbddd5893f35 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -259,7 +259,7 @@ components:
       enum:
         - DL
         - UL
-        - DL and UL
+        - DL_AND_UL
     BwpContext:
       type: string
       enum:
@@ -552,8 +552,8 @@ components:
           enum:
             - RS1
             - RS2
-            - RS1forEnoughMitigation
-            - RS1forNotEnoughMitigation          
+            - RS1_FOR_ENOUGH_MITIGATION
+            - RS1_FOR_NOT_ENOUGH_MITIGATION         
 
     RimRSReportConf:
       type: object
@@ -594,7 +594,7 @@ components:
         - PRB
         - PRB_UL
         - PRB_DL
-        - RRC
+        - RRC_CONNECTED_USERS
         - DRB    
     ParameterRange:
       type: object
@@ -1135,7 +1135,7 @@ components:
                     beamType:
                       type: string
                       enum:
-                        - SSB-BEAM
+                        - SSB_BEAM
                     beamAzimuth:
                       type: integer
                       minimum: -1800
@@ -1383,13 +1383,13 @@ components:
                     isProbingCapable:
                       type: string
                       enum:
-                         - yes
-                         - no
+                         - YES
+                         - NO
                     energySavingState:
                       type: string
                       enum:
-                         - isNotEnergySaving
-                         - isEnergySaving
+                         - IS_NOT_ENERGY_SAVING
+                         - IS_ENERGY_SAVING
 
     DRACHOptimizationFunction-Single:
       allOf:
@@ -1493,13 +1493,13 @@ components:
                     energySavingControl:
                       type: string
                       enum:
-                         - toBeEnergySaving
-                         - toBeNotEnergySaving
+                         - TO_BE_ENERGY_SAVING
+                         - TO_BE_NOT_ENERGY_SAVING
                     energySavingState:
                       type: string
                       enum:
-                         - isNotEnergySaving
-                         - isEnergySaving
+                         - IS_NOT_ENERGY_SAVING
+                         - IS_ENERGY_SAVING
 
     RimRSGlobal-Single:
       allOf: