diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 2a958f1a0d15701cab13cd18768daa02619f86c9..fd7df61eb9dd694171972ea6d214506e31bc4428 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -106,7 +106,7 @@ components:
             $ref: '#/components/schemas/IpEndPoint'
         apiPrefix:
           type: string
-        allowedPlmns:
+        allowedPlMNs:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
@@ -114,7 +114,7 @@ components:
           type: array
           items:
             $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
-        allowedNssais:
+        allowedNSSAIs:
           type: array
           items:
             $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
@@ -223,7 +223,7 @@ components:
     ManagedNFProfile:
       type: object
       properties:
-        nfInstanceID:
+        nfInstanceId:
           type: string
         interPlmnFqdn:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
@@ -1614,13 +1614,13 @@ components:
       description: Information of an AMF NF Instance
       type: object
       required:
-        - amfSetId
-        - amfRegionId
+        - aMFSetId
+        - aMFRegionId
         - guamiList
       properties:
-        amfSetId:
+        aMFSetId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId'
-        amfRegionId:
+        aMFRegionId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId'
         guamiList:
           type: array
@@ -2293,14 +2293,14 @@ components:
       description:  globally identification of an NG-RAN node
       type: object
       oneOf:
-        - required: [ pLmnId, n3IwfId]
-        - required: [ plmnId, gNbId]
-        - required: [ pLmnId, ngeNbId]
-        - required: [ plmnId, wagfId]
-        - required: [ pLmnId, tngfId]
-        - required: [ plmnId, twifId]
+        - required: [ pLMNId, n3IwfId]
+        - required: [ plMNId, gNbId]
+        - required: [ pLMNId, ngeNbId]
+        - required: [ plMNId, wagfId]
+        - required: [ pLMNId, tngfId]
+        - required: [ plMNId, twifId]
       properties:
-        pLmnId:
+        pLMNId:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         n3IwfId:
           type: string
@@ -2349,9 +2349,9 @@ components:
       description: Information of an 5G DDNMF NF Instance
       type: object
       required:
-        - plmnId
+        - plMNId
       properties:
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
     ImsiRange:
       description: >
@@ -2570,7 +2570,7 @@ components:
         mbsServiceIdEnd:
           type: string
           pattern: '^[A-Fa-f0-9]{6}$'
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
         nid:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid'
@@ -2625,7 +2625,7 @@ components:
           type: string
           pattern: '^[A-Fa-f0-9]{6}$'
           description: MBS Service ID
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
       required:
         - mbsServiceId
@@ -2683,7 +2683,7 @@ components:
       description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003
       type: object
       properties:
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
         nrCellId:
           type: string
@@ -4452,7 +4452,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    FiveQiDscpMappingList:
+                    fiveQiDscpMappingList:
                       type: array
                       items:
                         $ref: '#/components/schemas/FiveQiDscpMapping'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 1485871bb3af9683c25e8f12de0d3aa8a1327b2a..10f0f601b7501fc65fcccf09282a163421c2d08b 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -109,7 +109,7 @@ components:
     MappingSetIDBackhaulAddress:
       type: object
       properties:
-        setID:
+        setId:
           type: integer
         backhaulAddress:
           $ref: '#/components/schemas/BackhaulAddress'
@@ -1157,7 +1157,7 @@ components:
                     type: integer
                     minimum: 0
                     maximum: 3279165
-                  ssbSubCarrierSpacing:
+                  sSBSubCarrierSpacing:
                     $ref: '#/components/schemas/SsbSubCarrierSpacing'
                   multiFrequencyBandListNR:
                     type: integer