diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index b103089eee471e81e696f3b289a04095943efced..8a7b5981cf5e8bb4eeea6812a849df847ba51465 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -19,9 +19,9 @@ components:
       type: object
       description: 'AmfIdentifier comprise of amfRegionId, amfSetId and amfPointer'
       properties:
-        amfRegionId:
+        aMFRegionId:
           $ref: '#/components/schemas/AmfRegionId'
-        amfSetId:
+        aMFSetId:
           $ref: '#/components/schemas/AmfSetId'
         amfPointer:
           $ref: '#/components/schemas/AmfPointer'
@@ -113,7 +113,7 @@ components:
             $ref: '#/components/schemas/IpEndPoint'
         apiPrefix:
           type: string
-        allowedPlmns:
+        allowedPLMNs:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
@@ -129,7 +129,7 @@ components:
           type: array
           items: 
             type: string
-        allowedNssais:
+        allowedNSSAIs:
           type: array
           items:
             $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
@@ -2441,14 +2441,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
@@ -2497,9 +2497,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: >
@@ -2710,7 +2710,7 @@ components:
       required:
         - mbsServiceIdStart
         - mbsServiceIdEnd
-        - plmnId
+        - plMNId
       properties:
         mbsServiceIdStart:
           type: string
@@ -2718,7 +2718,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'
@@ -2773,11 +2773,11 @@ components:
           type: string
           pattern: '^[A-Fa-f0-9]{6}$'
           description: MBS Service ID
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
       required:
         - mbsServiceId
-        - plmnId
+        - plMNId
 
     Ssm:
       description: Source specific IP multicast address
@@ -2831,7 +2831,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
@@ -4792,7 +4792,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 45859251fc3b97a0ffcea9c4ba8057e9cf9e666d..0a5ca00dc5e8ef6d1ebc75686a31f6f023505756 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -131,7 +131,7 @@ components:
     MappingSetIDBackhaulAddress:
       type: object
       properties:
-        setID:
+        setId:
           type: integer
         backhaulAddress:
           $ref: '#/components/schemas/BackhaulAddress'
@@ -1889,7 +1889,7 @@ components:
                       type: integer
                     nrPci:
                       $ref: '#/components/schemas/NrPci'
-                    plmnIdList:
+                    plMNIdList:
                       type: array
                       uniqueItems: true
                       items: