diff --git a/spec/_superseded_operations.yaml b/spec/_superseded_operations.yaml
index d36a404b3..fbc54730f 100644
--- a/spec/_superseded_operations.yaml
+++ b/spec/_superseded_operations.yaml
@@ -200,13 +200,13 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PUT
-# /_opendistro/_ism/policies/{policyID}:
-#   superseded_by: /_plugins/_ism/policies/{policyID}
-#   operations:
-#     - GET
-#     - HEAD
-#     - PUT
-#     - DELETE
+/_opendistro/_ism/policies/{policyID}:
+  superseded_by: /_plugins/_ism/policies/{policy_id}
+  operations:
+    - GET
+    - HEAD
+    - PUT
+    - DELETE
 /_opendistro/_ism/remove:
   superseded_by: /_plugins/_ism/remove
   operations:
@@ -239,10 +239,10 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   superseded_by: /_plugins/_knn/{nodeId}/stats/
   operations:
     - GET
-# /_opendistro/_knn/{nodeId}/stats/{stat}:
-#   superseded_by: /_plugins/_knn/{nodeId}/stats/{stat}
-#   operations:
-#     - GET
+/_opendistro/_knn/{nodeId}/stats/{stat}:
+  superseded_by: /_plugins/_knn/{node_id}/stats/{stat}
+  operations:
+    - GET
 /_opendistro/_performanceanalyzer/_agent/{redirectEndpoint}:
   superseded_by: /_plugins/_performanceanalyzer/_agent/{redirectEndpoint}
   operations:
@@ -353,25 +353,25 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PUT
-# /_opendistro/_rollup/jobs/{rollupID}:
-#   superseded_by: /_plugins/_rollup/jobs/{rollupID}
-#   operations:
-#     - GET
-#     - HEAD
-#     - PUT
-#     - DELETE
-# /_opendistro/_rollup/jobs/{rollupID}/_explain:
-#   superseded_by: /_plugins/_rollup/jobs/{rollupID}/_explain
-#   operations:
-#     - GET
-# /_opendistro/_rollup/jobs/{rollupID}/_start:
-#   superseded_by: /_plugins/_rollup/jobs/{rollupID}/_start
-#   operations:
-#     - POST
-# /_opendistro/_rollup/jobs/{rollupID}/_stop:
-#   superseded_by: /_plugins/_rollup/jobs/{rollupID}/_stop
-#   operations:
-#     - POST
+/_opendistro/_rollup/jobs/{rollupID}:
+  superseded_by: /_plugins/_rollup/jobs/{id}
+  operations:
+    - GET
+    - HEAD
+    - PUT
+    - DELETE
+/_opendistro/_rollup/jobs/{rollupID}/_explain:
+  superseded_by: /_plugins/_rollup/jobs/{id}/_explain
+  operations:
+    - GET
+/_opendistro/_rollup/jobs/{rollupID}/_start:
+  superseded_by: /_plugins/_rollup/jobs/{id}/_start
+  operations:
+    - POST
+/_opendistro/_rollup/jobs/{rollupID}/_stop:
+  superseded_by: /_plugins/_rollup/jobs/{id}/_stop
+  operations:
+    - POST
 /_opendistro/_security/api/_upgrade_check/:
   superseded_by: /_plugins/_security/api/_upgrade_check/
   operations:
@@ -400,13 +400,13 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PATCH
-# /_opendistro/_security/api/actiongroups/{name}:
-#   superseded_by: /_plugins/_security/api/actiongroups/{name}
-#   operations:
-#     - GET
-#     - PUT
-#     - PATCH
-#     - DELETE
+/_opendistro/_security/api/actiongroups/{name}:
+  superseded_by: /_plugins/_security/api/actiongroups/{action_group}
+  operations:
+    - GET
+    - PUT
+    - PATCH
+    - DELETE
 /_opendistro/_security/api/audit/:
   superseded_by: /_plugins/_security/api/audit/
   operations:
@@ -432,17 +432,17 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PATCH
-# /_opendistro/_security/api/internalusers/{name}:
-#   superseded_by: /_plugins/_security/api/internalusers/{name}
-#   operations:
-#     - GET
-#     - PUT
-#     - PATCH
-#     - DELETE
-# /_opendistro/_security/api/internalusers/{name}/authtoken:
-#   superseded_by: /_plugins/_security/api/internalusers/{name}/authtoken
-#   operations:
-#     - POST
+/_opendistro/_security/api/internalusers/{name}:
+  superseded_by: /_plugins/_security/api/internalusers/{username}
+  operations:
+    - GET
+    - PUT
+    - PATCH
+    - DELETE
+/_opendistro/_security/api/internalusers/{name}/authtoken:
+  superseded_by: /_plugins/_security/api/internalusers/{username}/authtoken
+  operations:
+    - POST
 /_opendistro/_security/api/migrate:
   superseded_by: /_plugins/_security/api/migrate
   operations:
@@ -456,25 +456,25 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PATCH
-# /_opendistro/_security/api/roles/{name}:
-#   superseded_by: /_plugins/_security/api/roles/{name}
-#   operations:
-#     - GET
-#     - PUT
-#     - PATCH
-#     - DELETE
+/_opendistro/_security/api/roles/{name}:
+  superseded_by: /_plugins/_security/api/roles/{role}
+  operations:
+    - GET
+    - PUT
+    - PATCH
+    - DELETE
 /_opendistro/_security/api/rolesmapping/:
   superseded_by: /_plugins/_security/api/rolesmapping/
   operations:
     - GET
     - PATCH
-# /_opendistro/_security/api/rolesmapping/{name}:
-#   superseded_by: /_plugins/_security/api/rolesmapping/{name}
-#   operations:
-#     - GET
-#     - PUT
-#     - PATCH
-#     - DELETE
+/_opendistro/_security/api/rolesmapping/{name}:
+  superseded_by: /_plugins/_security/api/rolesmapping/{role}
+  operations:
+    - GET
+    - PUT
+    - PATCH
+    - DELETE
 /_opendistro/_security/api/securityconfig:
   superseded_by: /_plugins/_security/api/securityconfig
   operations:
@@ -518,27 +518,27 @@ $schema: ./json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PATCH
-# /_opendistro/_security/api/tenants/{name}:
-#   superseded_by: /_plugins/_security/api/tenants/{name}
-#   operations:
-#     - GET
-#     - PUT
-#     - PATCH
-#     - DELETE
+/_opendistro/_security/api/tenants/{name}:
+  superseded_by: /_plugins/_security/api/tenants/{tenant}
+  operations:
+    - GET
+    - PUT
+    - PATCH
+    - DELETE
 /_opendistro/_security/api/user:
   superseded_by: /_plugins/_security/api/user
   operations:
     - GET
-# /_opendistro/_security/api/user/{name}:
-#   superseded_by: /_plugins/_security/api/user/{name}
-#   operations:
-#     - GET
-#     - PUT
-#     - DELETE
-# /_opendistro/_security/api/user/{name}/authtoken:
-#   superseded_by: /_plugins/_security/api/user/{name}/authtoken
-#   operations:
-#     - POST
+/_opendistro/_security/api/user/{username}:
+  superseded_by: /_plugins/_security/api/user/{username}
+  operations:
+    - GET
+    - PUT
+    - DELETE
+/_opendistro/_security/api/user/{name}/authtoken:
+  superseded_by: /_plugins/_security/api/user/{username}/authtoken
+  operations:
+    - POST
 /_opendistro/_security/api/validate:
   superseded_by: /_plugins/_security/api/validate
   operations: