diff --git a/.apigentools-info b/.apigentools-info
index 7779937f87..3a37e2c6e5 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-09 14:45:37.430557",
-            "spec_repo_commit": "79e7c933"
+            "regenerated": "2025-06-10 08:45:45.829904",
+            "spec_repo_commit": "9dcf13b7"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-09 14:45:37.519358",
-            "spec_repo_commit": "79e7c933"
+            "regenerated": "2025-06-10 08:45:45.848350",
+            "spec_repo_commit": "9dcf13b7"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index d093ae5abd..6a1077837b 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -27064,6 +27064,7 @@ components:
       - opsgenie_api_key
       - region
       type: object
+      x-model-simple-name: CreateAttributes
     OpsgenieServiceCreateData:
       description: Opsgenie service data for a create request.
       properties:
@@ -27075,6 +27076,7 @@ components:
       - type
       - attributes
       type: object
+      x-model-simple-name: CreateData
     OpsgenieServiceCreateRequest:
       description: Create request for an Opsgenie service.
       properties:
@@ -27083,6 +27085,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: CreateRequest
     OpsgenieServiceRegionType:
       description: The region for the Opsgenie service.
       enum:
@@ -27095,6 +27098,7 @@ components:
       - US
       - EU
       - CUSTOM
+      x-model-simple-name: RegionType
     OpsgenieServiceResponse:
       description: Response of an Opsgenie service.
       properties:
@@ -27103,6 +27107,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: Response
     OpsgenieServiceResponseAttributes:
       description: The attributes from an Opsgenie service response.
       properties:
@@ -27119,6 +27124,7 @@ components:
         region:
           $ref: '#/components/schemas/OpsgenieServiceRegionType'
       type: object
+      x-model-simple-name: ResponseAttributes
     OpsgenieServiceResponseData:
       description: Opsgenie service data from a response.
       properties:
@@ -27137,6 +27143,7 @@ components:
       - type
       - attributes
       type: object
+      x-model-simple-name: ResponseData
     OpsgenieServiceType:
       default: opsgenie-service
       description: Opsgenie service resource type.
@@ -27146,6 +27153,7 @@ components:
       type: string
       x-enum-varnames:
       - OPSGENIE_SERVICE
+      x-model-simple-name: ServiceType
     OpsgenieServiceUpdateAttributes:
       description: The Opsgenie service attributes for an update request.
       properties:
@@ -27166,6 +27174,7 @@ components:
         region:
           $ref: '#/components/schemas/OpsgenieServiceRegionType'
       type: object
+      x-model-simple-name: UpdateAttributes
     OpsgenieServiceUpdateData:
       description: Opsgenie service for an update request.
       properties:
@@ -27184,6 +27193,7 @@ components:
       - type
       - attributes
       type: object
+      x-model-simple-name: UpdateData
     OpsgenieServiceUpdateRequest:
       description: Update request for an Opsgenie service.
       properties:
@@ -27192,6 +27202,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: UpdateRequest
     OpsgenieServicesResponse:
       description: Response with a list of Opsgenie services.
       properties:
@@ -27216,6 +27227,7 @@ components:
       required:
       - data
       type: object
+      x-model-simple-name: ServicesResponse
     OrderDirection:
       description: The sort direction for results.
       enum: