Consolidated security nav updates

config/_default/menus/main.en.yaml

@@ -155,12 +155,12 @@ menu:
       url: getting_started/security/
       parent: getting_started
       weight: 17
-    - name: Application Security Management
+    - name: App and API Protection
       identifier: getting_started_application_security
       url: getting_started/security/application_security
       parent: getting_started_security
       weight: 1701
-    - name: Cloud Security Management
+    - name: Cloud Security
       identifier: getting_started_cloud_security_management
       url: getting_started/security/cloud_security_management/
       parent: getting_started_security
@@ -2034,7 +2034,7 @@ menu:
       parent: software_catalog_use_cases
       identifier: software_catalog_use_cases_cloud_cost_management
       weight: 402
-    - name: Application Security Management
+    - name: App and API Protection
       url: software_catalog/use_cases/appsec_management
       parent: software_catalog_use_cases
       identifier: software_catalog_use_cases_appsec_management
@@ -6132,7 +6132,7 @@ menu:
       parent: cloud_siem
       identifier: siem_guides
       weight: 10
-    - name: Cloud Security Management
+    - name: Cloud Security
       url: security/cloud_security_management
       parent: security_platform_heading
       pre: cloud-security-management
@@ -6203,7 +6203,7 @@ menu:
       parent: csm_setup
       identifier: csm_setup_cloud_integrations
       weight: 107
-    - name: Threats
+    - name: Workload Protection
       url: security/threats/
       parent: csm
       identifier: cloud_workload_security
@@ -6358,7 +6358,7 @@ menu:
       parent: csm_troubleshooting
       identifier: csm_troubleshooting_vulnerabilities
       weight: 1202
-    - name: Application Security Management
+    - name: App and API Protection
       url: security/application_security/
       parent: security_platform_heading
       pre: app-sec

content/en/account_management/audit_trail/events.md

@@ -29,7 +29,7 @@ further_reading:
 #### Product-Specific Events
 - [App Builder](#app-builder-events)
 - [Application Performance Monitoring (APM)](#application-performance-monitoring-apm-events)
-- [Application Security Management (ASM)](#application-security-management)
+- [App and API Protection (AAP)](#app-and-api-protection)
 - [Audit Trail](#audit-trail-events)
 - [CI Visibility](#ci-visibility-events)
 - [Quality Gates](#quality-gates-events)
@@ -111,7 +111,7 @@ See the [Audit Trail documentation][2] for more information on setting up and co
 | [Sampling rates remotely configured][27] | A user remotely configured the APM sampling rates.  | `@evt.name:APM @asset.type:samplerconfig` |
 | [Saved view][112] | A user created, modified, or deleted a saved view. | `@evt.name:APM @action:(created OR modified OR deleted) @asset.type:saved_view` |
 
-### Application Security Management
+### App and API Protection
 
 {{% audit-trail-asm %}}
 

content/en/account_management/billing/product_allotments.md

@@ -139,7 +139,7 @@ Additionally, the organization has a monthly commitment of 0.3 GB of Ingested Sp
 | Custom Metrics | Infrastructure Pro Hosts, Infrastructure Pro Plus Hosts, Infrastructure Enterprise Hosts, Internet of Things (IoT), Serverless Workload Monitoring - Functions, Serverless Workload Monitoring - Apps, Serverless Invocations, Serverless Functions  | Average | Average |
 | Ingested Custom Metrics | Infrastructure Pro Hosts, Infrastructure Pro Plus Hosts, Infrastructure Enterprise Hosts, Internet of Things (IoT), Serverless Workload Monitoring - Functions, Serverless Workload Monitoring - Apps | Average | Average |
 | Custom Events | Infrastructure Pro Hosts, Infrastructure Pro Plus Hosts, Infrastructure Enterprise Hosts | Sum | Sum |
-| CSM Enterprise Containers    | Cloud Security Management (CSM)       |      N/A     | Sum    |
+| Cloud Security Enterprise Containers    | Cloud Security       |      N/A     | Sum    |
 | CWS Containers      | Cloud Workload Security (CWS)              |       N/A     | Sum      |
 | Infrastructure Containers    | Infrastructure Pro Hosts, Infrastructure Pro Plus Hosts, Infrastructure Enterprise Hosts |   N/A   | Sum  |
 | Profiled Containers | APM Enterprise, Continuous Profiler    |   N/A        | Sum   |
@@ -150,7 +150,7 @@ Additionally, the organization has a monthly commitment of 0.3 GB of Ingested Sp
 | APM Ingested Spans | APM, APM Pro, APM Enterprise </br> Serverless APM, Legacy - Serverless Invocations </br> Legacy - Serverless Functions </br> Fargate Task (APM Pro), Fargate Task (APM Enterprise) | Sum | Sum | 
 | DBM Normalized Queries | Database Monitoring (DBM) | Average | Average |
 | Data Streams Monitoring | APM Pro, APM Enterprise | HWMP | Sum |
-| CSPM Workflow Executions | Cloud Security Management Pro, Cloud Security Management Enterprise | Sum | Sum |
+| CSPM Workflow Executions | Cloud Security Pro, Cloud Security Enterprise | Sum | Sum |
 | Fargate Task (Continuous Profiler) | Fargate Task (APM Enterprise) | Average | N/A |
 
 [1]: https://www.datadoghq.com/pricing/list/

content/en/account_management/billing/usage_metrics.md

@@ -56,8 +56,8 @@ Estimated usage metrics are generally available for the following usage types:
 | CWS Hosts                     | `datadog.estimated_usage.cws.hosts`, `datadog.estimated_usage.cws.hosts.by_tag` | Unique CWS hosts seen in the last hour. |
 | CWS Containers                | `datadog.estimated_usage.cws.containers`, `datadog.estimated_usage.cws.containers.by_tag` | Unique CWS containers seen in the last 5 minutes. |
 | Database Hosts                | `datadog.estimated_usage.dbm.hosts`, `datadog.estimated_usage.dbm.hosts.by_tag` | Unique DBM hosts seen in the last hour. |
-| ASM Hosts                     | `datadog.estimated_usage.asm.hosts`, `datadog.estimated_usage.asm.hosts.by_tag` | Unique ASM hosts seen in the last hour. |
-| ASM Tasks                     | `datadog.estimated_usage.asm.tasks`, `datadog.estimated_usage.asm.tasks.by_tag` | Unique ASM Fargate Tasks seen in the last 5 minutes. |
+| AAP Hosts                     | `datadog.estimated_usage.asm.hosts`, `datadog.estimated_usage.asm.hosts.by_tag` | Unique AAP hosts seen in the last hour. |
+| AAP Tasks                     | `datadog.estimated_usage.asm.tasks`, `datadog.estimated_usage.asm.tasks.by_tag` | Unique AAP Fargate Tasks seen in the last 5 minutes. |
 | Incident Management (Active Users)   | `datadog.estimated_usage.incident_management.active_users` | Active IM users seen from (calendar) month-to-date. |
 | CI Visibility Pipeline Committers | `datadog.estimated_usage.ci_visibility.pipeline.committers` | Pipeline committers seen from (calendar) month-to-date. |
 | CI Visibility Test Committers | `datadog.estimated_usage.ci_visibility.test.committers` | Test committers seen from (calendar) month-to-date. |

content/en/agent/configuration/dual-shipping.md

@@ -361,7 +361,7 @@ DD_NETWORK_PATH_FORWARDER_ADDITIONAL_ENDPOINTS="[{\"api_key\": \"apiKey2\", \"Ho
 
 {{% agent-dual-shipping %}}
 
-## Cloud Security Management Misconfigurations
+## Cloud Security Misconfigurations
 
 ### YAML configuration
 
@@ -386,7 +386,7 @@ DD_COMPLIANCE_CONFIG_ENDPOINTS_ADDITIONAL_ENDPOINTS="[{\"api_key\": \"apiKey2\",
 
 {{% agent-dual-shipping %}}
 
-## Cloud Security Management Threats
+## Workload Protection
 
 ### YAML configuration
 In `datadog.yaml`:

content/en/agent/remote_config/_index.md

@@ -12,7 +12,7 @@ further_reading:
   text: "Dynamic Instrumentation"
 - link: "/security/threats/setup"
   tag: "Documentation"
-  text: "Setting Up CSM Threats"
+  text: "Setting Up Workload Protection"
 - link: "https://www.datadoghq.com/blog/compliance-governance-transparency-with-datadog-audit-trail/"
   tag: "Blog"
   text: "Using Datadog Audit Trail"
@@ -30,7 +30,7 @@ algolia:
 ## Overview
 Remote Configuration is a Datadog capability that allows you to remotely configure and change the behavior of Datadog components (for example, Agents, tracing libraries, and Observability Pipelines Worker) deployed in your infrastructure, for select product features. Use Remote Configuration to apply configurations to Datadog components in your environment on demand, decreasing management costs, reducing friction between teams, and accelerating issue resolution times.
 
-For Datadog security products, Application Security Management and Cloud Security Management Threats (CSM Threats), Remote Configuration-enabled Agents and compatible tracing libraries provide real-time security updates and responses, enhancing security posture for your applications and cloud infrastructure.
+For Datadog security products, App and API Protection and Workload Protection, Remote Configuration-enabled Agents and compatible tracing libraries provide real-time security updates and responses, enhancing security posture for your applications and cloud infrastructure.
 
 ## How it works
 When Remote Configuration is enabled on the Datadog Agent, it periodically polls the configured [Datadog site][1], to determine whether there are configuration changes to apply to your Remote Configuration-enabled Agents or tracing libraries.
@@ -68,11 +68,11 @@ The following products and features are supported with Remote Configuration:
 ### Fleet Automation
 **[Send flares][27] directly from the Datadog site**. Seamlessly troubleshoot the Datadog Agent without directly accessing the host.
 
-### Application Security Management (ASM)
+### App and API Protection (AAP)
 
-- **1-click ASM activation**: Enable ASM in 1-click from the Datadog UI.
+- **1-click AAP activation**: Enable AAP in 1-click from the Datadog UI.
 - **In-App attack patterns updates**: Receive the newest Web Application Firewall (WAF) attack patterns automatically as Datadog releases them, following newly disclosed vulnerabilities or attack vectors.
-- **Protect**: Block attackers' IPs, authenticated users, and suspicious requests that are flagged in ASM Security Signals and Traces temporarily or permanently through the Datadog UI.
+- **Protect**: Block attackers' IPs, authenticated users, and suspicious requests that are flagged in AAP Security Signals and Traces temporarily or permanently through the Datadog UI.
 
 ### Application Performance Monitoring (APM)
 
@@ -84,9 +84,9 @@ The following products and features are supported with Remote Configuration:
 
 - Send critical metrics, traces, and logs from your live applications with no code changes.
 
-### CSM Threats
+### Workload Protection
 
-- **Automatic default Agent rule updates**: Automatically receive and update the default Agent rules maintained by Datadog as new Agent detections and enhancements are released. See [Setting Up CSM Threats][3] for more information.
+- **Automatic default Agent rule updates**: Automatically receive and update the default Agent rules maintained by Datadog as new Agent detections and enhancements are released. See [Setting Up Workload Protection][3] for more information.
 - **Automatic deployment of custom Agent rules**: Automatically deploy your custom Agent rules to designated hosts (all hosts or a defined subset of hosts).
 
 ### Observability Pipelines
@@ -113,7 +113,7 @@ Datadog implements the following safeguards to protect the confidentiality, inte
 ### Prerequisites
 
 - Datadog Agent version `7.41.1`  (`7.42.0` for APM sampling rate, `7.43.0` for APM Remote Instrumentation) or higher installed on your hosts or containers.
-- For Datadog products that use tracing libraries, you also need to upgrade your tracing libraries to a Remote Configuration-compatible version. For ASM Protection capabilities and ASM 1-click activation, see [ASM compatibility requirements][6]. For Dynamic Instrumentation, see [Dynamic Instrumentation prerequisites][20].
+- For Datadog products that use tracing libraries, you also need to upgrade your tracing libraries to a Remote Configuration-compatible version. For AAP Protection capabilities and AAP 1-click activation, see [AAP compatibility requirements][6]. For Dynamic Instrumentation, see [Dynamic Instrumentation prerequisites][20].
 
 ### Setup
 
@@ -174,10 +174,10 @@ To enable Remote Configuration:
 6. Restart your Agent for the changes to take effect.
 
 After you perform these steps, your Agent requests its configuration from Datadog, and the features that use remote configuration are enabled:
-- [CSM Threats default agent rules][9] update automatically as released.
+- [Workload Protection default Agent rules][9] update automatically as released.
 - [APM Agent-level sampling rates][10] are applied.
 - [Dynamic Instrumentation][11] is enabled.
-- [ASM 1-Click enablement, IP blocking, and attack pattern updates][12] are enabled.
+- [AAP 1-Click enablement, IP blocking, and attack pattern updates][12] are enabled.
 
 ## Best practices
 

content/en/all_guides.md

@@ -44,8 +44,8 @@ Guides in the Datadog documentation are pages that provide background knowledge,
 
 {{< whatsnext desc="Security:">}}
 {{< nextlink href="/security/cloud_siem/guide" >}}<i class="icon-siem" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Cloud SIEM{{< /nextlink >}}
-{{< nextlink href="/security/cloud_security_management/guide" >}}<i class="icon-cloud-security-management" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Cloud Security Management{{< /nextlink >}}
-{{< nextlink href="/security/application_security/guide" >}}<i class="icon-app-sec" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Application Security Management{{< /nextlink >}}
+{{< nextlink href="/security/cloud_security_management/guide" >}}<i class="icon-cloud-security-management" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;Cloud Security{{< /nextlink >}}
+{{< nextlink href="/security/application_security/guide" >}}<i class="icon-app-sec" style="font-size:25px;color:#7c3eb9;vertical-align:middle"></i>&nbsp;&nbsp;&nbsp;&nbsp;App and API Protection{{< /nextlink >}}
 {{< /whatsnext >}}
 
 {{< whatsnext desc="Digital Experience:">}}

content/en/containers/kubernetes/installation.md

@@ -293,7 +293,7 @@ helm uninstall datadog-agent
 ### Monitor your infrastructure in Datadog
 Use the [Containers][13] page for visibility into your container infrastructure, with resource metrics and faceted search. For information on how to use the Containers page, see [Containers View][14].
 
-Use the [Container Images][18] page for insights into every image used in your environment. This page also displays vulnerabilities found in your container images from [Cloud Security Management][19] (CSM). For information on how to use the Container Images page, see the [Containers Images View][20].
+Use the [Container Images][18] page for insights into every image used in your environment. This page also displays vulnerabilities found in your container images from [Cloud Security][19]. For information on how to use the Container Images page, see the [Containers Images View][20].
 
 The [Kubernetes][21] section features an overview of all your Kubernetes resources. [Orchestrator Explorer][22] allows you to monitor the state of pods, deployments, and other Kubernetes concepts in a specific namespace or availability zone, view resource specifications for failed pods within a deployment, correlate node activity with related logs, and more. The [Resource Utilization][23] page provides insights into how your Kubernetes workloads are using your computing resources across your infrastructure. For information on how to use these pages, see [Orchestrator Explorer][24] and [Kubernetes Resource Utilization][25].
 

content/en/data_security/_index.md

@@ -86,7 +86,7 @@ The Datadog tracing libraries are used to instrument your applications, services
 - Application Performance Monitoring (APM)
 - Continuous Profiler
 - CI Visibility
-- Application Security Management
+- App and API Protection
 
 For detailed information about how tracing-library sourced data is managed, default basic security settings, and custom obfuscating, scrubbing, excluding, and modifying of trace-related elements, read [Configuring Agent and Tracer for trace data security][18].
 

content/en/data_security/data_retention_periods.md

@@ -18,7 +18,7 @@ attributes:
        - **Indexed spans**: 15 or 30 days, determined by customer plan
        - **Services/resources statistics**: 30 days
        - **Viewed traces**: 15 months
-  - product: Application Security Management
+  - product: App and API Protection
     data_type: |
        - **Security signals**: 15 months
        - **Spans**: 90 days
@@ -40,14 +40,14 @@ attributes:
   - product: Cloud Cost Management
     data_type: | 
        - **Recommendations**: 90 days
-  - product: Cloud Security Management
+  - product: Cloud Security
     data_type: | 
        - **Findings and resolved vulnerabilities**: 15 months
   - product: Cloud SIEM
     data_type: | 
        - **Signals**: 15 months
        - **Detections, notifications, suppressions**: Retained for the duration of the account
-  - product: Cloud Workload Security
+  - product: Workload Protection
     data_type: | 
        - **Events**: 90 days
        - **Security signals**: 15 months

content/en/datadog_cloudcraft/_index.md

@@ -32,7 +32,7 @@ Cloudcraft's core functionality is its ability to generate detailed architecture
 
 - [Resource collection][2] must be enabled for your AWS accounts.
 - For the best experience, Datadog strongly recommends using the AWS-managed [`SecurityAudit`][5] policy, or the more permissive [`ReadOnlyAccess`][6] policy.
-- To view security misconfigurations on the [Security findings overlay](#security-findings), [CSM][3] must be enabled.
+- To view security misconfigurations on the [Security findings overlay](#security-findings), [Cloud Security][3] must be enabled.
 
 **Note**: Cloudcraft adapts to restrictive permissions by excluding inaccessible resources. For example, if you opt to not grant permission to list S3 buckets, the diagram will simply exclude those buckets. If permissions block certain resources, an alert is displayed in the UI.
 
@@ -125,15 +125,15 @@ Cloudcraft supports overlays that integrate various data sources and display the
 
 ### Security findings
 
-The security findings overlay in Cloudcraft provides an overlay from CSM misconfigurations, allowing you to quickly identify CSM findings. This allows you to:
+The security findings overlay in Cloudcraft provides an overlay from Cloud Security misconfigurations, allowing you to quickly identify Cloud Security findings. This allows you to:
 
 - Identify security issues in infrastructure diagrams.  
 - View misconfigurations in context to analyze their impact and prioritize remediation.
 - Assess security posture before deploying applications.
 
 By default, the security overlay shows Critical, High, and Medium misconfigurations, but can be filtered at the bottom of the screen:
 
-{{< img src="datadog_cloudcraft/csm_misconfigurations.png" alt="Screenshot of the CSM Misconfigurations hover in the Cloudcraft overlay section" width="50%" >}}
+{{< img src="datadog_cloudcraft/csm_misconfigurations.png" alt="Screenshot of the Cloud Security Misconfigurations hover in the Cloudcraft overlay section" width="50%" >}}
 
 ### Agent Overlay