diff --git a/config/_default/menus/api.en.yaml b/config/_default/menus/api.en.yaml
index 39364eadc4828..8c754bfaecedc 100644
--- a/config/_default/menus/api.en.yaml
+++ b/config/_default/menus/api.en.yaml
@@ -5313,9 +5313,9 @@ menu:
       url: /api/latest/agentless-scanning/
       identifier: agentless-scanning
       generated: true
-    - name: Get AWS On Demand task by id
-      url: '#get-aws-on-demand-task-by-id'
-      identifier: agentless-scanning-get-aws-on-demand-task-by-id
+    - name: Get AWS on demand task
+      url: '#get-aws-on-demand-task'
+      identifier: agentless-scanning-get-aws-on-demand-task
       parent: agentless-scanning
       generated: true
       params:
@@ -5325,9 +5325,9 @@ menu:
           - GetAwsOnDemandTask
         unstable: []
         order: 18
-    - name: Post an AWS on demand task
-      url: '#post-an-aws-on-demand-task'
-      identifier: agentless-scanning-post-an-aws-on-demand-task
+    - name: Create AWS on demand task
+      url: '#create-aws-on-demand-task'
+      identifier: agentless-scanning-create-aws-on-demand-task
       parent: agentless-scanning
       generated: true
       params:
@@ -5337,9 +5337,9 @@ menu:
           - CreateAwsOnDemandTask
         unstable: []
         order: 17
-    - name: Get AWS On Demand tasks
-      url: '#get-aws-on-demand-tasks'
-      identifier: agentless-scanning-get-aws-on-demand-tasks
+    - name: List AWS on demand tasks
+      url: '#list-aws-on-demand-tasks'
+      identifier: agentless-scanning-list-aws-on-demand-tasks
       parent: agentless-scanning
       generated: true
       params:
@@ -5349,9 +5349,9 @@ menu:
           - ListAwsOnDemandTasks
         unstable: []
         order: 16
-    - name: Patch GCP Scan Options
-      url: '#patch-gcp-scan-options'
-      identifier: agentless-scanning-patch-gcp-scan-options
+    - name: Update GCP scan options
+      url: '#update-gcp-scan-options'
+      identifier: agentless-scanning-update-gcp-scan-options
       parent: agentless-scanning
       generated: true
       params:
@@ -5373,7 +5373,7 @@ menu:
           - GetGcpScanOptions
         unstable: []
         order: 13
-    - name: Delete GCP Scan Options
+    - name: Delete GCP scan options
       url: '#delete-gcp-scan-options'
       identifier: agentless-scanning-delete-gcp-scan-options
       parent: agentless-scanning
@@ -5385,9 +5385,9 @@ menu:
           - DeleteGcpScanOptions
         unstable: []
         order: 15
-    - name: Post GCP Scan Options
-      url: '#post-gcp-scan-options'
-      identifier: agentless-scanning-post-gcp-scan-options
+    - name: Create GCP scan options
+      url: '#create-gcp-scan-options'
+      identifier: agentless-scanning-create-gcp-scan-options
       parent: agentless-scanning
       generated: true
       params:
@@ -5397,7 +5397,7 @@ menu:
           - CreateGcpScanOptions
         unstable: []
         order: 12
-    - name: List GCP Scan Options
+    - name: List GCP scan options
       url: '#list-gcp-scan-options'
       identifier: agentless-scanning-list-gcp-scan-options
       parent: agentless-scanning
@@ -5409,7 +5409,7 @@ menu:
           - ListGcpScanOptions
         unstable: []
         order: 11
-    - name: Update azure scan options
+    - name: Update Azure scan options
       url: '#update-azure-scan-options'
       identifier: agentless-scanning-update-azure-scan-options
       parent: agentless-scanning
@@ -5433,7 +5433,7 @@ menu:
           - GetAzureScanOptions
         unstable: []
         order: 8
-    - name: Delete azure scan options
+    - name: Delete Azure scan options
       url: '#delete-azure-scan-options'
       identifier: agentless-scanning-delete-azure-scan-options
       parent: agentless-scanning
@@ -5445,7 +5445,7 @@ menu:
           - DeleteAzureScanOptions
         unstable: []
         order: 10
-    - name: Create azure scan options
+    - name: Create Azure scan options
       url: '#create-azure-scan-options'
       identifier: agentless-scanning-create-azure-scan-options
       parent: agentless-scanning
@@ -5457,7 +5457,7 @@ menu:
           - CreateAzureScanOptions
         unstable: []
         order: 7
-    - name: List azure scan options
+    - name: List Azure scan options
       url: '#list-azure-scan-options'
       identifier: agentless-scanning-list-azure-scan-options
       parent: agentless-scanning
@@ -5469,9 +5469,9 @@ menu:
           - ListAzureScanOptions
         unstable: []
         order: 6
-    - name: Patch AWS Scan Options
-      url: '#patch-aws-scan-options'
-      identifier: agentless-scanning-patch-aws-scan-options
+    - name: Update AWS scan options
+      url: '#update-aws-scan-options'
+      identifier: agentless-scanning-update-aws-scan-options
       parent: agentless-scanning
       generated: true
       params:
@@ -5493,7 +5493,7 @@ menu:
           - GetAwsScanOptions
         unstable: []
         order: 3
-    - name: Delete AWS Scan Options
+    - name: Delete AWS scan options
       url: '#delete-aws-scan-options'
       identifier: agentless-scanning-delete-aws-scan-options
       parent: agentless-scanning
@@ -5505,9 +5505,9 @@ menu:
           - DeleteAwsScanOptions
         unstable: []
         order: 5
-    - name: Post AWS Scan Options
-      url: '#post-aws-scan-options'
-      identifier: agentless-scanning-post-aws-scan-options
+    - name: Create AWS scan options
+      url: '#create-aws-scan-options'
+      identifier: agentless-scanning-create-aws-scan-options
       parent: agentless-scanning
       generated: true
       params:
@@ -5517,7 +5517,7 @@ menu:
           - CreateAwsScanOptions
         unstable: []
         order: 2
-    - name: List AWS Scan Options
+    - name: List AWS scan options
       url: '#list-aws-scan-options'
       identifier: agentless-scanning-list-aws-scan-options
       parent: agentless-scanning
diff --git a/data/api/v2/CodeExamples.json b/data/api/v2/CodeExamples.json
index 9dd2c0b70a8b5..ea610bc35cc34 100644
--- a/data/api/v2/CodeExamples.json
+++ b/data/api/v2/CodeExamples.json
@@ -105,39 +105,39 @@
       "description": "Update datastore returns \"OK\" response"
     }
   ],
-  "CreateAzureScanOptions": [
+  "CreateAwsOnDemandTask": [
     {
       "group": "agentless_scanning",
       "suffix": "",
-      "description": "Create azure scan options returns \"Created\" response"
+      "description": "Create AWS on demand task returns \"AWS on demand task created successfully.\" response"
     }
   ],
-  "UpdateAwsScanOptions": [
+  "CreateAzureScanOptions": [
     {
       "group": "agentless_scanning",
       "suffix": "",
-      "description": "Patch AWS Scan Options returns \"No Content\" response"
+      "description": "Create Azure scan options returns \"Created\" response"
     }
   ],
-  "UpdateGcpScanOptions": [
+  "CreateGcpScanOptions": [
     {
       "group": "agentless_scanning",
       "suffix": "",
-      "description": "Patch GCP Scan Options returns \"OK\" response"
+      "description": "Create GCP scan options returns \"Agentless scan options enabled successfully.\" response"
     }
   ],
-  "CreateGcpScanOptions": [
+  "UpdateAwsScanOptions": [
     {
       "group": "agentless_scanning",
       "suffix": "",
-      "description": "Post GCP Scan Options returns \"Agentless scan options enabled successfully.\" response"
+      "description": "Update AWS scan options returns \"No Content\" response"
     }
   ],
-  "CreateAwsOnDemandTask": [
+  "UpdateGcpScanOptions": [
     {
       "group": "agentless_scanning",
       "suffix": "",
-      "description": "Post an AWS on demand task returns \"AWS on demand task created successfully.\" response"
+      "description": "Update GCP scan options returns \"OK\" response"
     }
   ],
   "CreateApp": [
diff --git a/data/api/v2/full_spec.yaml b/data/api/v2/full_spec.yaml
index f0dbbb211bf1a..7fc08118aace8 100644
--- a/data/api/v2/full_spec.yaml
+++ b/data/api/v2/full_spec.yaml
@@ -54749,7 +54749,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - security_monitoring_findings_read
-      summary: List AWS Scan Options
+      summary: List AWS scan options
       tags:
       - Agentless Scanning
       x-menu-order: 1
@@ -54783,7 +54783,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Post AWS Scan Options
+      summary: Create AWS scan options
       tags:
       - Agentless Scanning
       x-codegen-request-body-name: body
@@ -54810,7 +54810,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Delete AWS Scan Options
+      summary: Delete AWS scan options
       tags:
       - Agentless Scanning
       x-menu-order: 5
@@ -54871,7 +54871,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Patch AWS Scan Options
+      summary: Update AWS scan options
       tags:
       - Agentless Scanning
       x-codegen-request-body-name: body
@@ -54894,7 +54894,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - security_monitoring_findings_read
-      summary: List azure scan options
+      summary: List Azure scan options
       tags:
       - Agentless Scanning
       x-menu-order: 6
@@ -54921,7 +54921,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Create azure scan options
+      summary: Create Azure scan options
       tags:
       - Agentless Scanning
       x-menu-order: 7
@@ -54947,7 +54947,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Delete azure scan options
+      summary: Delete Azure scan options
       tags:
       - Agentless Scanning
       x-menu-order: 10
@@ -55017,7 +55017,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Update azure scan options
+      summary: Update Azure scan options
       tags:
       - Agentless Scanning
       x-menu-order: 9
@@ -55041,7 +55041,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - security_monitoring_findings_read
-      summary: List GCP Scan Options
+      summary: List GCP scan options
       tags:
       - Agentless Scanning
       x-menu-order: 11
@@ -55075,7 +55075,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Post GCP Scan Options
+      summary: Create GCP scan options
       tags:
       - Agentless Scanning
       x-codegen-request-body-name: body
@@ -55108,7 +55108,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Delete GCP Scan Options
+      summary: Delete GCP scan options
       tags:
       - Agentless Scanning
       x-menu-order: 15
@@ -55185,7 +55185,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Patch GCP Scan Options
+      summary: Update GCP scan options
       tags:
       - Agentless Scanning
       x-codegen-request-body-name: body
@@ -55210,7 +55210,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - security_monitoring_findings_read
-      summary: Get AWS On Demand tasks
+      summary: List AWS on demand tasks
       tags:
       - Agentless Scanning
       x-menu-order: 16
@@ -55248,7 +55248,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - org_management
-      summary: Post an AWS on demand task
+      summary: Create AWS on demand task
       tags:
       - Agentless Scanning
       x-codegen-request-body-name: body
@@ -55283,7 +55283,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - security_monitoring_findings_read
-      summary: Get AWS On Demand task by id
+      summary: Get AWS on demand task
       tags:
       - Agentless Scanning
       x-menu-order: 18
diff --git a/data/api/v2/full_spec_deref.json b/data/api/v2/full_spec_deref.json
index c964e29484000..b18690ef8e4bf 100644
--- a/data/api/v2/full_spec_deref.json
+++ b/data/api/v2/full_spec_deref.json
@@ -413148,7 +413148,7 @@
             ]
           }
         ],
-        "summary": "List AWS Scan Options",
+        "summary": "List AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -413421,7 +413421,7 @@
             ]
           }
         ],
-        "summary": "Post AWS Scan Options",
+        "summary": "Create AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -413573,7 +413573,7 @@
             ]
           }
         ],
-        "summary": "Delete AWS Scan Options",
+        "summary": "Delete AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414001,7 +414001,7 @@
             ]
           }
         ],
-        "summary": "Patch AWS Scan Options",
+        "summary": "Update AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414127,7 +414127,7 @@
             ]
           }
         ],
-        "summary": "List azure scan options",
+        "summary": "List Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414305,7 +414305,7 @@
             ]
           }
         ],
-        "summary": "Create azure scan options",
+        "summary": "Create Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414372,7 +414372,7 @@
             ]
           }
         ],
-        "summary": "Delete azure scan options",
+        "summary": "Delete Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414768,7 +414768,7 @@
             ]
           }
         ],
-        "summary": "Update azure scan options",
+        "summary": "Update Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414921,7 +414921,7 @@
             ]
           }
         ],
