diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 01a77f34a674a41a48f47a40cf7fd898f92e2200..1e97550d85aa8a0f8e92035a8e39be39b81157bb 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: AI/ML NRM
-  version: 17.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -15,28 +15,28 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
 
-    AIMLEntityList:
+    MLEntityList:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLEntity'
+        $ref: '#/components/schemas/MLEntity'
 
-    AIMLEntity:
+    MLEntity:
       type: object
       properties:
-        aIMLEntityId:
+        mLEntityId:
           type: string
         inferenceType:
           type: string
-        aIMLEntityVersion:
+        mLEntityVersion:
           type: string
         expectedRunTimeContext:
-          $ref: '#/components/schemas/AIMLContext'
+          $ref: '#/components/schemas/MLContext'
         trainingContext:
-          $ref: '#/components/schemas/AIMLContext'
+          $ref: '#/components/schemas/MLContext'
         runTimeContext:
-          $ref: '#/components/schemas/AIMLContext'
+          $ref: '#/components/schemas/MLContext'
 
-    AIMLContext:
+    MLContext:
       type: object
       properties:
         inferenceEntityRef:
@@ -74,10 +74,10 @@ components:
 
     TrainingProcessMonitor:
       description: >-
-        This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess".
+        This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess".
       type: object
       properties:
-        aIMLTrainingProcessId:
+        mLTrainingProcessId:
           type: string
         status:
           type: string
@@ -120,8 +120,8 @@ components:
               $ref: '#/components/schemas/SubNetwork-Multiple'
             ManagedElement:
               $ref: '#/components/schemas/ManagedElement-Multiple'
-            AIMLTrainingFunction:
-              $ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
+            MLTrainingFunction:
+              $ref: '#/components/schemas/MLTrainingFunction-Multiple'
 
     ManagedElement-Single:
       allOf:
@@ -133,10 +133,10 @@ components:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
         - type: object
           properties:
-            AIMLTrainingFunction:
-              $ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
+            MLTrainingFunction:
+              $ref: '#/components/schemas/MLTrainingFunction-Multiple'
 
-    AIMLTrainingFunction-Single:
+    MLTrainingFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -146,19 +146,19 @@ components:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
-                    aIMLEntityList:
-                      $ref: '#/components/schemas/AIMLEntityList'
+                    mLEntityList:
+                      $ref: '#/components/schemas/MLEntityList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
-            AIMLTrainingRequest:
-              $ref: '#/components/schemas/AIMLTrainingRequest-Multiple'
-            AIMLTrainingProcess:
-              $ref: '#/components/schemas/AIMLTrainingProcess-Multiple'
-            AIMLTrainingReport:
-              $ref: '#/components/schemas/AIMLTrainingReport-Multiple'
+            MLTrainingRequest:
+              $ref: '#/components/schemas/MLTrainingRequest-Multiple'
+            MLTrainingProcess:
+              $ref: '#/components/schemas/MLTrainingProcess-Multiple'
+            MLTrainingReport:
+              $ref: '#/components/schemas/MLTrainingReport-Multiple'
 
-    AIMLTrainingRequest-Single:
+    MLTrainingRequest-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -167,7 +167,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    aIMLEntityId:
+                    mLEntityId:
                       type: string
                     candidateTraingDataSource:
                       type: array
@@ -189,7 +189,7 @@ components:
                     suspendRequest:
                       type: boolean
 
-    AIMLTrainingProcess-Single:
+    MLTrainingProcess-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -198,7 +198,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    aIMLTrainingProcessId:
+                    mLTrainingProcessId:
                       type: string
                     priority:
                       type: integer
@@ -216,7 +216,7 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
 
-    AIMLTrainingReport-Single:
+    MLTrainingReport-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -225,7 +225,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    aIMLEntityId:
+                    mLEntityId:
                       type: string
                     areConsumerTrainingDataUsed:
                       type: boolean
@@ -253,22 +253,22 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/ManagedElement-Single'
-    AIMLTrainingFunction-Multiple:
+    MLTrainingFunction-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingFunction-Single'
-    AIMLTrainingRequest-Multiple:
+        $ref: '#/components/schemas/MLTrainingFunction-Single'
+    MLTrainingRequest-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingRequest-Single'
-    AIMLTrainingProcess-Multiple:
+        $ref: '#/components/schemas/MLTrainingRequest-Single'
+    MLTrainingProcess-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingProcess-Single'
-    AIMLTrainingReport-Multiple:
+        $ref: '#/components/schemas/MLTrainingProcess-Single'
+    MLTrainingReport-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingReport-Single'
+        $ref: '#/components/schemas/MLTrainingReport-Single'
 
 
 #-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
@@ -278,7 +278,7 @@ components:
         - $ref: '#/components/schemas/SubNetwork-Single'
         - $ref: '#/components/schemas/ManagedElement-Single'
 
-        - $ref: '#/components/schemas/AIMLTrainingFunction-Single'
-        - $ref: '#/components/schemas/AIMLTrainingRequest-Single'
-        - $ref: '#/components/schemas/AIMLTrainingProcess-Single'
-        - $ref: '#/components/schemas/AIMLTrainingReport-Single'
+        - $ref: '#/components/schemas/MLTrainingFunction-Single'
+        - $ref: '#/components/schemas/MLTrainingRequest-Single'
+        - $ref: '#/components/schemas/MLTrainingProcess-Single'
+        - $ref: '#/components/schemas/MLTrainingReport-Single'