diff --git a/.apigentools-info b/.apigentools-info
index d4d723485..e4e9c383a 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-02-12 18:33:49.810961",
-            "spec_repo_commit": "6a4cfb82"
+            "regenerated": "2025-02-13 17:14:22.887558",
+            "spec_repo_commit": "393eda14"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-02-12 18:33:49.826925",
-            "spec_repo_commit": "6a4cfb82"
+            "regenerated": "2025-02-13 17:14:22.904614",
+            "spec_repo_commit": "393eda14"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 5e1dce10c..2fb1ae839 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -3741,7 +3741,7 @@ components:
       properties:
         attributes:
           additionalProperties: {}
-          description: JSON object of attributes from CI Visibility test events.
+          description: JSON object of attributes from Test Optimization test events.
           example:
             customAttribute: 123
             duration: 2345
@@ -35086,8 +35086,8 @@ paths:
         - ci_visibility_read
   /api/v2/ci/tests/analytics/aggregate:
     post:
-      description: The API endpoint to aggregate CI Visibility test events into buckets
-        of computed metrics and timeseries.
+      description: The API endpoint to aggregate test events into buckets of computed
+        metrics and timeseries.
       operationId: AggregateCIAppTestEvents
       requestBody:
         content:
@@ -35115,7 +35115,7 @@ paths:
         - ci_visibility_read
       summary: Aggregate tests events
       tags:
-      - CI Visibility Tests
+      - Test Optimization
       x-codegen-request-body-name: body
       x-permission:
         operator: OR
@@ -35123,8 +35123,7 @@ paths:
         - ci_visibility_read
   /api/v2/ci/tests/events:
     get:
-      description: 'List endpoint returns CI Visibility test events that match a [search
-        query](https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/).
+      description: 'List endpoint returns test events that match a [search query](https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/).
 
         [Results are paginated similarly to logs](https://docs.datadoghq.com/logs/guide/collect-multiple-logs-with-pagination).
 
@@ -35199,7 +35198,7 @@ paths:
         - ci_visibility_read
       summary: Get a list of tests events
       tags:
-      - CI Visibility Tests
+      - Test Optimization
       x-pagination:
         cursorParam: page[cursor]
         cursorPath: meta.page.after
@@ -35211,8 +35210,7 @@ paths:
         - ci_visibility_read
   /api/v2/ci/tests/events/search:
     post:
-      description: 'List endpoint returns CI Visibility test events that match a [search
-        query](https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/).
+      description: 'List endpoint returns test events that match a [search query](https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/).
 
         [Results are paginated similarly to logs](https://docs.datadoghq.com/logs/guide/collect-multiple-logs-with-pagination).
 
@@ -35245,7 +35243,7 @@ paths:
         - ci_visibility_read
       summary: Search tests events
       tags:
-      - CI Visibility Tests
+      - Test Optimization
       x-codegen-request-body-name: body
       x-pagination:
         cursorParam: body.page.cursor
@@ -51224,10 +51222,6 @@ tags:
     to your Datadog site over HTTP. See the [CI Pipeline Visibility in Datadog page](https://docs.datadoghq.com/continuous_integration/pipelines/)
     for more information.
   name: CI Visibility Pipelines
-- description: Search or aggregate your CI Visibility test events over HTTP. See the
-    [Test Visibility in Datadog page](https://docs.datadoghq.com/tests/) for more
-    information.
-  name: CI Visibility Tests
 - description: 'Datadog Cloud Security Management (CSM) delivers real-time threat
     detection
 
@@ -51574,6 +51568,9 @@ tags:
 - description: View and manage teams within Datadog. See the [Teams page](https://docs.datadoghq.com/account_management/teams/)
     for more information.
   name: Teams
+- description: Search or aggregate your test events over HTTP. See the [Test Optimization
+    in Datadog](https://docs.datadoghq.com/tests/) page for more information.
+  name: Test Optimization
 - description: 'The usage metering API allows you to get hourly, daily, and
 
     monthly usage across multiple facets of Datadog.
diff --git a/examples/v2_ci-visibility-tests_AggregateCIAppTestEvents.rs b/examples/v2_test-optimization_AggregateCIAppTestEvents.rs
similarity index 92%
rename from examples/v2_ci-visibility-tests_AggregateCIAppTestEvents.rs
rename to examples/v2_test-optimization_AggregateCIAppTestEvents.rs
index 1ad250b15..caf37eb63 100644
--- a/examples/v2_ci-visibility-tests_AggregateCIAppTestEvents.rs
+++ b/examples/v2_test-optimization_AggregateCIAppTestEvents.rs
@@ -1,6 +1,6 @@
 // Aggregate tests events returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI;
+use datadog_api_client::datadogV2::api_test_optimization::TestOptimizationAPI;
 use datadog_api_client::datadogV2::model::CIAppAggregateSort;
 use datadog_api_client::datadogV2::model::CIAppAggregationFunction;
 use datadog_api_client::datadogV2::model::CIAppCompute;
@@ -30,7 +30,7 @@ async fn main() {
             .total(CIAppGroupByTotal::CIAppGroupByTotalBoolean(false))])
         .options(CIAppQueryOptions::new().timezone("GMT".to_string()));
     let configuration = datadog::Configuration::new();
-    let api = CIVisibilityTestsAPI::with_config(configuration);
+    let api = TestOptimizationAPI::with_config(configuration);
     let resp = api.aggregate_ci_app_test_events(body).await;
     if let Ok(value) = resp {
         println!("{:#?}", value);
diff --git a/examples/v2_ci-visibility-tests_ListCIAppTestEvents.rs b/examples/v2_test-optimization_ListCIAppTestEvents.rs
similarity index 81%
rename from examples/v2_ci-visibility-tests_ListCIAppTestEvents.rs
rename to examples/v2_test-optimization_ListCIAppTestEvents.rs
index edf4c8bdc..3bbf02ee8 100644
--- a/examples/v2_ci-visibility-tests_ListCIAppTestEvents.rs
+++ b/examples/v2_test-optimization_ListCIAppTestEvents.rs
@@ -1,13 +1,13 @@
 // Get a list of tests events returns "OK" response
 use chrono::{DateTime, Utc};
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::ListCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::ListCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::TestOptimizationAPI;
 
 #[tokio::main]
 async fn main() {
     let configuration = datadog::Configuration::new();
-    let api = CIVisibilityTestsAPI::with_config(configuration);
+    let api = TestOptimizationAPI::with_config(configuration);
     let resp = api
         .list_ci_app_test_events(
             ListCIAppTestEventsOptionalParams::default()
diff --git a/examples/v2_ci-visibility-tests_ListCIAppTestEvents_3852605281.rs b/examples/v2_test-optimization_ListCIAppTestEvents_3852605281.rs
similarity index 81%
rename from examples/v2_ci-visibility-tests_ListCIAppTestEvents_3852605281.rs
rename to examples/v2_test-optimization_ListCIAppTestEvents_3852605281.rs
index 03121314d..02430f0cb 100644
--- a/examples/v2_ci-visibility-tests_ListCIAppTestEvents_3852605281.rs
+++ b/examples/v2_test-optimization_ListCIAppTestEvents_3852605281.rs
@@ -1,15 +1,15 @@
 // Get a list of tests events returns "OK" response with pagination
 use chrono::{DateTime, Utc};
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::ListCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::ListCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::TestOptimizationAPI;
 use futures_util::pin_mut;
 use futures_util::stream::StreamExt;
 
 #[tokio::main]
 async fn main() {
     let configuration = datadog::Configuration::new();
-    let api = CIVisibilityTestsAPI::with_config(configuration);
+    let api = TestOptimizationAPI::with_config(configuration);
     let response = api.list_ci_app_test_events_with_pagination(
         ListCIAppTestEventsOptionalParams::default()
             .filter_from(
diff --git a/examples/v2_ci-visibility-tests_SearchCIAppTestEvents.rs b/examples/v2_test-optimization_SearchCIAppTestEvents.rs
similarity index 83%
rename from examples/v2_ci-visibility-tests_SearchCIAppTestEvents.rs
rename to examples/v2_test-optimization_SearchCIAppTestEvents.rs
index 2aa75bbaf..2f7d78b7c 100644
--- a/examples/v2_ci-visibility-tests_SearchCIAppTestEvents.rs
+++ b/examples/v2_test-optimization_SearchCIAppTestEvents.rs
@@ -1,7 +1,7 @@
 // Search tests events returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::SearchCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::SearchCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::TestOptimizationAPI;
 use datadog_api_client::datadogV2::model::CIAppQueryOptions;
 use datadog_api_client::datadogV2::model::CIAppQueryPageOptions;
 use datadog_api_client::datadogV2::model::CIAppSort;
@@ -21,7 +21,7 @@ async fn main() {
         .page(CIAppQueryPageOptions::new().limit(25))
         .sort(CIAppSort::TIMESTAMP_ASCENDING);
     let configuration = datadog::Configuration::new();
-    let api = CIVisibilityTestsAPI::with_config(configuration);
+    let api = TestOptimizationAPI::with_config(configuration);
     let resp = api
         .search_ci_app_test_events(SearchCIAppTestEventsOptionalParams::default().body(body))
         .await;
diff --git a/examples/v2_ci-visibility-tests_SearchCIAppTestEvents_1675695429.rs b/examples/v2_test-optimization_SearchCIAppTestEvents_1675695429.rs
similarity index 83%
rename from examples/v2_ci-visibility-tests_SearchCIAppTestEvents_1675695429.rs
rename to examples/v2_test-optimization_SearchCIAppTestEvents_1675695429.rs
index 5c2df3c82..662da0809 100644
--- a/examples/v2_ci-visibility-tests_SearchCIAppTestEvents_1675695429.rs
+++ b/examples/v2_test-optimization_SearchCIAppTestEvents_1675695429.rs
@@ -1,7 +1,7 @@
 // Search tests events returns "OK" response with pagination
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI;
-use datadog_api_client::datadogV2::api_ci_visibility_tests::SearchCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::SearchCIAppTestEventsOptionalParams;
+use datadog_api_client::datadogV2::api_test_optimization::TestOptimizationAPI;
 use datadog_api_client::datadogV2::model::CIAppQueryPageOptions;
 use datadog_api_client::datadogV2::model::CIAppSort;
 use datadog_api_client::datadogV2::model::CIAppTestEventsRequest;
@@ -21,7 +21,7 @@ async fn main() {
         .page(CIAppQueryPageOptions::new().limit(2))
         .sort(CIAppSort::TIMESTAMP_ASCENDING);
     let configuration = datadog::Configuration::new();
-    let api = CIVisibilityTestsAPI::with_config(configuration);
+    let api = TestOptimizationAPI::with_config(configuration);
     let response = api.search_ci_app_test_events_with_pagination(
         SearchCIAppTestEventsOptionalParams::default().body(body),
     );
diff --git a/src/datadogV2/api/api_ci_visibility_tests.rs b/src/datadogV2/api/api_test_optimization.rs
similarity index 95%
rename from src/datadogV2/api/api_ci_visibility_tests.rs
rename to src/datadogV2/api/api_test_optimization.rs
index 490f6c530..7991d45b9 100644
--- a/src/datadogV2/api/api_ci_visibility_tests.rs
+++ b/src/datadogV2/api/api_test_optimization.rs
@@ -12,7 +12,7 @@ use reqwest::header::{HeaderMap, HeaderValue};
 use serde::{Deserialize, Serialize};
 use std::io::Write;
 
-/// ListCIAppTestEventsOptionalParams is a struct for passing parameters to the method [`CIVisibilityTestsAPI::list_ci_app_test_events`]
+/// ListCIAppTestEventsOptionalParams is a struct for passing parameters to the method [`TestOptimizationAPI::list_ci_app_test_events`]
 #[non_exhaustive]
 #[derive(Clone, Default, Debug)]
 pub struct ListCIAppTestEventsOptionalParams {
@@ -63,7 +63,7 @@ impl ListCIAppTestEventsOptionalParams {
     }
 }
 
-/// SearchCIAppTestEventsOptionalParams is a struct for passing parameters to the method [`CIVisibilityTestsAPI::search_ci_app_test_events`]
+/// SearchCIAppTestEventsOptionalParams is a struct for passing parameters to the method [`TestOptimizationAPI::search_ci_app_test_events`]
 #[non_exhaustive]
 #[derive(Clone, Default, Debug)]
 pub struct SearchCIAppTestEventsOptionalParams {
@@ -77,7 +77,7 @@ impl SearchCIAppTestEventsOptionalParams {
     }
 }
 
-/// AggregateCIAppTestEventsError is a struct for typed errors of method [`CIVisibilityTestsAPI::aggregate_ci_app_test_events`]
+/// AggregateCIAppTestEventsError is a struct for typed errors of method [`TestOptimizationAPI::aggregate_ci_app_test_events`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum AggregateCIAppTestEventsError {
@@ -85,7 +85,7 @@ pub enum AggregateCIAppTestEventsError {
     UnknownValue(serde_json::Value),
 }
 
-/// ListCIAppTestEventsError is a struct for typed errors of method [`CIVisibilityTestsAPI::list_ci_app_test_events`]
+/// ListCIAppTestEventsError is a struct for typed errors of method [`TestOptimizationAPI::list_ci_app_test_events`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum ListCIAppTestEventsError {
@@ -93,7 +93,7 @@ pub enum ListCIAppTestEventsError {
     UnknownValue(serde_json::Value),
 }
 
-/// SearchCIAppTestEventsError is a struct for typed errors of method [`CIVisibilityTestsAPI::search_ci_app_test_events`]
+/// SearchCIAppTestEventsError is a struct for typed errors of method [`TestOptimizationAPI::search_ci_app_test_events`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum SearchCIAppTestEventsError {
@@ -101,20 +101,20 @@ pub enum SearchCIAppTestEventsError {
     UnknownValue(serde_json::Value),
 }
 
-/// Search or aggregate your CI Visibility test events over HTTP. See the [Test Visibility in Datadog page](<https://docs.datadoghq.com/tests/>) for more information.
+/// Search or aggregate your test events over HTTP. See the [Test Optimization in Datadog](<https://docs.datadoghq.com/tests/>) page for more information.
 #[derive(Debug, Clone)]
-pub struct CIVisibilityTestsAPI {
+pub struct TestOptimizationAPI {
     config: datadog::Configuration,
     client: reqwest_middleware::ClientWithMiddleware,
 }
 
-impl Default for CIVisibilityTestsAPI {
+impl Default for TestOptimizationAPI {
     fn default() -> Self {
         Self::with_config(datadog::Configuration::default())
     }
 }
 
-impl CIVisibilityTestsAPI {
+impl TestOptimizationAPI {
     pub fn new() -> Self {
         Self::default()
     }
@@ -166,7 +166,7 @@ impl CIVisibilityTestsAPI {
         Self { config, client }
     }
 
-    /// The API endpoint to aggregate CI Visibility test events into buckets of computed metrics and timeseries.
+    /// The API endpoint to aggregate test events into buckets of computed metrics and timeseries.
     pub async fn aggregate_ci_app_test_events(
         &self,
         body: crate::datadogV2::model::CIAppTestsAggregateRequest,
@@ -188,7 +188,7 @@ impl CIVisibilityTestsAPI {
         }
     }
 
-    /// The API endpoint to aggregate CI Visibility test events into buckets of computed metrics and timeseries.
+    /// The API endpoint to aggregate test events into buckets of computed metrics and timeseries.
     pub async fn aggregate_ci_app_test_events_with_http_info(
         &self,
         body: crate::datadogV2::model::CIAppTestsAggregateRequest,
@@ -321,7 +321,7 @@ impl CIVisibilityTestsAPI {
         }
     }
 
-    /// List endpoint returns CI Visibility test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
+    /// List endpoint returns test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
     /// [Results are paginated similarly to logs](<https://docs.datadoghq.com/logs/guide/collect-multiple-logs-with-pagination>).
     ///
     /// Use this endpoint to see your latest test events.
@@ -384,7 +384,7 @@ impl CIVisibilityTestsAPI {
         }
     }
 
-    /// List endpoint returns CI Visibility test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
+    /// List endpoint returns test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
     /// [Results are paginated similarly to logs](<https://docs.datadoghq.com/logs/guide/collect-multiple-logs-with-pagination>).
     ///
     /// Use this endpoint to see your latest test events.
@@ -510,7 +510,7 @@ impl CIVisibilityTestsAPI {
         }
     }
 
-    /// List endpoint returns CI Visibility test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
+    /// List endpoint returns test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
     /// [Results are paginated similarly to logs](<https://docs.datadoghq.com/logs/guide/collect-multiple-logs-with-pagination>).
     ///
     /// Use this endpoint to build complex events filtering and search.
@@ -579,7 +579,7 @@ impl CIVisibilityTestsAPI {
         }
     }
 
-    /// List endpoint returns CI Visibility test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
+    /// List endpoint returns test events that match a [search query](<https://docs.datadoghq.com/continuous_integration/explorer/search_syntax/>).
     /// [Results are paginated similarly to logs](<https://docs.datadoghq.com/logs/guide/collect-multiple-logs-with-pagination>).
     ///
     /// Use this endpoint to build complex events filtering and search.
diff --git a/src/datadogV2/api/mod.rs b/src/datadogV2/api/mod.rs
index 6b5fafc6e..d75f6e0fc 100644
--- a/src/datadogV2/api/mod.rs
+++ b/src/datadogV2/api/mod.rs
@@ -13,7 +13,6 @@ pub mod api_aws_integration;
 pub mod api_aws_logs_integration;
 pub mod api_case_management;
 pub mod api_ci_visibility_pipelines;
-pub mod api_ci_visibility_tests;
 pub mod api_cloud_cost_management;
 pub mod api_cloudflare_integration;
 pub mod api_confluent_cloud;
@@ -63,6 +62,7 @@ pub mod api_spans;
 pub mod api_spans_metrics;
 pub mod api_synthetics;
 pub mod api_teams;
+pub mod api_test_optimization;
 pub mod api_usage_metering;
 pub mod api_users;
 pub mod api_workflow_automation;
diff --git a/src/datadogV2/mod.rs b/src/datadogV2/mod.rs
index ab9c062fc..137480738 100644
--- a/src/datadogV2/mod.rs
+++ b/src/datadogV2/mod.rs
@@ -14,7 +14,6 @@ pub use self::api::api_aws_integration;
 pub use self::api::api_aws_logs_integration;
 pub use self::api::api_case_management;
 pub use self::api::api_ci_visibility_pipelines;
-pub use self::api::api_ci_visibility_tests;
 pub use self::api::api_cloud_cost_management;
 pub use self::api::api_cloudflare_integration;
 pub use self::api::api_confluent_cloud;
@@ -64,6 +63,7 @@ pub use self::api::api_spans;
 pub use self::api::api_spans_metrics;
 pub use self::api::api_synthetics;
 pub use self::api::api_teams;
+pub use self::api::api_test_optimization;
 pub use self::api::api_usage_metering;
 pub use self::api::api_users;
 pub use self::api::api_workflow_automation;
diff --git a/src/datadogV2/model/model_ci_app_event_attributes.rs b/src/datadogV2/model/model_ci_app_event_attributes.rs
index b5dcfcff5..fe1cc03ee 100644
--- a/src/datadogV2/model/model_ci_app_event_attributes.rs
+++ b/src/datadogV2/model/model_ci_app_event_attributes.rs
@@ -11,7 +11,7 @@ use std::fmt::{self, Formatter};
 #[skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct CIAppEventAttributes {
-    /// JSON object of attributes from CI Visibility test events.
+    /// JSON object of attributes from Test Optimization test events.
     #[serde(rename = "attributes")]
     pub attributes: Option<std::collections::BTreeMap<String, serde_json::Value>>,
     /// Array of tags associated with your event.
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Aggregate-tests-events-returns-OK-response.frozen b/tests/scenarios/cassettes/v2/test_optimization/Aggregate-tests-events-returns-OK-response.frozen
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Aggregate-tests-events-returns-OK-response.frozen
rename to tests/scenarios/cassettes/v2/test_optimization/Aggregate-tests-events-returns-OK-response.frozen
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Aggregate-tests-events-returns-OK-response.json b/tests/scenarios/cassettes/v2/test_optimization/Aggregate-tests-events-returns-OK-response.json
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Aggregate-tests-events-returns-OK-response.json
rename to tests/scenarios/cassettes/v2/test_optimization/Aggregate-tests-events-returns-OK-response.json
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response-with-pagination.frozen b/tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response-with-pagination.frozen
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response-with-pagination.frozen
rename to tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response-with-pagination.frozen
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response-with-pagination.json b/tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response-with-pagination.json
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response-with-pagination.json
rename to tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response-with-pagination.json
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response.frozen b/tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response.frozen
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response.frozen
rename to tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response.frozen
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response.json b/tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response.json
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Get-a-list-of-tests-events-returns-OK-response.json
rename to tests/scenarios/cassettes/v2/test_optimization/Get-a-list-of-tests-events-returns-OK-response.json
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response-with-pagination.frozen b/tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response-with-pagination.frozen
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response-with-pagination.frozen
rename to tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response-with-pagination.frozen
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response-with-pagination.json b/tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response-with-pagination.json
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response-with-pagination.json
rename to tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response-with-pagination.json
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response.frozen b/tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response.frozen
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response.frozen
rename to tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response.frozen
diff --git a/tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response.json b/tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response.json
similarity index 100%
rename from tests/scenarios/cassettes/v2/ci_visibility_tests/Search-tests-events-returns-OK-response.json
rename to tests/scenarios/cassettes/v2/test_optimization/Search-tests-events-returns-OK-response.json
diff --git a/tests/scenarios/features/v2/ci_visibility_tests.feature b/tests/scenarios/features/v2/test_optimization.feature
similarity index 93%
rename from tests/scenarios/features/v2/ci_visibility_tests.feature
rename to tests/scenarios/features/v2/test_optimization.feature
index 9d6f849b2..529f60d3f 100644
--- a/tests/scenarios/features/v2/ci_visibility_tests.feature
+++ b/tests/scenarios/features/v2/test_optimization.feature
@@ -1,13 +1,12 @@
-@endpoint(ci-visibility-tests) @endpoint(ci-visibility-tests-v2)
-Feature: CI Visibility Tests
-  Search or aggregate your CI Visibility test events over HTTP. See the
-  [Test Visibility in Datadog page](https://docs.datadoghq.com/tests/) for
-  more information.
+@endpoint(test-optimization) @endpoint(test-optimization-v2)
+Feature: Test Optimization
+  Search or aggregate your test events over HTTP. See the [Test Optimization
+  in Datadog](https://docs.datadoghq.com/tests/) page for more information.
 
   Background:
     Given a valid "apiKeyAuth" key in the system
     And a valid "appKeyAuth" key in the system
-    And an instance of "CIVisibilityTests" API
+    And an instance of "TestOptimization" API
 
   @generated @skip @team:Datadog/ci-app-backend
   Scenario: Aggregate tests events returns "Bad Request" response
diff --git a/tests/scenarios/features/v2/undo.json b/tests/scenarios/features/v2/undo.json
index 288ca835f..68313e321 100644
--- a/tests/scenarios/features/v2/undo.json
+++ b/tests/scenarios/features/v2/undo.json
@@ -453,19 +453,19 @@
     }
   },
   "AggregateCIAppTestEvents": {
-    "tag": "CI Visibility Tests",
+    "tag": "Test Optimization",
     "undo": {
       "type": "safe"
     }
   },
   "ListCIAppTestEvents": {
-    "tag": "CI Visibility Tests",
+    "tag": "Test Optimization",
     "undo": {
       "type": "safe"
     }
   },
   "SearchCIAppTestEvents": {
-    "tag": "CI Visibility Tests",
+    "tag": "Test Optimization",
     "undo": {
       "type": "safe"
     }
diff --git a/tests/scenarios/function_mappings.rs b/tests/scenarios/function_mappings.rs
index da5c3c01b..549da3cfb 100644
--- a/tests/scenarios/function_mappings.rs
+++ b/tests/scenarios/function_mappings.rs
@@ -63,8 +63,7 @@ pub struct ApiInstances {
     pub v2_api_software_catalog: Option<datadogV2::api_software_catalog::SoftwareCatalogAPI>,
     pub v2_api_ci_visibility_pipelines:
         Option<datadogV2::api_ci_visibility_pipelines::CIVisibilityPipelinesAPI>,
-    pub v2_api_ci_visibility_tests:
-        Option<datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI>,
+    pub v2_api_test_optimization: Option<datadogV2::api_test_optimization::TestOptimizationAPI>,
     pub v2_api_container_images: Option<datadogV2::api_container_images::ContainerImagesAPI>,
     pub v2_api_containers: Option<datadogV2::api_containers::ContainersAPI>,
     pub v2_api_cloud_cost_management:
@@ -542,9 +541,9 @@ pub fn initialize_api_instance(world: &mut DatadogWorld, api: String) {
                 world.http_client.as_ref().unwrap().clone()
             ));
         }
-        "CIVisibilityTests" => {
-            world.api_instances.v2_api_ci_visibility_tests = Some(
-                datadogV2::api_ci_visibility_tests::CIVisibilityTestsAPI::with_client_and_config(
+        "TestOptimization" => {
+            world.api_instances.v2_api_test_optimization = Some(
+                datadogV2::api_test_optimization::TestOptimizationAPI::with_client_and_config(
                     world.config.clone(),
                     world.http_client.as_ref().unwrap().clone(),
                 ),
@@ -13023,7 +13022,7 @@ fn test_v2_aggregate_ci_app_test_events(
 ) {
     let api = world
         .api_instances
-        .v2_api_ci_visibility_tests
+        .v2_api_test_optimization
         .as_ref()
         .expect("api instance not found");
     let body = serde_json::from_value(_parameters.get("body").unwrap().clone()).unwrap();
@@ -13048,7 +13047,7 @@ fn test_v2_aggregate_ci_app_test_events(
 fn test_v2_list_ci_app_test_events(world: &mut DatadogWorld, _parameters: &HashMap<String, Value>) {
     let api = world
         .api_instances
-        .v2_api_ci_visibility_tests
+        .v2_api_test_optimization
         .as_ref()
         .expect("api instance not found");
     let filter_query = _parameters
@@ -13069,8 +13068,7 @@ fn test_v2_list_ci_app_test_events(world: &mut DatadogWorld, _parameters: &HashM
     let page_limit = _parameters
         .get("page[limit]")
         .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
-    let mut params =
-        datadogV2::api_ci_visibility_tests::ListCIAppTestEventsOptionalParams::default();
+    let mut params = datadogV2::api_test_optimization::ListCIAppTestEventsOptionalParams::default();
     params.filter_query = filter_query;
     params.filter_from = filter_from;
     params.filter_to = filter_to;
@@ -13100,7 +13098,7 @@ fn test_v2_list_ci_app_test_events_with_pagination(
 ) {
     let api = world
         .api_instances
-        .v2_api_ci_visibility_tests
+        .v2_api_test_optimization
         .as_ref()
         .expect("api instance not found");
     let filter_query = _parameters
@@ -13121,8 +13119,7 @@ fn test_v2_list_ci_app_test_events_with_pagination(
     let page_limit = _parameters
         .get("page[limit]")
         .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
-    let mut params =
-        datadogV2::api_ci_visibility_tests::ListCIAppTestEventsOptionalParams::default();
+    let mut params = datadogV2::api_test_optimization::ListCIAppTestEventsOptionalParams::default();
     params.filter_query = filter_query;
     params.filter_from = filter_from;
     params.filter_to = filter_to;
@@ -13163,14 +13160,14 @@ fn test_v2_search_ci_app_test_events(
 ) {
     let api = world
         .api_instances
-        .v2_api_ci_visibility_tests
+        .v2_api_test_optimization
         .as_ref()
         .expect("api instance not found");
     let body = _parameters
         .get("body")
         .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
     let mut params =
-        datadogV2::api_ci_visibility_tests::SearchCIAppTestEventsOptionalParams::default();
+        datadogV2::api_test_optimization::SearchCIAppTestEventsOptionalParams::default();
     params.body = body;
     let response = match block_on(api.search_ci_app_test_events_with_http_info(params)) {
         Ok(response) => response,
@@ -13195,14 +13192,14 @@ fn test_v2_search_ci_app_test_events_with_pagination(
 ) {
     let api = world
         .api_instances
-        .v2_api_ci_visibility_tests
+        .v2_api_test_optimization
         .as_ref()
         .expect("api instance not found");
     let body = _parameters
         .get("body")
         .and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
     let mut params =
-        datadogV2::api_ci_visibility_tests::SearchCIAppTestEventsOptionalParams::default();
+        datadogV2::api_test_optimization::SearchCIAppTestEventsOptionalParams::default();
     params.body = body;
     let response = api.search_ci_app_test_events_with_pagination(params);
     let mut result = Vec::new();