-        "summary": "List GCP Scan Options",
+        "summary": "List GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415184,7 +415184,7 @@
             ]
           }
         ],
-        "summary": "Post GCP Scan Options",
+        "summary": "Create GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415336,7 +415336,7 @@
             ]
           }
         ],
-        "summary": "Delete GCP Scan Options",
+        "summary": "Delete GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415817,7 +415817,7 @@
             ]
           }
         ],
-        "summary": "Patch GCP Scan Options",
+        "summary": "Update GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415964,7 +415964,7 @@
             ]
           }
         ],
-        "summary": "Get AWS On Demand tasks",
+        "summary": "List AWS on demand tasks",
         "tags": [
           "Agentless Scanning"
         ],
@@ -416191,7 +416191,7 @@
             ]
           }
         ],
-        "summary": "Post an AWS on demand task",
+        "summary": "Create AWS on demand task",
         "tags": [
           "Agentless Scanning"
         ],
@@ -416408,7 +416408,7 @@
             ]
           }
         ],
-        "summary": "Get AWS On Demand task by id",
+        "summary": "Get AWS on demand task",
         "tags": [
           "Agentless Scanning"
         ],
diff --git a/data/api/v2/translate_actions.json b/data/api/v2/translate_actions.json
index 6aaecefed50c1..15986900994cc 100644
--- a/data/api/v2/translate_actions.json
+++ b/data/api/v2/translate_actions.json
@@ -107,17 +107,17 @@
   },
   "ListAwsScanOptions": {
     "description": "Fetches the scan options configured for AWS accounts.",
-    "summary": "List AWS Scan Options"
+    "summary": "List AWS scan options"
   },
   "CreateAwsScanOptions": {
     "description": "Activate Agentless scan options for an AWS account.",
-    "summary": "Post AWS Scan Options",
+    "summary": "Create AWS scan options",
     "request_description": "The definition of the new scan options.",
     "request_schema_description": "Request object that includes the scan options to create."
   },
   "DeleteAwsScanOptions": {
     "description": "Delete Agentless scan options for an AWS account.",
-    "summary": "Delete AWS Scan Options"
+    "summary": "Delete AWS scan options"
   },
   "GetAwsScanOptions": {
     "description": "Fetches the Agentless scan options for an activated account.",
@@ -125,23 +125,23 @@
   },
   "UpdateAwsScanOptions": {
     "description": "Update the Agentless scan options for an activated account.",
-    "summary": "Patch AWS Scan Options",
+    "summary": "Update AWS scan options",
     "request_description": "New definition of the scan options.",
     "request_schema_description": "Request object that includes the scan options to update."
   },
   "ListAzureScanOptions": {
     "description": "Fetches the scan options configured for Azure accounts.",
-    "summary": "List azure scan options"
+    "summary": "List Azure scan options"
   },
   "CreateAzureScanOptions": {
     "description": "Activate Agentless scan options for an Azure subscription.",
-    "summary": "Create azure scan options",
+    "summary": "Create Azure scan options",
     "request_description": "",
     "request_schema_description": "Response object containing Azure scan options for a single subscription."
   },
   "DeleteAzureScanOptions": {
     "description": "Delete Agentless scan options for an Azure subscription.",
-    "summary": "Delete azure scan options"
+    "summary": "Delete Azure scan options"
   },
   "GetAzureScanOptions": {
     "description": "Fetches the Agentless scan options for an activated subscription.",
@@ -149,23 +149,23 @@
   },
   "UpdateAzureScanOptions": {
     "description": "Update the Agentless scan options for an activated subscription.",
-    "summary": "Update azure scan options",
+    "summary": "Update Azure scan options",
     "request_description": "",
     "request_schema_description": "Request object for updating Azure scan options."
   },
   "ListGcpScanOptions": {
     "description": "Fetches the scan options configured for all GCP projects.",
-    "summary": "List GCP Scan Options"
+    "summary": "List GCP scan options"
   },
   "CreateGcpScanOptions": {
     "description": "Activate Agentless scan options for a GCP project.",
-    "summary": "Post GCP Scan Options",
+    "summary": "Create GCP scan options",
     "request_description": "The definition of the new scan options.",
     "request_schema_description": "Response object containing GCP scan options for a single project."
   },
   "DeleteGcpScanOptions": {
     "description": "Delete Agentless scan options for a GCP project.",
-    "summary": "Delete GCP Scan Options"
+    "summary": "Delete GCP scan options"
   },
   "GetGcpScanOptions": {
     "description": "Fetches the Agentless scan options for an activated GCP project.",
@@ -173,23 +173,23 @@
   },
   "UpdateGcpScanOptions": {
     "description": "Update the Agentless scan options for an activated GCP project.",
-    "summary": "Patch GCP Scan Options",
+    "summary": "Update GCP scan options",
     "request_description": "New definition of the scan options.",
     "request_schema_description": "Request object for updating GCP scan options."
   },
   "ListAwsOnDemandTasks": {
     "description": "Fetches the most recent 1000 AWS on demand tasks.",
-    "summary": "Get AWS On Demand tasks"
+    "summary": "List AWS on demand tasks"
   },
   "CreateAwsOnDemandTask": {
     "description": "Trigger the scan of an AWS resource with a high priority. Agentless scanning must be activated for the AWS account containing the resource to scan.",
-    "summary": "Post an AWS on demand task",
+    "summary": "Create AWS on demand task",
     "request_description": "The definition of the on demand task.",
     "request_schema_description": "Request object that includes the on demand task to submit."
   },
   "GetAwsOnDemandTask": {
     "description": "Fetch the data of a specific on demand task.",
-    "summary": "Get AWS On Demand task by id"
+    "summary": "Get AWS on demand task"
   },
   "ListAPIKeys": {
     "description": "List all API keys available for your account.",
diff --git a/static/resources/json/full_spec_v2.json b/static/resources/json/full_spec_v2.json
index c964e29484000..b18690ef8e4bf 100644
--- a/static/resources/json/full_spec_v2.json
+++ b/static/resources/json/full_spec_v2.json
@@ -413148,7 +413148,7 @@
             ]
           }
         ],
