diff --git a/RniAPI.json b/RniAPI.json
index d2014c69b4bfcfbadf786ed56e546e495e5e9438..4e95ffbb41f20c0a1a3fef191775dfbf5ece3a6c 100644
--- a/RniAPI.json
+++ b/RniAPI.json
@@ -4115,17 +4115,17 @@
 				"discriminator": {
 					"propertyName": "notificationType",
 					"mapping": {
-						"CaReconfNotification": "CaReconfNotification",
-						"CellChangeNotification": "CellChangeNotification",
-						"MeasRepUeNotification": "MeasRepUeNotification",
-						"MeasTaNotification": "MeasTaNotification",
-						"NrMeasRepUeNotification": "NrMeasRepUeNotification",
-						"RabEstNotification": "RabEstNotification",
-						"RabModNotification": "RabModNotification",
-						"RabRelNotification": "RabRelNotification",
-						"S1BearerNotification": "S1BearerNotification",
-						"ExpiryNotification": "ExpiryNotification",
-						"TestNotification": "TestNotification"
+						"CaReconfNotification": "#/components/schemas/CaReconfNotification",
+						"CellChangeNotification": "#/components/schemas/CellChangeNotification",
+						"MeasRepUeNotification": "#/components/schemas/MeasRepUeNotification",
+						"MeasTaNotification": "#/components/schemas/MeasTaNotification",
+						"NrMeasRepUeNotification": "#/components/schemas/NrMeasRepUeNotification",
+						"RabEstNotification": "#/components/schemas/RabEstNotification",
+						"RabModNotification": "#/components/schemas/RabModNotification",
+						"RabRelNotification": "#/components/schemas/RabRelNotification",
+						"S1BearerNotification": "#/components/schemas/S1BearerNotification",
+						"ExpiryNotification": "#/components/schemas/ExpiryNotification",
+						"TestNotification": "#/components/schemas/TestNotification"
 					}
 				}
 			},
@@ -4143,15 +4143,15 @@
 				"discriminator": {
 					"propertyName": "subscriptionType",
 					"mapping": {
-						"CaReconfSubscription": "CaReconfSubscription",
-						"CellChangeSubscription": "CellChangeSubscription",
-						"MeasRepUeSubscription": "MeasRepUeSubscription",
-						"MeasTaSubscription": "MeasTaSubscription",
-						"NrMeasRepUeSubscription": "NrMeasRepUeSubscription",
-						"RabEstSubscription": "RabEstSubscription",
-						"RabModSubscription": "RabModSubscription",
-						"RabRelSubscription": "RabRelSubscription",
-						"S1BearerSubscription": "S1BearerSubscription"
+						"CaReconfSubscription": "#/components/schemas/CaReconfSubscription",
+						"CellChangeSubscription": "#/components/schemas/CellChangeSubscription",
+						"MeasRepUeSubscription": "#/components/schemas/MeasRepUeSubscription",
+						"MeasTaSubscription": "#/components/schemas/MeasTaSubscription",
+						"NrMeasRepUeSubscription": "#/components/schemas/NrMeasRepUeSubscription",
+						"RabEstSubscription": "#/components/schemas/RabEstSubscription",
+						"RabModSubscription": "#/components/schemas/RabModSubscription",
+						"RabRelSubscription": "#/components/schemas/RabRelSubscription",
+						"S1BearerSubscription": "#/components/schemas/S1BearerSubscription"
 					}
 				}
 			},
diff --git a/RniAPI.yaml b/RniAPI.yaml
index 15e4a2d3aa14241a58e28c4634d00a722a0baf88..33dec46ed02e40d3feeb5aab21c76cb088e8bc4b 100644
--- a/RniAPI.yaml
+++ b/RniAPI.yaml
@@ -2850,17 +2850,17 @@ components:
       discriminator:
         propertyName: notificationType
         mapping:
-          CaReconfNotification: CaReconfNotification
-          CellChangeNotification: CellChangeNotification
-          MeasRepUeNotification: MeasRepUeNotification
-          MeasTaNotification: MeasTaNotification
-          NrMeasRepUeNotification: NrMeasRepUeNotification
-          RabEstNotification: RabEstNotification
-          RabModNotification: RabModNotification
-          RabRelNotification: RabRelNotification
-          S1BearerNotification: S1BearerNotification
-          ExpiryNotification: ExpiryNotification
-          TestNotification: TestNotification
+          CaReconfNotification: '#/components/schemas/CaReconfNotification'
+          CellChangeNotification: '#/components/schemas/CellChangeNotification'
+          MeasRepUeNotification: '#/components/schemas/MeasRepUeNotification'
+          MeasTaNotification: '#/components/schemas/MeasTaNotification'
+          NrMeasRepUeNotification: '#/components/schemas/NrMeasRepUeNotification'
+          RabEstNotification: '#/components/schemas/RabEstNotification'
+          RabModNotification: '#/components/schemas/RabModNotification'
+          RabRelNotification: '#/components/schemas/RabRelNotification'
+          S1BearerNotification: '#/components/schemas/S1BearerNotification'
+          ExpiryNotification: '#/components/schemas/ExpiryNotification'
+          TestNotification: '#/components/schemas/TestNotification'
     InlineSubscription:
       title: InlineSubscription
       required:
@@ -2872,15 +2872,15 @@ components:
       discriminator:
         propertyName: subscriptionType
         mapping:
-          CaReconfSubscription: CaReconfSubscription
-          CellChangeSubscription: CellChangeSubscription
-          MeasRepUeSubscription: MeasRepUeSubscription
-          MeasTaSubscription: MeasTaSubscription
-          NrMeasRepUeSubscription: NrMeasRepUeSubscription
-          RabEstSubscription: RabEstSubscription
-          RabModSubscription: RabModSubscription
-          RabRelSubscription: RabRelSubscription
-          S1BearerSubscription: S1BearerSubscription
+          CaReconfSubscription: '#/components/schemas/CaReconfSubscription'
+          CellChangeSubscription: '#/components/schemas/CellChangeSubscription'
+          MeasRepUeSubscription: '#/components/schemas/MeasRepUeSubscription'
+          MeasTaSubscription: '#/components/schemas/MeasTaSubscription'
+          NrMeasRepUeSubscription: '#/components/schemas/NrMeasRepUeSubscription'
+          RabEstSubscription: '#/components/schemas/RabEstSubscription'
+          RabModSubscription: '#/components/schemas/RabModSubscription'
+          RabRelSubscription: '#/components/schemas/RabRelSubscription'
+          S1BearerSubscription: '#/components/schemas/S1BearerSubscription'
     Links:
       title: Links
       required: