diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 2dd2ab3a82..59a1b11c29 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -69285,7 +69285,7 @@ components:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetRecordsDataAttributesRequest"
         type:
-          $ref: "#/components/schemas/LLMObsRecordType"
+          $ref: "#/components/schemas/LLMObsDatasetType"
       required:
         - type
         - attributes
@@ -69350,7 +69350,7 @@ components:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetRecordsUpdateDataAttributesRequest"
         type:
-          $ref: "#/components/schemas/LLMObsRecordType"
+          $ref: "#/components/schemas/LLMObsDatasetType"
       required:
         - type
         - attributes
@@ -69687,7 +69687,7 @@ components:
         attributes:
           $ref: "#/components/schemas/LLMObsDeleteDatasetRecordsDataAttributesRequest"
         type:
-          $ref: "#/components/schemas/LLMObsRecordType"
+          $ref: "#/components/schemas/LLMObsDatasetType"
       required:
         - type
         - attributes
@@ -69926,14 +69926,6 @@ components:
       type: string
       x-enum-varnames:
         - DISPLAY_BLOCK
-    LLMObsEventType:
-      description: Resource type for Agent Observability experiment events.
-      enum:
-        - events
-      example: events
-      type: string
-      x-enum-varnames:
-        - EVENTS
     LLMObsExperimentDataAttributesRequest:
       description: Attributes for creating an Agent Observability experiment.
       properties:
@@ -70189,7 +70181,7 @@ components:
         attributes:
           $ref: "#/components/schemas/LLMObsExperimentEventsDataAttributesRequest"
         type:
-          $ref: "#/components/schemas/LLMObsEventType"
+          $ref: "#/components/schemas/LLMObsExperimentType"
       required:
         - type
         - attributes
@@ -73735,14 +73727,6 @@ components:
       required:
         - data
       type: object
-    LLMObsRecordType:
-      description: Resource type of Agent Observability dataset records.
-      enum:
-        - records
-      example: records
-      type: string
-      x-enum-varnames:
-        - RECORDS
     LLMObsSearchSpansRequest:
       description: Request body for searching Agent Observability spans.
       properties:
@@ -192310,7 +192294,7 @@ paths:
                           start_ns: 1705314600000000000
                           status: ok
                           trace_id: abc123def456
-                    type: events
+                    type: experiments
             schema:
               $ref: "#/components/schemas/LLMObsExperimentEventsRequest"
         description: Experiment events payload.
@@ -195577,7 +195561,7 @@ paths:
                     attributes:
                       records:
                         - id: rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c
-                    type: records
+                    type: datasets
             schema:
               $ref: "#/components/schemas/LLMObsDatasetRecordsUpdateRequest"
         description: Update records payload.
@@ -195652,7 +195636,7 @@ paths:
               default:
                 value:
                   data:
-                    type: records
+                    type: datasets
             schema:
               $ref: "#/components/schemas/LLMObsDatasetRecordsRequest"
         description: Append records payload.
@@ -195751,7 +195735,7 @@ paths:
                     attributes:
                       record_ids:
                         - rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c
-                    type: records
+                    type: datasets
             schema:
               $ref: "#/components/schemas/LLMObsDeleteDatasetRecordsRequest"
         description: Delete records payload.
diff --git a/examples/v2/agent-observability/CreateLLMObsDatasetRecords.py b/examples/v2/agent-observability/CreateLLMObsDatasetRecords.py
index bed3eeac28..4e6effa932 100644
--- a/examples/v2/agent-observability/CreateLLMObsDatasetRecords.py
+++ b/examples/v2/agent-observability/CreateLLMObsDatasetRecords.py
@@ -11,7 +11,7 @@
 )
 from datadog_api_client.v2.model.llm_obs_dataset_records_data_request import LLMObsDatasetRecordsDataRequest
 from datadog_api_client.v2.model.llm_obs_dataset_records_request import LLMObsDatasetRecordsRequest
-from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
 body = LLMObsDatasetRecordsRequest(
     data=LLMObsDatasetRecordsDataRequest(
@@ -23,7 +23,7 @@
                 ),
             ],
         ),
-        type=LLMObsRecordType.RECORDS,
+        type=LLMObsDatasetType.DATASETS,
     ),
 )
 
diff --git a/examples/v2/agent-observability/CreateLLMObsExperimentEvents.py b/examples/v2/agent-observability/CreateLLMObsExperimentEvents.py
index 2eada8d6e7..75ec9b8afd 100644
--- a/examples/v2/agent-observability/CreateLLMObsExperimentEvents.py
+++ b/examples/v2/agent-observability/CreateLLMObsExperimentEvents.py
@@ -5,7 +5,6 @@
 from os import environ
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v2.api.agent_observability_api import AgentObservabilityApi
-from datadog_api_client.v2.model.llm_obs_event_type import LLMObsEventType
 from datadog_api_client.v2.model.llm_obs_experiment_events_data_attributes_request import (
     LLMObsExperimentEventsDataAttributesRequest,
 )
@@ -17,6 +16,7 @@
 from datadog_api_client.v2.model.llm_obs_experiment_span_error import LLMObsExperimentSpanError
 from datadog_api_client.v2.model.llm_obs_experiment_span_meta import LLMObsExperimentSpanMeta
 from datadog_api_client.v2.model.llm_obs_experiment_span_status import LLMObsExperimentSpanStatus
+from datadog_api_client.v2.model.llm_obs_experiment_type import LLMObsExperimentType
 from datadog_api_client.v2.model.llm_obs_metric_assessment import LLMObsMetricAssessment
 from datadog_api_client.v2.model.llm_obs_metric_score_type import LLMObsMetricScoreType
 
@@ -57,7 +57,7 @@
                 ),
             ],
         ),
-        type=LLMObsEventType.EVENTS,
+        type=LLMObsExperimentType.EXPERIMENTS,
     ),
 )
 
diff --git a/examples/v2/agent-observability/DeleteLLMObsDatasetRecords.py b/examples/v2/agent-observability/DeleteLLMObsDatasetRecords.py
index 38fb30af49..5770f5ba06 100644
--- a/examples/v2/agent-observability/DeleteLLMObsDatasetRecords.py
+++ b/examples/v2/agent-observability/DeleteLLMObsDatasetRecords.py
@@ -5,6 +5,7 @@
 from os import environ
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v2.api.agent_observability_api import AgentObservabilityApi
+from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 from datadog_api_client.v2.model.llm_obs_delete_dataset_records_data_attributes_request import (
     LLMObsDeleteDatasetRecordsDataAttributesRequest,
 )
@@ -12,7 +13,6 @@
     LLMObsDeleteDatasetRecordsDataRequest,
 )
 from datadog_api_client.v2.model.llm_obs_delete_dataset_records_request import LLMObsDeleteDatasetRecordsRequest
-from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
 
 body = LLMObsDeleteDatasetRecordsRequest(
     data=LLMObsDeleteDatasetRecordsDataRequest(
@@ -21,7 +21,7 @@
                 "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c",
             ],
         ),
-        type=LLMObsRecordType.RECORDS,
+        type=LLMObsDatasetType.DATASETS,
     ),
 )
 
diff --git a/examples/v2/agent-observability/UpdateLLMObsDatasetRecords.py b/examples/v2/agent-observability/UpdateLLMObsDatasetRecords.py
index edff5debc7..4d2491c477 100644
--- a/examples/v2/agent-observability/UpdateLLMObsDatasetRecords.py
+++ b/examples/v2/agent-observability/UpdateLLMObsDatasetRecords.py
@@ -13,7 +13,7 @@
     LLMObsDatasetRecordsUpdateDataRequest,
 )
 from datadog_api_client.v2.model.llm_obs_dataset_records_update_request import LLMObsDatasetRecordsUpdateRequest
-from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
 body = LLMObsDatasetRecordsUpdateRequest(
     data=LLMObsDatasetRecordsUpdateDataRequest(
@@ -26,7 +26,7 @@
                 ),
             ],
         ),
-        type=LLMObsRecordType.RECORDS,
+        type=LLMObsDatasetType.DATASETS,
     ),
 )
 
diff --git a/src/datadog_api_client/v2/model/llm_obs_dataset_records_data_request.py b/src/datadog_api_client/v2/model/llm_obs_dataset_records_data_request.py
index 0ea3621489..8d254bbe0d 100644
--- a/src/datadog_api_client/v2/model/llm_obs_dataset_records_data_request.py
+++ b/src/datadog_api_client/v2/model/llm_obs_dataset_records_data_request.py
@@ -15,7 +15,7 @@
     from datadog_api_client.v2.model.llm_obs_dataset_records_data_attributes_request import (
         LLMObsDatasetRecordsDataAttributesRequest,
     )
-    from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+    from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
 
 class LLMObsDatasetRecordsDataRequest(ModelNormal):
@@ -24,11 +24,11 @@ def openapi_types(_):
         from datadog_api_client.v2.model.llm_obs_dataset_records_data_attributes_request import (
             LLMObsDatasetRecordsDataAttributesRequest,
         )
-        from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+        from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
         return {
             "attributes": (LLMObsDatasetRecordsDataAttributesRequest,),
-            "type": (LLMObsRecordType,),
+            "type": (LLMObsDatasetType,),
         }
 
     attribute_map = {
@@ -36,15 +36,15 @@ def openapi_types(_):
         "type": "type",
     }
 
-    def __init__(self_, attributes: LLMObsDatasetRecordsDataAttributesRequest, type: LLMObsRecordType, **kwargs):
+    def __init__(self_, attributes: LLMObsDatasetRecordsDataAttributesRequest, type: LLMObsDatasetType, **kwargs):
         """
         Data object for appending records to an Agent Observability dataset.
 
         :param attributes: Attributes for appending records to an Agent Observability dataset.
         :type attributes: LLMObsDatasetRecordsDataAttributesRequest
 
-        :param type: Resource type of Agent Observability dataset records.
-        :type type: LLMObsRecordType
+        :param type: Resource type of an Agent Observability dataset.
+        :type type: LLMObsDatasetType
         """
         super().__init__(kwargs)
 
diff --git a/src/datadog_api_client/v2/model/llm_obs_dataset_records_update_data_request.py b/src/datadog_api_client/v2/model/llm_obs_dataset_records_update_data_request.py
index f7c5e32fdf..38f5c762e8 100644
--- a/src/datadog_api_client/v2/model/llm_obs_dataset_records_update_data_request.py
+++ b/src/datadog_api_client/v2/model/llm_obs_dataset_records_update_data_request.py
@@ -15,7 +15,7 @@
     from datadog_api_client.v2.model.llm_obs_dataset_records_update_data_attributes_request import (
         LLMObsDatasetRecordsUpdateDataAttributesRequest,
     )
-    from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+    from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
 
 class LLMObsDatasetRecordsUpdateDataRequest(ModelNormal):
@@ -24,11 +24,11 @@ def openapi_types(_):
         from datadog_api_client.v2.model.llm_obs_dataset_records_update_data_attributes_request import (
             LLMObsDatasetRecordsUpdateDataAttributesRequest,
         )
-        from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+        from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
         return {
             "attributes": (LLMObsDatasetRecordsUpdateDataAttributesRequest,),
-            "type": (LLMObsRecordType,),
+            "type": (LLMObsDatasetType,),
         }
 
     attribute_map = {
@@ -36,15 +36,15 @@ def openapi_types(_):
         "type": "type",
     }
 
-    def __init__(self_, attributes: LLMObsDatasetRecordsUpdateDataAttributesRequest, type: LLMObsRecordType, **kwargs):
+    def __init__(self_, attributes: LLMObsDatasetRecordsUpdateDataAttributesRequest, type: LLMObsDatasetType, **kwargs):
         """
         Data object for updating records in an Agent Observability dataset.
 
         :param attributes: Attributes for updating records in an Agent Observability dataset.
         :type attributes: LLMObsDatasetRecordsUpdateDataAttributesRequest
 
-        :param type: Resource type of Agent Observability dataset records.
-        :type type: LLMObsRecordType
+        :param type: Resource type of an Agent Observability dataset.
+        :type type: LLMObsDatasetType
         """
         super().__init__(kwargs)
 
diff --git a/src/datadog_api_client/v2/model/llm_obs_delete_dataset_records_data_request.py b/src/datadog_api_client/v2/model/llm_obs_delete_dataset_records_data_request.py
index 4f045c679e..dd406850b5 100644
--- a/src/datadog_api_client/v2/model/llm_obs_delete_dataset_records_data_request.py
+++ b/src/datadog_api_client/v2/model/llm_obs_delete_dataset_records_data_request.py
@@ -15,7 +15,7 @@
     from datadog_api_client.v2.model.llm_obs_delete_dataset_records_data_attributes_request import (
         LLMObsDeleteDatasetRecordsDataAttributesRequest,
     )
-    from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+    from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
 
 class LLMObsDeleteDatasetRecordsDataRequest(ModelNormal):
@@ -24,11 +24,11 @@ def openapi_types(_):
         from datadog_api_client.v2.model.llm_obs_delete_dataset_records_data_attributes_request import (
             LLMObsDeleteDatasetRecordsDataAttributesRequest,
         )
-        from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
+        from datadog_api_client.v2.model.llm_obs_dataset_type import LLMObsDatasetType
 
         return {
             "attributes": (LLMObsDeleteDatasetRecordsDataAttributesRequest,),
-            "type": (LLMObsRecordType,),
+            "type": (LLMObsDatasetType,),
         }
 
     attribute_map = {
@@ -36,15 +36,15 @@ def openapi_types(_):
         "type": "type",
     }
 
-    def __init__(self_, attributes: LLMObsDeleteDatasetRecordsDataAttributesRequest, type: LLMObsRecordType, **kwargs):
+    def __init__(self_, attributes: LLMObsDeleteDatasetRecordsDataAttributesRequest, type: LLMObsDatasetType, **kwargs):
         """
         Data object for deleting records from an Agent Observability dataset.
 
         :param attributes: Attributes for deleting records from an Agent Observability dataset.
         :type attributes: LLMObsDeleteDatasetRecordsDataAttributesRequest
 
-        :param type: Resource type of Agent Observability dataset records.
-        :type type: LLMObsRecordType
+        :param type: Resource type of an Agent Observability dataset.
+        :type type: LLMObsDatasetType
         """
         super().__init__(kwargs)
 
diff --git a/src/datadog_api_client/v2/model/llm_obs_event_type.py b/src/datadog_api_client/v2/model/llm_obs_event_type.py
deleted file mode 100644
index b246a31a63..0000000000
--- a/src/datadog_api_client/v2/model/llm_obs_event_type.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
-# This product includes software developed at Datadog (https://www.datadoghq.com/).
-# Copyright 2019-Present Datadog, Inc.
-from __future__ import annotations
-
-
-from datadog_api_client.model_utils import (
-    ModelSimple,
-    cached_property,
-)
-
-from typing import ClassVar
-
-
-class LLMObsEventType(ModelSimple):
-    """
-    Resource type for Agent Observability experiment events.
-
-    :param value: If omitted defaults to "events". Must be one of ["events"].
-    :type value: str
-    """
-
-    allowed_values = {
-        "events",
-    }
-    EVENTS: ClassVar["LLMObsEventType"]
-
-    @cached_property
-    def openapi_types(_):
-        return {
-            "value": (str,),
-        }
-
-
-LLMObsEventType.EVENTS = LLMObsEventType("events")
diff --git a/src/datadog_api_client/v2/model/llm_obs_experiment_events_data_request.py b/src/datadog_api_client/v2/model/llm_obs_experiment_events_data_request.py
index 891acd31dd..b79c048a6d 100644
--- a/src/datadog_api_client/v2/model/llm_obs_experiment_events_data_request.py
+++ b/src/datadog_api_client/v2/model/llm_obs_experiment_events_data_request.py
@@ -15,7 +15,7 @@
     from datadog_api_client.v2.model.llm_obs_experiment_events_data_attributes_request import (
         LLMObsExperimentEventsDataAttributesRequest,
     )
-    from datadog_api_client.v2.model.llm_obs_event_type import LLMObsEventType
+    from datadog_api_client.v2.model.llm_obs_experiment_type import LLMObsExperimentType
 
 
 class LLMObsExperimentEventsDataRequest(ModelNormal):
@@ -24,11 +24,11 @@ def openapi_types(_):
         from datadog_api_client.v2.model.llm_obs_experiment_events_data_attributes_request import (
             LLMObsExperimentEventsDataAttributesRequest,
         )
-        from datadog_api_client.v2.model.llm_obs_event_type import LLMObsEventType
+        from datadog_api_client.v2.model.llm_obs_experiment_type import LLMObsExperimentType
 
         return {
             "attributes": (LLMObsExperimentEventsDataAttributesRequest,),
-            "type": (LLMObsEventType,),
+            "type": (LLMObsExperimentType,),
         }
 
     attribute_map = {
@@ -36,15 +36,15 @@ def openapi_types(_):
         "type": "type",
     }
 
-    def __init__(self_, attributes: LLMObsExperimentEventsDataAttributesRequest, type: LLMObsEventType, **kwargs):
+    def __init__(self_, attributes: LLMObsExperimentEventsDataAttributesRequest, type: LLMObsExperimentType, **kwargs):
         """
         Data object for pushing experiment events.
 
         :param attributes: Attributes for pushing experiment events including spans and metrics.
         :type attributes: LLMObsExperimentEventsDataAttributesRequest
 
-        :param type: Resource type for Agent Observability experiment events.
-        :type type: LLMObsEventType
+        :param type: Resource type of an Agent Observability experiment.
+        :type type: LLMObsExperimentType
         """
         super().__init__(kwargs)
 
diff --git a/src/datadog_api_client/v2/model/llm_obs_record_type.py b/src/datadog_api_client/v2/model/llm_obs_record_type.py
deleted file mode 100644
index ab84a8096a..0000000000
--- a/src/datadog_api_client/v2/model/llm_obs_record_type.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
-# This product includes software developed at Datadog (https://www.datadoghq.com/).
-# Copyright 2019-Present Datadog, Inc.
-from __future__ import annotations
-
-
-from datadog_api_client.model_utils import (
-    ModelSimple,
-    cached_property,
-)
-
-from typing import ClassVar
-
-
-class LLMObsRecordType(ModelSimple):
-    """
-    Resource type of Agent Observability dataset records.
-
-    :param value: If omitted defaults to "records". Must be one of ["records"].
-    :type value: str
-    """
-
-    allowed_values = {
-        "records",
-    }
-    RECORDS: ClassVar["LLMObsRecordType"]
-
-    @cached_property
-    def openapi_types(_):
-        return {
-            "value": (str,),
-        }
-
-
-LLMObsRecordType.RECORDS = LLMObsRecordType("records")
diff --git a/src/datadog_api_client/v2/models/__init__.py b/src/datadog_api_client/v2/models/__init__.py
index 825b1cb371..1d8df9d0ec 100644
--- a/src/datadog_api_client/v2/models/__init__.py
+++ b/src/datadog_api_client/v2/models/__init__.py
@@ -5653,7 +5653,6 @@
     LLMObsDisplayBlockInteractionResponseItem,
 )
 from datadog_api_client.v2.model.llm_obs_display_block_interaction_type import LLMObsDisplayBlockInteractionType