-        "summary": "List AWS Scan Options",
+        "summary": "List AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -413421,7 +413421,7 @@
             ]
           }
         ],
-        "summary": "Post AWS Scan Options",
+        "summary": "Create AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -413573,7 +413573,7 @@
             ]
           }
         ],
-        "summary": "Delete AWS Scan Options",
+        "summary": "Delete AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414001,7 +414001,7 @@
             ]
           }
         ],
-        "summary": "Patch AWS Scan Options",
+        "summary": "Update AWS scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414127,7 +414127,7 @@
             ]
           }
         ],
-        "summary": "List azure scan options",
+        "summary": "List Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414305,7 +414305,7 @@
             ]
           }
         ],
-        "summary": "Create azure scan options",
+        "summary": "Create Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414372,7 +414372,7 @@
             ]
           }
         ],
-        "summary": "Delete azure scan options",
+        "summary": "Delete Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414768,7 +414768,7 @@
             ]
           }
         ],
-        "summary": "Update azure scan options",
+        "summary": "Update Azure scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -414921,7 +414921,7 @@
             ]
           }
         ],
-        "summary": "List GCP Scan Options",
+        "summary": "List GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415184,7 +415184,7 @@
             ]
           }
         ],
-        "summary": "Post GCP Scan Options",
+        "summary": "Create GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415336,7 +415336,7 @@
             ]
           }
         ],
-        "summary": "Delete GCP Scan Options",
+        "summary": "Delete GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415817,7 +415817,7 @@
             ]
           }
         ],
-        "summary": "Patch GCP Scan Options",
+        "summary": "Update GCP scan options",
         "tags": [
           "Agentless Scanning"
         ],
@@ -415964,7 +415964,7 @@
             ]
           }
         ],
-        "summary": "Get AWS On Demand tasks",
+        "summary": "List AWS on demand tasks",
         "tags": [
           "Agentless Scanning"
         ],
@@ -416191,7 +416191,7 @@
             ]
           }
         ],
-        "summary": "Post an AWS on demand task",
+        "summary": "Create AWS on demand task",
         "tags": [
           "Agentless Scanning"
         ],
@@ -416408,7 +416408,7 @@
             ]
           }
         ],
-        "summary": "Get AWS On Demand task by id",
+        "summary": "Get AWS on demand task",
         "tags": [
           "Agentless Scanning"
         ],