diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index fd7747727d985167dcc2f6e407fda378ff3e9266..f43ac04c60b9fa857c0041d8cf1c575953b1be51 100644
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -593,10 +593,10 @@ components:
               $ref: '#/components/schemas/EP_N22-Multiple'
             EP_N26:
               $ref: '#/components/schemas/EP_N26-Multiple'
-            EP_NLS:
-              $ref: '#/components/schemas/EP_NLS-Multiple'
-            EP_NLG:
-              $ref: '#/components/schemas/EP_NLG-Multiple'
+            EP_NL1:
+              $ref: '#/components/schemas/EP_NL1-Multiple'
+            EP_NL2:
+              $ref: '#/components/schemas/EP_NL2-Multiple'
     AmfSet-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -982,8 +982,8 @@ components:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
-            EP_NLS:
-              $ref: '#/components/schemas/EP_NLS-Multiple'
+            EP_NL1:
+              $ref: '#/components/schemas/EP_NL1-Multiple'
     NgeirFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1560,7 +1560,7 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
-    EP_NLS-Single:
+    EP_NL1-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -1574,7 +1574,7 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
-    EP_NLG-Single:
+    EP_NL2-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -1943,14 +1943,14 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_MAP_SMSC-Single'
-    EP_NLS-Multiple:
+    EP_NL1-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/EP_NLS-Single'
-    EP_NLG-Multiple:
+        $ref: '#/components/schemas/EP_NL1-Single'
+    EP_NL2-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/EP_NLG-Single'
+        $ref: '#/components/schemas/EP_NL2-Single'
     Configurable5QISet-Multiple:
       type: array
       items:
@@ -2031,8 +2031,8 @@ components:
        - $ref: '#/components/schemas/EP_S5U-Single'
        - $ref: '#/components/schemas/EP_Rx-Single'
        - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
-       - $ref: '#/components/schemas/EP_NLS-Single'
-       - $ref: '#/components/schemas/EP_NLG-Single'
+       - $ref: '#/components/schemas/EP_NL1-Single'
+       - $ref: '#/components/schemas/EP_NL2-Single'
        - $ref: '#/components/schemas/Configurable5QISet-Single'
        - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
        - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'