-from datadog_api_client.v2.model.llm_obs_event_type import LLMObsEventType
 from datadog_api_client.v2.model.llm_obs_experiment_data_attributes_request import LLMObsExperimentDataAttributesRequest
 from datadog_api_client.v2.model.llm_obs_experiment_data_attributes_response import (
     LLMObsExperimentDataAttributesResponse,
@@ -5913,7 +5912,6 @@
 from datadog_api_client.v2.model.llm_obs_prompt_version_type import LLMObsPromptVersionType
 from datadog_api_client.v2.model.llm_obs_prompt_versions_response import LLMObsPromptVersionsResponse
 from datadog_api_client.v2.model.llm_obs_prompts_response import LLMObsPromptsResponse
-from datadog_api_client.v2.model.llm_obs_record_type import LLMObsRecordType
 from datadog_api_client.v2.model.llm_obs_search_spans_request import LLMObsSearchSpansRequest
 from datadog_api_client.v2.model.llm_obs_search_spans_request_attributes import LLMObsSearchSpansRequestAttributes
 from datadog_api_client.v2.model.llm_obs_search_spans_request_data import LLMObsSearchSpansRequestData
@@ -16801,7 +16799,6 @@
     "LLMObsDisplayBlockInteractionItem",
     "LLMObsDisplayBlockInteractionResponseItem",
     "LLMObsDisplayBlockInteractionType",
-    "LLMObsEventType",
     "LLMObsExperimentDataAttributesRequest",
     "LLMObsExperimentDataAttributesResponse",
     "LLMObsExperimentDataRequest",
@@ -16983,7 +16980,6 @@
     "LLMObsPromptVersionType",
     "LLMObsPromptVersionsResponse",
     "LLMObsPromptsResponse",
-    "LLMObsRecordType",
     "LLMObsSearchSpansRequest",
     "LLMObsSearchSpansRequestAttributes",
     "LLMObsSearchSpansRequestData",
diff --git a/tests/v2/features/agent_observability.feature b/tests/v2/features/agent_observability.feature
index 19014ea4a7..5bc52de225 100644
--- a/tests/v2/features/agent_observability.feature
+++ b/tests/v2/features/agent_observability.feature
@@ -75,7 +75,7 @@ Feature: Agent Observability
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -85,7 +85,7 @@ Feature: Agent Observability
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 201 Created
 
@@ -95,7 +95,7 @@ Feature: Agent Observability
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -105,7 +105,7 @@ Feature: Agent Observability
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 200 OK
 
@@ -423,7 +423,7 @@ Feature: Agent Observability
     And new "DeleteLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"record_ids": ["rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"record_ids": ["rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -433,7 +433,7 @@ Feature: Agent Observability
     And new "DeleteLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"record_ids": ["rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"record_ids": ["rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 204 No Content
 
@@ -443,7 +443,7 @@ Feature: Agent Observability
     And new "DeleteLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"record_ids": ["rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"record_ids": ["rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c"]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -1309,7 +1309,7 @@ Feature: Agent Observability
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"metrics": [{"assessment": "pass", "error": {}, "label": "faithfulness", "metric_type": "score", "span_id": "span-7a1b2c3d", "tags": [], "timestamp_ms": 1705314600000}], "spans": [{"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "duration": 1500000000, "meta": {"error": {"message": "Model response timed out", "stack": "Traceback (most recent call last):\n  File \"main.py\", line 10, in <module>\n    response = model.generate(input)\n  File \"model.py\", line 45, in generate\n    raise TimeoutError(\"Model response timed out\")\nTimeoutError: Model response timed out", "type": "TimeoutError"}, "input": null, "output": null}, "name": "llm_call", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "span_id": "span-7a1b2c3d", "start_ns": 1705314600000000000, "status": "ok", "tags": [], "trace_id": "abc123def456"}]}, "type": "events"}}
+    And body with value {"data": {"attributes": {"metrics": [{"assessment": "pass", "error": {}, "label": "faithfulness", "metric_type": "score", "span_id": "span-7a1b2c3d", "tags": [], "timestamp_ms": 1705314600000}], "spans": [{"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "duration": 1500000000, "meta": {"error": {"message": "Model response timed out", "stack": "Traceback (most recent call last):\n  File \"main.py\", line 10, in <module>\n    response = model.generate(input)\n  File \"model.py\", line 45, in generate\n    raise TimeoutError(\"Model response timed out\")\nTimeoutError: Model response timed out", "type": "TimeoutError"}, "input": null, "output": null}, "name": "llm_call", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "span_id": "span-7a1b2c3d", "start_ns": 1705314600000000000, "status": "ok", "tags": [], "trace_id": "abc123def456"}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 202 Accepted
 
@@ -1318,7 +1318,7 @@ Feature: Agent Observability
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"metrics": [{"assessment": "pass", "error": {}, "label": "faithfulness", "metric_type": "score", "span_id": "span-7a1b2c3d", "tags": [], "timestamp_ms": 1705314600000}], "spans": [{"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "duration": 1500000000, "meta": {"error": {"message": "Model response timed out", "stack": "Traceback (most recent call last):\n  File \"main.py\", line 10, in <module>\n    response = model.generate(input)\n  File \"model.py\", line 45, in generate\n    raise TimeoutError(\"Model response timed out\")\nTimeoutError: Model response timed out", "type": "TimeoutError"}, "input": null, "output": null}, "name": "llm_call", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "span_id": "span-7a1b2c3d", "start_ns": 1705314600000000000, "status": "ok", "tags": [], "trace_id": "abc123def456"}]}, "type": "events"}}
+    And body with value {"data": {"attributes": {"metrics": [{"assessment": "pass", "error": {}, "label": "faithfulness", "metric_type": "score", "span_id": "span-7a1b2c3d", "tags": [], "timestamp_ms": 1705314600000}], "spans": [{"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "duration": 1500000000, "meta": {"error": {"message": "Model response timed out", "stack": "Traceback (most recent call last):\n  File \"main.py\", line 10, in <module>\n    response = model.generate(input)\n  File \"model.py\", line 45, in generate\n    raise TimeoutError(\"Model response timed out\")\nTimeoutError: Model response timed out", "type": "TimeoutError"}, "input": null, "output": null}, "name": "llm_call", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "span_id": "span-7a1b2c3d", "start_ns": 1705314600000000000, "status": "ok", "tags": [], "trace_id": "abc123def456"}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -1327,7 +1327,7 @@ Feature: Agent Observability
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"metrics": [{"assessment": "pass", "error": {}, "label": "faithfulness", "metric_type": "score", "span_id": "span-7a1b2c3d", "tags": [], "timestamp_ms": 1705314600000}], "spans": [{"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "duration": 1500000000, "meta": {"error": {"message": "Model response timed out", "stack": "Traceback (most recent call last):\n  File \"main.py\", line 10, in <module>\n    response = model.generate(input)\n  File \"model.py\", line 45, in generate\n    raise TimeoutError(\"Model response timed out\")\nTimeoutError: Model response timed out", "type": "TimeoutError"}, "input": null, "output": null}, "name": "llm_call", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "span_id": "span-7a1b2c3d", "start_ns": 1705314600000000000, "status": "ok", "tags": [], "trace_id": "abc123def456"}]}, "type": "events"}}
+    And body with value {"data": {"attributes": {"metrics": [{"assessment": "pass", "error": {}, "label": "faithfulness", "metric_type": "score", "span_id": "span-7a1b2c3d", "tags": [], "timestamp_ms": 1705314600000}], "spans": [{"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "duration": 1500000000, "meta": {"error": {"message": "Model response timed out", "stack": "Traceback (most recent call last):\n  File \"main.py\", line 10, in <module>\n    response = model.generate(input)\n  File \"model.py\", line 45, in generate\n    raise TimeoutError(\"Model response timed out\")\nTimeoutError: Model response timed out", "type": "TimeoutError"}, "input": null, "output": null}, "name": "llm_call", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751", "span_id": "span-7a1b2c3d", "start_ns": 1705314600000000000, "status": "ok", "tags": [], "trace_id": "abc123def456"}]}, "type": "experiments"}}
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -1494,7 +1494,7 @@ Feature: Agent Observability
     And new "UpdateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
@@ -1504,7 +1504,7 @@ Feature: Agent Observability
     And new "UpdateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -1514,7 +1514,7 @@ Feature: Agent Observability
     And new "UpdateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
     And request contains "dataset_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null}]}, "type": "records"}}
+    And body with value {"data": {"attributes": {"records": [{"expected_output": null, "id": "rec-7c3f5a1b-9e2d-4f8a-b1c6-3d7e9f0a2b4c", "input": null}]}, "type": "datasets"}}
     When the request is sent
     Then the response status is 200 OK