diff --git a/.apigentools-info b/.apigentools-info
index 1c5c62fa9..83cfddd28 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-27 17:12:16.501759",
-            "spec_repo_commit": "ed439f7c"
+            "regenerated": "2025-05-28 13:08:07.649688",
+            "spec_repo_commit": "3fd2b5f6"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-27 17:12:16.518477",
-            "spec_repo_commit": "ed439f7c"
+            "regenerated": "2025-05-28 13:08:07.666039",
+            "spec_repo_commit": "3fd2b5f6"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 5c41dee7d..472c26fa1 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -3490,6 +3490,7 @@ components:
         type:
           $ref: '#/components/schemas/AuditLogsEventType'
       type: object
+      x-model-simple-name: Event
     AuditLogsEventAttributes:
       description: JSON object containing all event attributes and their associated
         values.
@@ -3527,6 +3528,7 @@ components:
           format: date-time
           type: string
       type: object
+      x-model-simple-name: EventAttributes
     AuditLogsEventType:
       default: audit
       description: Type of the event.
@@ -3536,6 +3538,7 @@ components:
       type: string
       x-enum-varnames:
       - Audit
+      x-model-simple-name: EventType
     AuditLogsEventsResponse:
       description: Response object with all events matching the request and pagination
         information.
@@ -3550,6 +3553,7 @@ components:
         meta:
           $ref: '#/components/schemas/AuditLogsResponseMetadata'
       type: object
+      x-model-simple-name: EventsResponse
     AuditLogsQueryFilter:
       description: Search and filter query settings.
       properties:
@@ -3571,6 +3575,7 @@ components:
           example: now
           type: string
       type: object
+      x-model-simple-name: QueryFilter
     AuditLogsQueryOptions:
       description: 'Global query options that are used during the query.
 
@@ -3588,6 +3593,7 @@ components:
           example: GMT
           type: string
       type: object
+      x-model-simple-name: QueryOptions
     AuditLogsQueryPageOptions:
       description: Paging attributes for listing events.
       properties:
@@ -3604,6 +3610,7 @@ components:
           maximum: 1000
           type: integer
       type: object
+      x-model-simple-name: PageOptions
     AuditLogsResponseLinks:
       description: Links attributes.
       properties:
@@ -3615,6 +3622,7 @@ components:
           example: https://app.datadoghq.com/api/v2/audit/event?filter[query]=foo&page[cursor]=eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
           type: string
       type: object
+      x-model-simple-name: ResponseLinks
     AuditLogsResponseMetadata:
       description: The metadata associated with a request.
       properties:
@@ -3640,6 +3648,7 @@ components:
             $ref: '#/components/schemas/AuditLogsWarning'
           type: array
       type: object
+      x-model-simple-name: ResponseMetadata
     AuditLogsResponsePage:
       description: Paging attributes.
       properties:
@@ -3649,6 +3658,7 @@ components:
           example: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ==
           type: string
       type: object
+      x-model-simple-name: ResponsePage
     AuditLogsResponseStatus:
       description: The status of the response.
       enum:
@@ -3659,6 +3669,7 @@ components:
       x-enum-varnames:
       - DONE
       - TIMEOUT
+      x-model-simple-name: ResponseStatus
     AuditLogsSearchEventsRequest:
       description: The request for a Audit Logs events list.
       properties:
@@ -3671,6 +3682,7 @@ components:
         sort:
           $ref: '#/components/schemas/AuditLogsSort'
       type: object
+      x-model-simple-name: SearchRequest
     AuditLogsSort:
       description: Sort parameters when querying events.
       enum:
@@ -3680,6 +3692,7 @@ components:
       x-enum-varnames:
       - TIMESTAMP_ASCENDING
       - TIMESTAMP_DESCENDING
+      x-model-simple-name: Sort
     AuditLogsWarning:
       description: Warning message indicating something that went wrong with the query.
       properties:
@@ -3697,6 +3710,7 @@ components:
             from the other indexes
           type: string
       type: object
+      x-model-simple-name: Warning
     AuthNMapping:
       description: The AuthN Mapping object returned by API.
       properties: