diff --git a/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml b/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml
index f2da738280c374dad739fcf979f50cd5bf5ad9df..a297b5154287c1b358c1b176412943948c5273af 100644
--- a/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml
+++ b/TS26510_Maf_SessionHandling_ConsumptionReporting.yaml
@@ -28,7 +28,7 @@ security:
   - OAuth2AuthorizationCode: []
 
 paths:
-  /consumption-reporting/{provisioningSessionId}:
+  /provisioning-sessions/{provisioningSessionId}/consumption-reporting:
     parameters:
       - name: provisioningSessionId
         in: path
diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
index 190ebe203f1db57256ed7fc6c17edc610de46bd0..9bddb52c6b14c0e7d4df8b983c4f48bb0660a26c 100644
--- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
+++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
@@ -28,7 +28,14 @@ security:
   - OAuth2AuthorizationCode: []
 
 paths:
-  /dynamic-policies:
+  /provisioning-sessions/{provisioningSessionId}/dynamic-policies:
+    parameters:
+      - name: provisioningSessionId
+        description: 'A valid Provisioning Session identifier'
+        in: path
+        required: true
+        schema:
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
     post:
       operationId: createDynamicPolicy
       summary: 'Create (and optionally upload) a new Dynamic Policy resource'
@@ -72,8 +79,14 @@ paths:
         default:
           $ref: 'TS29571_CommonData.yaml#/components/responses/default'
  
-  /dynamic-policies/{dynamicPolicyId}:
+  /provisioning-sessions/{provisioningSessionId}/dynamic-policies/{dynamicPolicyId}:
     parameters:
+      - name: provisioningSessionId
+        description: 'A valid Provisioning Session identifier'
+        in: path
+        required: true
+        schema:
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
       - name: dynamicPolicyId
         description: 'The resource identifier of a Dynamic Policy resource'
         in: path
@@ -255,7 +268,9 @@ components:
           allOf:
             - $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
         provisioningSessionId:
-          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
+          readOnly: true
+          allOf:
+            - $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
         sessionId:
           $ref: 'TS26510_CommonData.yaml#/components/schemas/MediaDeliverySessionId'
         policyTemplateId:
diff --git a/TS26510_Maf_SessionHandling_MetricsReporting.yaml b/TS26510_Maf_SessionHandling_MetricsReporting.yaml
index 6f75beae8de5edfe9b6aeaf8ee2a0e96e99386fb..17964334b833c03676b51c2c8620ab3e823d8295 100644
--- a/TS26510_Maf_SessionHandling_MetricsReporting.yaml
+++ b/TS26510_Maf_SessionHandling_MetricsReporting.yaml
@@ -28,7 +28,7 @@ security:
   - OAuth2AuthorizationCode: []
 
 paths:
-  /metrics-reporting/{provisioningSessionId}/{metricsReportingConfigurationId}:
+  /provisioning-sessions/{provisioningSessionId}/metrics-reporting/{metricsReportingConfigurationId}:
     parameters:
       - name: provisioningSessionId
         in: path
diff --git a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml
index 467f7b4d049fd985636ae44cf478ef37a16c198e..4098e30ba88785a4e3ff626a797a2851de8f1351 100644
--- a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml
+++ b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml
@@ -28,7 +28,14 @@ security:
   - OAuth2AuthorizationCode: []
 
 paths:
-  /network-assistance/:
+  /provisioning-sessions/{provisioningSessionId}/network-assistance-sessions/:
+    parameters:
+      - name: provisioningSessionId
+        description: 'A valid Provisioning Session identifier'
+        in: path
+        required: true
+        schema:
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
     post:
       operationId: createNetworkAssistanceSession
       summary: 'Create a new Network Assistance Session.'
@@ -72,8 +79,14 @@ paths:
         default:
           $ref: 'TS29571_CommonData.yaml#/components/responses/default'
 
-  /network-assistance/{naSessionId}:
+  /provisioning-sessions/{provisioningSessionId}/network-assistance-sessions/{naSessionId}:
     parameters:
+      - name: provisioningSessionId
+        description: 'A valid Provisioning Session identifier'
+        in: path
+        required: true
+        schema:
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
       - name: naSessionId
         description: 'The resource identifier of an existing Network Assistance Session resource'
         in: path
@@ -222,7 +235,14 @@ paths:
         default:
           $ref: 'TS29571_CommonData.yaml#/components/responses/default'
 
-  /network-assistance/{naSessionId}/recommendation:
+  /provisioning-sessions/{provisioningSessionId}/network-assistance-sessions/{naSessionId}/recommendation:
+    parameters:
+      - name: provisioningSessionId
+        description: 'A valid Provisioning Session identifier'
+        in: path
+        required: true
+        schema:
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
     get:
       operationId: requestBitRateRecommendation
       summary: 'Obtain a bit rate recommendation for the next recommendation window'
