diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
index c4fdc10584dd6a7e45b18951ced70f4e24ccdc35..08d9e68d0c1df4d481dca50b4377d5416f62562b 100644
--- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
+++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
@@ -24,17 +24,15 @@ servers:
 
 security:
   - {}
-  - OAuth2ClientCredentials: []
-  - OAuth2AuthorizationCode: []
+  - oauth2_dynamic-policy: []
+
 paths:
   /dynamic-policies:
     post:
       operationId: createDynamicPolicy
       summary: 'Create (and optionally upload) a new Dynamic Policy resource'
       security:
-        - OAuth2ClientCredentials:
-          - dynamic-policy-create
-        - oAuth2AuthorizationCode:
+        - oauth2_dynamic-policy:
           - dynamic-policy-create
       requestBody:
         description: 'An optional JSON representation of a Dynamic Policy resource'
@@ -88,10 +86,8 @@ paths:
       operationId: retrieveDynamicPolicy
       summary: 'Retrieve an existing Dynamic Policy resource'
       security:
-        - OAuth2ClientCredentials:
-          - dynamic-policy-read
-        - oAuth2AuthorizationCode:
-          - dynamic-policy-read
+        - oauth2_dynamic-policy:
+          - dynamic-policy-retrieve
       responses:
         '200': # OK
           description: 'Success'
@@ -121,10 +117,8 @@ paths:
       operationId: updateDynamicPolicy
       summary: 'Update an existing Dynamic Policy resource'
       security:
-        - OAuth2ClientCredentials:
-          - metrics-reporting-put
-        - oAuth2AuthorizationCode:
-          - metrics-reporting-put
+        - oauth2_dynamic-policy:
+          - dynamic-policy-replace
       requestBody:
         description: 'A replacement JSON representation of a Dynamic Policy resource'
         required: true
@@ -169,9 +163,7 @@ paths:
       operationId: patchDynamicPolicy
       summary: 'Patch an existing Dynamic Policy resource'
       security:
-        - OAuth2ClientCredentials:
-          - dynamic-policy-patch
-        - oAuth2AuthorizationCode:
+        - oauth2_dynamic-policy:
           - dynamic-policy-patch
       requestBody:
         description: 'A JSON patch to a Dynamic Policy resource'
@@ -220,10 +212,8 @@ paths:
       operationId: destroyDynamicPolicy
       summary: 'Destroy an existing Dynamic Policy resource'
       security:
-        - OAuth2ClientCredentials:
-          - dynamic-policy-delete
-        - oAuth2AuthorizationCode:
-          - dynamic-policy-delete
+        - oauth2_dynamic-policy:
+          - dynamic-policy-destroy
       responses:
         '204': # No Content
           description: 'Dynamic Policy Destroyed'
@@ -248,29 +238,26 @@ paths:
 
 components:
   securitySchemes:
-    OAuth2ClientCredentials:
+    oauth2_dynamic-policy:
       type: oauth2
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
           scopes:
-            dynamic-policy-create: Create a dynamic policy
-            dynamic-policy-read: Read a dynamic policy
-            dynamic-policy-put: Put a dynamic policy
-            dynamic-policy-patch: Patch a dynamic policy
-            dynamic-policy-delete: Delete a dynamic policy
-    oAuth2AuthorizationCode:
-      type: oauth2
-      flows:
+            dynamic-policy-create: Create a Dynamic Policy resource
+            dynamic-policy-retrieve: Retrieve a Dynamic Policy resource
+            dynamic-policy-replace: Replace a Dynamic Policy resource
+            dynamic-policy-patch: Patch a Dynamic Policy resource
+            dynamic-policy-destroy: Destroy a Dynamic Policy resource
         authorizationCode:
           authorizationUrl: '{authorizationUrl}'
           tokenUrl: '{tokenUrl}'
           scopes: 
-            dynamic-policy-create: Create a dynamic policy
-            dynamic-policy-read: Read a dynamic policy
-            dynamic-policy-put: Put a dynamic policy
-            dynamic-policy-patch: Patch a dynamic policy
-            dynamic-policy-delete: Delete a dynamic policy
+            dynamic-policy-create: Create a Dynamic Policy resource
+            dynamic-policy-retrieve: Retrieve a Dynamic Policy resource
+            dynamic-policy-replace: Replace a Dynamic Policy resource
+            dynamic-policy-patch: Patch a Dynamic Policy resource
+            dynamic-policy-destroy: Destroy a Dynamic Policy resource
   schemas:
     DynamicPolicy:
       description: "A representation of a Dynamic Policy resource."