@@ -258,7 +278,15 @@ paths:
           $ref: 'TS29571_CommonData.yaml#/components/responses/503'
         default:
           $ref: 'TS29571_CommonData.yaml#/components/responses/default' 
-  /network-assistance/{naSessionId}/boost-request:
+
+  /provisioning-sessions/{provisioningSessionId}/network-assistance-sessions/{naSessionId}/boost:
+    parameters:
+      - name: provisioningSessionId
+        description: 'A valid Provisioning Session identifier'
+        in: path
+        required: true
+        schema:
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
     post:
       operationId: requestDeliveryBoost
       summary: 'Request a delivery boost'
@@ -329,7 +357,9 @@ components:
           allOf:
             - $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
         provisioningSessionId:
-          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
+          readOnly: true
+          allOf:
+            - $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
         sessionId:
           $ref: 'TS26510_CommonData.yaml#/components/schemas/MediaDeliverySessionId'
         serviceDataFlowDescriptions:
diff --git a/TS26512_Maf_SessionHandling.yaml b/TS26512_Maf_SessionHandling.yaml
index 631f35f9bbe1c3fc82ad61e1676bb1b771c05d4e..b7803b176c84116fb72112518e8be2a32ff100d4 100755
--- a/TS26512_Maf_SessionHandling.yaml
+++ b/TS26512_Maf_SessionHandling.yaml
@@ -49,25 +49,25 @@ paths:
     $ref: 'TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml#/paths/~1service-access-information~1%7bexternalServiceId%7d'
 
   # Dynamic Policy API
-  /dynamic-policies:
-    $ref: 'TS26510_Maf_SessionHandling_DynamicPolicy.yaml#/paths/~1dynamic-policies'
-  /dynamic-policies/%7bdynamicPolicyId%7d:
-    $ref: 'TS26510_Maf_SessionHandling_DynamicPolicy.yaml#/paths/~1dynamic-policies~1%7bdynamicPolicyId%7d'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/dynamic-policies:
+    $ref: 'TS26510_Maf_SessionHandling_DynamicPolicy.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1dynamic-policies'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/dynamic-policies/%7bdynamicPolicyId%7d:
+    $ref: 'TS26510_Maf_SessionHandling_DynamicPolicy.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1dynamic-policies~1%7bdynamicPolicyId%7d'
 
   # Network Assistance API
-  /network-assistance/:
-    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1network-assistance~1'
-  /network-assistance/%7bnaSessionId%7d:
-    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1network-assistance~1%7bnaSessionId%7d'
-  /network-assistance/%7bnaSessionId%7d/recommendation:
-    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1network-assistance~1%7bnaSessionId%7d~1recommendation'
-  /network-assistance/%7bnaSessionId%7d/boost-request:
-    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1network-assistance~1%7bnaSessionId%7d~1boost-request'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/network-assistance-sessions/:
+    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1network-assistance-sessions~1'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/network-assistance-sessions/%7bnaSessionId%7d:
+    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1network-assistance-sessions~1%7bnaSessionId%7d'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/network-assistance-sessions/%7bnaSessionId%7d/recommendation:
+    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1network-assistance-sessions~1%7bnaSessionId%7d~1recommendation'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/network-assistance-sessions/%7bnaSessionId%7d/boost:
+    $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1network-assistance-sessions~1%7bnaSessionId%7d~1boost'
 
   # Metrics Reporting API
-  /metrics-reporting/%7bprovisioningSessionId%7d/%7bmetricsReportingConfigurationId%7d:
-    $ref: 'TS26510_Maf_SessionHandling_MetricsReporting.yaml#/paths/~1metrics-reporting~1%7bprovisioningSessionId%7d~1%7bmetricsReportingConfigurationId%7d'
+  /provisioning-sessions/%7bprovisioningSessionId%7d/metrics-reporting/%7bmetricsReportingConfigurationId%7d:
+    $ref: 'TS26510_Maf_SessionHandling_MetricsReporting.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1metrics-reporting~1%7bmetricsReportingConfigurationId%7d'
 
   # Consumption Reporting API
-  /consumption-reporting/%7bprovisioningSessionId%7d:
-    $ref: 'TS26510_Maf_SessionHandling_ConsumptionReporting.yaml#/paths/~1consumption-reporting~1%7bprovisioningSessionId%7d'
\ No newline at end of file
+  /provisioning-sessions/%7bprovisioningSessionId%7d/consumption-reporting:
+    $ref: 'TS26510_Maf_SessionHandling_ConsumptionReporting.yaml#/paths/~1provisioning-sessions~1%7bprovisioningSessionId%7d~1consumption-reporting'
\ No newline at end of file