diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 4980e3a1bd2..f9610113951 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -1140,9 +1140,9 @@ components:
       schema:
         type: string
     PersonalAccessTokenID:
-      description: The UUID of the personal access token.
+      description: The ID of the personal access token.
       in: path
-      name: pat_uuid
+      name: pat_id
       required: true
       schema:
         example: "00000000-0000-1234-0000-000000000000"
@@ -29288,11 +29288,6 @@ components:
     FullPersonalAccessTokenAttributes:
       description: Attributes of a full personal access token, including the token key.
       properties:
-        alias:
-          description: The alias (short identifier) of the personal access token.
-          example: "2H9MCNMBM8FQjQ16YucXkX"
-          readOnly: true
-          type: string
         created_at:
           description: Creation date of the personal access token.
           example: "2024-01-01T00:00:00+00:00"
@@ -53523,11 +53518,6 @@ components:
     PersonalAccessTokenAttributes:
       description: Attributes of a personal access token.
       properties:
-        alias:
-          description: The alias (short identifier) of the personal access token.
-          example: "2H9MCNMBM8FQjQ16YucXkX"
-          readOnly: true
-          type: string
         created_at:
           description: Creation date of the personal access token.
           example: "2024-01-01T00:00:00+00:00"
@@ -78073,6 +78063,10 @@ components:
           description: Title of the user.
           nullable: true
           type: string
+        uuid:
+          description: UUID of the user.
+          readOnly: true
+          type: string
         verified:
           description: Whether the user is verified.
           type: boolean
@@ -109765,7 +109759,7 @@ paths:
         operator: OR
         permissions:
           - user_app_keys
-  /api/v2/personal_access_tokens/{pat_uuid}:
+  /api/v2/personal_access_tokens/{pat_id}:
     delete:
       description: Revoke a specific personal access token.
       operationId: RevokePersonalAccessToken
@@ -121344,7 +121338,7 @@ paths:
         operator: OR
         permissions:
           - service_account_write
-  /api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}:
+  /api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}:
     delete:
       description: Revoke a specific access token for a service account.
       operationId: RevokeServiceAccountAccessToken
diff --git a/src/main/java/com/datadog/api/client/v2/api/KeyManagementApi.java b/src/main/java/com/datadog/api/client/v2/api/KeyManagementApi.java
index 1db4055410e..56de4559fd1 100644
--- a/src/main/java/com/datadog/api/client/v2/api/KeyManagementApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/KeyManagementApi.java
@@ -1402,12 +1402,12 @@ public ApiResponse<ApplicationKeyResponse> getCurrentUserApplicationKeyWithHttpI
    *
    * <p>See {@link #getPersonalAccessTokenWithHttpInfo}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return PersonalAccessTokenResponse
    * @throws ApiException if fails to make API call
    */
-  public PersonalAccessTokenResponse getPersonalAccessToken(String patUuid) throws ApiException {
-    return getPersonalAccessTokenWithHttpInfo(patUuid).getData();
+  public PersonalAccessTokenResponse getPersonalAccessToken(String patId) throws ApiException {
+    return getPersonalAccessTokenWithHttpInfo(patId).getData();
   }
 
   /**
@@ -1415,12 +1415,11 @@ public PersonalAccessTokenResponse getPersonalAccessToken(String patUuid) throws
    *
    * <p>See {@link #getPersonalAccessTokenWithHttpInfoAsync}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture&lt;PersonalAccessTokenResponse&gt;
    */
-  public CompletableFuture<PersonalAccessTokenResponse> getPersonalAccessTokenAsync(
-      String patUuid) {
-    return getPersonalAccessTokenWithHttpInfoAsync(patUuid)
+  public CompletableFuture<PersonalAccessTokenResponse> getPersonalAccessTokenAsync(String patId) {
+    return getPersonalAccessTokenWithHttpInfoAsync(patId)
         .thenApply(
             response -> {
               return response.getData();
@@ -1430,7 +1429,7 @@ public CompletableFuture<PersonalAccessTokenResponse> getPersonalAccessTokenAsyn
   /**
    * Get a specific personal access token by its UUID.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return ApiResponse&lt;PersonalAccessTokenResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
@@ -1443,19 +1442,19 @@ public CompletableFuture<PersonalAccessTokenResponse> getPersonalAccessTokenAsyn
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<PersonalAccessTokenResponse> getPersonalAccessTokenWithHttpInfo(String patUuid)
+  public ApiResponse<PersonalAccessTokenResponse> getPersonalAccessTokenWithHttpInfo(String patId)
       throws ApiException {
     Object localVarPostBody = null;
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'patUuid' when calling getPersonalAccessToken");
+          400, "Missing the required parameter 'patId' when calling getPersonalAccessToken");
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/personal_access_tokens/{pat_uuid}"
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+        "/api/v2/personal_access_tokens/{pat_id}"
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -1484,26 +1483,26 @@ public ApiResponse<PersonalAccessTokenResponse> getPersonalAccessTokenWithHttpIn
    *
    * <p>See {@link #getPersonalAccessTokenWithHttpInfo}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;PersonalAccessTokenResponse&gt;&gt;
    */
   public CompletableFuture<ApiResponse<PersonalAccessTokenResponse>>
-      getPersonalAccessTokenWithHttpInfoAsync(String patUuid) {
+      getPersonalAccessTokenWithHttpInfoAsync(String patId) {
     Object localVarPostBody = null;
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       CompletableFuture<ApiResponse<PersonalAccessTokenResponse>> result =
           new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
-              400, "Missing the required parameter 'patUuid' when calling getPersonalAccessToken"));
+              400, "Missing the required parameter 'patId' when calling getPersonalAccessToken"));
       return result;
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/personal_access_tokens/{pat_uuid}"
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+        "/api/v2/personal_access_tokens/{pat_id}"
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -2695,11 +2694,11 @@ public ApiResponse<ListPersonalAccessTokensResponse> listPersonalAccessTokensWit
    *
    * <p>See {@link #revokePersonalAccessTokenWithHttpInfo}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @throws ApiException if fails to make API call
    */
-  public void revokePersonalAccessToken(String patUuid) throws ApiException {
-    revokePersonalAccessTokenWithHttpInfo(patUuid);
+  public void revokePersonalAccessToken(String patId) throws ApiException {
+    revokePersonalAccessTokenWithHttpInfo(patId);
   }
 
   /**
@@ -2707,11 +2706,11 @@ public void revokePersonalAccessToken(String patUuid) throws ApiException {
    *
    * <p>See {@link #revokePersonalAccessTokenWithHttpInfoAsync}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture
    */
-  public CompletableFuture<Void> revokePersonalAccessTokenAsync(String patUuid) {
-    return revokePersonalAccessTokenWithHttpInfoAsync(patUuid)
+  public CompletableFuture<Void> revokePersonalAccessTokenAsync(String patId) {
+    return revokePersonalAccessTokenWithHttpInfoAsync(patId)
         .thenApply(
             response -> {
               return response.getData();
@@ -2721,7 +2720,7 @@ public CompletableFuture<Void> revokePersonalAccessTokenAsync(String patUuid) {
   /**
    * Revoke a specific personal access token.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
@@ -2734,19 +2733,18 @@ public CompletableFuture<Void> revokePersonalAccessTokenAsync(String patUuid) {
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<Void> revokePersonalAccessTokenWithHttpInfo(String patUuid)
-      throws ApiException {
+  public ApiResponse<Void> revokePersonalAccessTokenWithHttpInfo(String patId) throws ApiException {
     Object localVarPostBody = null;
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'patUuid' when calling revokePersonalAccessToken");
+          400, "Missing the required parameter 'patId' when calling revokePersonalAccessToken");
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/personal_access_tokens/{pat_uuid}"
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+        "/api/v2/personal_access_tokens/{pat_id}"
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -2775,26 +2773,26 @@ public ApiResponse<Void> revokePersonalAccessTokenWithHttpInfo(String patUuid)
    *
    * <p>See {@link #revokePersonalAccessTokenWithHttpInfo}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
    */
   public CompletableFuture<ApiResponse<Void>> revokePersonalAccessTokenWithHttpInfoAsync(
-      String patUuid) {
+      String patId) {
     Object localVarPostBody = null;
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
-              "Missing the required parameter 'patUuid' when calling revokePersonalAccessToken"));
+              "Missing the required parameter 'patId' when calling revokePersonalAccessToken"));
       return result;
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/personal_access_tokens/{pat_uuid}"
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+        "/api/v2/personal_access_tokens/{pat_id}"
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -3310,14 +3308,14 @@ public ApiResponse<ApplicationKeyResponse> updateCurrentUserApplicationKeyWithHt
    *
    * <p>See {@link #updatePersonalAccessTokenWithHttpInfo}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return PersonalAccessTokenResponse
    * @throws ApiException if fails to make API call
    */
   public PersonalAccessTokenResponse updatePersonalAccessToken(
-      String patUuid, PersonalAccessTokenUpdateRequest body) throws ApiException {
-    return updatePersonalAccessTokenWithHttpInfo(patUuid, body).getData();
+      String patId, PersonalAccessTokenUpdateRequest body) throws ApiException {
+    return updatePersonalAccessTokenWithHttpInfo(patId, body).getData();
   }
 
   /**
@@ -3325,13 +3323,13 @@ public PersonalAccessTokenResponse updatePersonalAccessToken(
    *
    * <p>See {@link #updatePersonalAccessTokenWithHttpInfoAsync}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return CompletableFuture&lt;PersonalAccessTokenResponse&gt;
    */
   public CompletableFuture<PersonalAccessTokenResponse> updatePersonalAccessTokenAsync(
-      String patUuid, PersonalAccessTokenUpdateRequest body) {
-    return updatePersonalAccessTokenWithHttpInfoAsync(patUuid, body)
+      String patId, PersonalAccessTokenUpdateRequest body) {
+    return updatePersonalAccessTokenWithHttpInfoAsync(patId, body)
         .thenApply(
             response -> {
               return response.getData();
@@ -3341,7 +3339,7 @@ public CompletableFuture<PersonalAccessTokenResponse> updatePersonalAccessTokenA
   /**
    * Update a specific personal access token.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return ApiResponse&lt;PersonalAccessTokenResponse&gt;
    * @throws ApiException if fails to make API call
@@ -3357,13 +3355,13 @@ public CompletableFuture<PersonalAccessTokenResponse> updatePersonalAccessTokenA
    *     </table>
    */
   public ApiResponse<PersonalAccessTokenResponse> updatePersonalAccessTokenWithHttpInfo(
-      String patUuid, PersonalAccessTokenUpdateRequest body) throws ApiException {
+      String patId, PersonalAccessTokenUpdateRequest body) throws ApiException {
     Object localVarPostBody = body;
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       throw new ApiException(
-          400, "Missing the required parameter 'patUuid' when calling updatePersonalAccessToken");
+          400, "Missing the required parameter 'patId' when calling updatePersonalAccessToken");
     }
 
     // verify the required parameter 'body' is set
@@ -3373,8 +3371,8 @@ public ApiResponse<PersonalAccessTokenResponse> updatePersonalAccessTokenWithHtt
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/personal_access_tokens/{pat_uuid}"
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+        "/api/v2/personal_access_tokens/{pat_id}"
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -3403,23 +3401,23 @@ public ApiResponse<PersonalAccessTokenResponse> updatePersonalAccessTokenWithHtt
    *
    * <p>See {@link #updatePersonalAccessTokenWithHttpInfo}.
    *
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return CompletableFuture&lt;ApiResponse&lt;PersonalAccessTokenResponse&gt;&gt;
    */
   public CompletableFuture<ApiResponse<PersonalAccessTokenResponse>>
       updatePersonalAccessTokenWithHttpInfoAsync(
-          String patUuid, PersonalAccessTokenUpdateRequest body) {
+          String patId, PersonalAccessTokenUpdateRequest body) {
     Object localVarPostBody = body;
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       CompletableFuture<ApiResponse<PersonalAccessTokenResponse>> result =
           new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
-              "Missing the required parameter 'patUuid' when calling updatePersonalAccessToken"));
+              "Missing the required parameter 'patId' when calling updatePersonalAccessToken"));
       return result;
     }
 
@@ -3434,8 +3432,8 @@ public ApiResponse<PersonalAccessTokenResponse> updatePersonalAccessTokenWithHtt
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/personal_access_tokens/{pat_uuid}"
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+        "/api/v2/personal_access_tokens/{pat_id}"
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
diff --git a/src/main/java/com/datadog/api/client/v2/api/ServiceAccountsApi.java b/src/main/java/com/datadog/api/client/v2/api/ServiceAccountsApi.java
index bf9dd0283b1..51d74b62f06 100644
--- a/src/main/java/com/datadog/api/client/v2/api/ServiceAccountsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/ServiceAccountsApi.java
@@ -704,13 +704,13 @@ public CompletableFuture<ApiResponse<Void>> deleteServiceAccountApplicationKeyWi
    * <p>See {@link #getServiceAccountAccessTokenWithHttpInfo}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return PersonalAccessTokenResponse
    * @throws ApiException if fails to make API call
    */
   public PersonalAccessTokenResponse getServiceAccountAccessToken(
-      String serviceAccountId, String patUuid) throws ApiException {
-    return getServiceAccountAccessTokenWithHttpInfo(serviceAccountId, patUuid).getData();
+      String serviceAccountId, String patId) throws ApiException {
+    return getServiceAccountAccessTokenWithHttpInfo(serviceAccountId, patId).getData();
   }
 
   /**
@@ -719,12 +719,12 @@ public PersonalAccessTokenResponse getServiceAccountAccessToken(
    * <p>See {@link #getServiceAccountAccessTokenWithHttpInfoAsync}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture&lt;PersonalAccessTokenResponse&gt;
    */
   public CompletableFuture<PersonalAccessTokenResponse> getServiceAccountAccessTokenAsync(
-      String serviceAccountId, String patUuid) {
-    return getServiceAccountAccessTokenWithHttpInfoAsync(serviceAccountId, patUuid)
+      String serviceAccountId, String patId) {
+    return getServiceAccountAccessTokenWithHttpInfoAsync(serviceAccountId, patId)
         .thenApply(
             response -> {
               return response.getData();
@@ -735,7 +735,7 @@ public CompletableFuture<PersonalAccessTokenResponse> getServiceAccountAccessTok
    * Get a specific access token for a service account by its UUID.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return ApiResponse&lt;PersonalAccessTokenResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
@@ -749,7 +749,7 @@ public CompletableFuture<PersonalAccessTokenResponse> getServiceAccountAccessTok
    *     </table>
    */
   public ApiResponse<PersonalAccessTokenResponse> getServiceAccountAccessTokenWithHttpInfo(
-      String serviceAccountId, String patUuid) throws ApiException {
+      String serviceAccountId, String patId) throws ApiException {
     Object localVarPostBody = null;
 
     // verify the required parameter 'serviceAccountId' is set
@@ -760,19 +760,18 @@ public ApiResponse<PersonalAccessTokenResponse> getServiceAccountAccessTokenWith
               + " getServiceAccountAccessToken");
     }
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       throw new ApiException(
-          400,
-          "Missing the required parameter 'patUuid' when calling getServiceAccountAccessToken");
+          400, "Missing the required parameter 'patId' when calling getServiceAccountAccessToken");
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
+        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
             .replaceAll(
                 "\\{" + "service_account_id" + "\\}",
                 apiClient.escapeString(serviceAccountId.toString()))
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -802,11 +801,11 @@ public ApiResponse<PersonalAccessTokenResponse> getServiceAccountAccessTokenWith
    * <p>See {@link #getServiceAccountAccessTokenWithHttpInfo}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;PersonalAccessTokenResponse&gt;&gt;
    */
   public CompletableFuture<ApiResponse<PersonalAccessTokenResponse>>
-      getServiceAccountAccessTokenWithHttpInfoAsync(String serviceAccountId, String patUuid) {
+      getServiceAccountAccessTokenWithHttpInfoAsync(String serviceAccountId, String patId) {
     Object localVarPostBody = null;
 
     // verify the required parameter 'serviceAccountId' is set
@@ -821,24 +820,23 @@ public ApiResponse<PersonalAccessTokenResponse> getServiceAccountAccessTokenWith
       return result;
     }
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       CompletableFuture<ApiResponse<PersonalAccessTokenResponse>> result =
           new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
-              "Missing the required parameter 'patUuid' when calling"
-                  + " getServiceAccountAccessToken"));
+              "Missing the required parameter 'patId' when calling getServiceAccountAccessToken"));
       return result;
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
+        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
             .replaceAll(
                 "\\{" + "service_account_id" + "\\}",
                 apiClient.escapeString(serviceAccountId.toString()))
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -1616,12 +1614,12 @@ public ApiResponse<ListApplicationKeysResponse> listServiceAccountApplicationKey
    * <p>See {@link #revokeServiceAccountAccessTokenWithHttpInfo}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @throws ApiException if fails to make API call
    */
-  public void revokeServiceAccountAccessToken(String serviceAccountId, String patUuid)
+  public void revokeServiceAccountAccessToken(String serviceAccountId, String patId)
       throws ApiException {
-    revokeServiceAccountAccessTokenWithHttpInfo(serviceAccountId, patUuid);
+    revokeServiceAccountAccessTokenWithHttpInfo(serviceAccountId, patId);
   }
 
   /**
@@ -1630,12 +1628,12 @@ public void revokeServiceAccountAccessToken(String serviceAccountId, String patU
    * <p>See {@link #revokeServiceAccountAccessTokenWithHttpInfoAsync}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture
    */
   public CompletableFuture<Void> revokeServiceAccountAccessTokenAsync(
-      String serviceAccountId, String patUuid) {
-    return revokeServiceAccountAccessTokenWithHttpInfoAsync(serviceAccountId, patUuid)
+      String serviceAccountId, String patId) {
+    return revokeServiceAccountAccessTokenWithHttpInfoAsync(serviceAccountId, patId)
         .thenApply(
             response -> {
               return response.getData();
@@ -1646,7 +1644,7 @@ public CompletableFuture<Void> revokeServiceAccountAccessTokenAsync(
    * Revoke a specific access token for a service account.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
@@ -1660,7 +1658,7 @@ public CompletableFuture<Void> revokeServiceAccountAccessTokenAsync(
    *     </table>
    */
   public ApiResponse<Void> revokeServiceAccountAccessTokenWithHttpInfo(
-      String serviceAccountId, String patUuid) throws ApiException {
+      String serviceAccountId, String patId) throws ApiException {
     Object localVarPostBody = null;
 
     // verify the required parameter 'serviceAccountId' is set
@@ -1671,19 +1669,19 @@ public ApiResponse<Void> revokeServiceAccountAccessTokenWithHttpInfo(
               + " revokeServiceAccountAccessToken");
     }
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       throw new ApiException(
           400,
-          "Missing the required parameter 'patUuid' when calling revokeServiceAccountAccessToken");
+          "Missing the required parameter 'patId' when calling revokeServiceAccountAccessToken");
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
+        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
             .replaceAll(
                 "\\{" + "service_account_id" + "\\}",
                 apiClient.escapeString(serviceAccountId.toString()))
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -1713,11 +1711,11 @@ public ApiResponse<Void> revokeServiceAccountAccessTokenWithHttpInfo(
    * <p>See {@link #revokeServiceAccountAccessTokenWithHttpInfo}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
    */
   public CompletableFuture<ApiResponse<Void>> revokeServiceAccountAccessTokenWithHttpInfoAsync(
-      String serviceAccountId, String patUuid) {
+      String serviceAccountId, String patId) {
     Object localVarPostBody = null;
 
     // verify the required parameter 'serviceAccountId' is set
@@ -1731,23 +1729,23 @@ public CompletableFuture<ApiResponse<Void>> revokeServiceAccountAccessTokenWithH
       return result;
     }
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       CompletableFuture<ApiResponse<Void>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
-              "Missing the required parameter 'patUuid' when calling"
+              "Missing the required parameter 'patId' when calling"
                   + " revokeServiceAccountAccessToken"));
       return result;
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
+        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
             .replaceAll(
                 "\\{" + "service_account_id" + "\\}",
                 apiClient.escapeString(serviceAccountId.toString()))
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -1784,15 +1782,15 @@ public CompletableFuture<ApiResponse<Void>> revokeServiceAccountAccessTokenWithH
    * <p>See {@link #updateServiceAccountAccessTokenWithHttpInfo}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return PersonalAccessTokenResponse
    * @throws ApiException if fails to make API call
    */
   public PersonalAccessTokenResponse updateServiceAccountAccessToken(
-      String serviceAccountId, String patUuid, PersonalAccessTokenUpdateRequest body)
+      String serviceAccountId, String patId, PersonalAccessTokenUpdateRequest body)
       throws ApiException {
-    return updateServiceAccountAccessTokenWithHttpInfo(serviceAccountId, patUuid, body).getData();
+    return updateServiceAccountAccessTokenWithHttpInfo(serviceAccountId, patId, body).getData();
   }
 
   /**
@@ -1801,13 +1799,13 @@ public PersonalAccessTokenResponse updateServiceAccountAccessToken(
    * <p>See {@link #updateServiceAccountAccessTokenWithHttpInfoAsync}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return CompletableFuture&lt;PersonalAccessTokenResponse&gt;
    */
   public CompletableFuture<PersonalAccessTokenResponse> updateServiceAccountAccessTokenAsync(
-      String serviceAccountId, String patUuid, PersonalAccessTokenUpdateRequest body) {
-    return updateServiceAccountAccessTokenWithHttpInfoAsync(serviceAccountId, patUuid, body)
+      String serviceAccountId, String patId, PersonalAccessTokenUpdateRequest body) {
+    return updateServiceAccountAccessTokenWithHttpInfoAsync(serviceAccountId, patId, body)
         .thenApply(
             response -> {
               return response.getData();
@@ -1818,7 +1816,7 @@ public CompletableFuture<PersonalAccessTokenResponse> updateServiceAccountAccess
    * Update a specific access token for a service account.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return ApiResponse&lt;PersonalAccessTokenResponse&gt;
    * @throws ApiException if fails to make API call
@@ -1834,7 +1832,7 @@ public CompletableFuture<PersonalAccessTokenResponse> updateServiceAccountAccess
    *     </table>
    */
   public ApiResponse<PersonalAccessTokenResponse> updateServiceAccountAccessTokenWithHttpInfo(
-      String serviceAccountId, String patUuid, PersonalAccessTokenUpdateRequest body)
+      String serviceAccountId, String patId, PersonalAccessTokenUpdateRequest body)
       throws ApiException {
     Object localVarPostBody = body;
 
@@ -1846,11 +1844,11 @@ public ApiResponse<PersonalAccessTokenResponse> updateServiceAccountAccessTokenW
               + " updateServiceAccountAccessToken");
     }
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       throw new ApiException(
           400,
-          "Missing the required parameter 'patUuid' when calling updateServiceAccountAccessToken");
+          "Missing the required parameter 'patId' when calling updateServiceAccountAccessToken");
     }
 
     // verify the required parameter 'body' is set
@@ -1861,11 +1859,11 @@ public ApiResponse<PersonalAccessTokenResponse> updateServiceAccountAccessTokenW
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
+        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
             .replaceAll(
                 "\\{" + "service_account_id" + "\\}",
                 apiClient.escapeString(serviceAccountId.toString()))
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
@@ -1895,13 +1893,13 @@ public ApiResponse<PersonalAccessTokenResponse> updateServiceAccountAccessTokenW
    * <p>See {@link #updateServiceAccountAccessTokenWithHttpInfo}.
    *
    * @param serviceAccountId The ID of the service account. (required)
-   * @param patUuid The UUID of the personal access token. (required)
+   * @param patId The ID of the personal access token. (required)
    * @param body (required)
    * @return CompletableFuture&lt;ApiResponse&lt;PersonalAccessTokenResponse&gt;&gt;
    */
   public CompletableFuture<ApiResponse<PersonalAccessTokenResponse>>
       updateServiceAccountAccessTokenWithHttpInfoAsync(
-          String serviceAccountId, String patUuid, PersonalAccessTokenUpdateRequest body) {
+          String serviceAccountId, String patId, PersonalAccessTokenUpdateRequest body) {
     Object localVarPostBody = body;
 
     // verify the required parameter 'serviceAccountId' is set
@@ -1916,14 +1914,14 @@ public ApiResponse<PersonalAccessTokenResponse> updateServiceAccountAccessTokenW
       return result;
     }
 
-    // verify the required parameter 'patUuid' is set
-    if (patUuid == null) {
+    // verify the required parameter 'patId' is set
+    if (patId == null) {
       CompletableFuture<ApiResponse<PersonalAccessTokenResponse>> result =
           new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(
               400,
-              "Missing the required parameter 'patUuid' when calling"
+              "Missing the required parameter 'patId' when calling"
                   + " updateServiceAccountAccessToken"));
       return result;
     }
@@ -1941,11 +1939,11 @@ public ApiResponse<PersonalAccessTokenResponse> updateServiceAccountAccessTokenW
     }
     // create path and map variables
     String localVarPath =
-        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
+        "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
             .replaceAll(
                 "\\{" + "service_account_id" + "\\}",
                 apiClient.escapeString(serviceAccountId.toString()))
-            .replaceAll("\\{" + "pat_uuid" + "\\}", apiClient.escapeString(patUuid.toString()));
+            .replaceAll("\\{" + "pat_id" + "\\}", apiClient.escapeString(patId.toString()));
 
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
diff --git a/src/main/java/com/datadog/api/client/v2/model/FullPersonalAccessTokenAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FullPersonalAccessTokenAttributes.java
index 59a9d4e5d07..f715e51361d 100644
--- a/src/main/java/com/datadog/api/client/v2/model/FullPersonalAccessTokenAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/FullPersonalAccessTokenAttributes.java
@@ -22,7 +22,6 @@
 
 /** Attributes of a full personal access token, including the token key. */
 @JsonPropertyOrder({
-  FullPersonalAccessTokenAttributes.JSON_PROPERTY_ALIAS,
   FullPersonalAccessTokenAttributes.JSON_PROPERTY_CREATED_AT,
   FullPersonalAccessTokenAttributes.JSON_PROPERTY_EXPIRES_AT,
   FullPersonalAccessTokenAttributes.JSON_PROPERTY_KEY,
@@ -34,9 +33,6 @@
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class FullPersonalAccessTokenAttributes {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_ALIAS = "alias";
-  private String alias;
-
   public static final String JSON_PROPERTY_CREATED_AT = "created_at";
   private OffsetDateTime createdAt;
 
@@ -55,18 +51,6 @@ public class FullPersonalAccessTokenAttributes {
   public static final String JSON_PROPERTY_SCOPES = "scopes";
   private List<String> scopes = null;
 
-  /**
-   * The alias (short identifier) of the personal access token.
-   *
-   * @return alias
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ALIAS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getAlias() {
-    return alias;
-  }
-
   /**
    * Creation date of the personal access token.
    *
@@ -236,8 +220,7 @@ public boolean equals(Object o) {
     }
     FullPersonalAccessTokenAttributes fullPersonalAccessTokenAttributes =
         (FullPersonalAccessTokenAttributes) o;
-    return Objects.equals(this.alias, fullPersonalAccessTokenAttributes.alias)
-        && Objects.equals(this.createdAt, fullPersonalAccessTokenAttributes.createdAt)
+    return Objects.equals(this.createdAt, fullPersonalAccessTokenAttributes.createdAt)
         && Objects.equals(this.expiresAt, fullPersonalAccessTokenAttributes.expiresAt)
         && Objects.equals(this.key, fullPersonalAccessTokenAttributes.key)
         && Objects.equals(this.name, fullPersonalAccessTokenAttributes.name)
@@ -250,14 +233,13 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
-        alias, createdAt, expiresAt, key, name, publicPortion, scopes, additionalProperties);
+        createdAt, expiresAt, key, name, publicPortion, scopes, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FullPersonalAccessTokenAttributes {\n");
-    sb.append("    alias: ").append(toIndentedString(alias)).append("\n");
     sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
     sb.append("    expiresAt: ").append(toIndentedString(expiresAt)).append("\n");
     sb.append("    key: ").append(toIndentedString(key)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/PersonalAccessTokenAttributes.java b/src/main/java/com/datadog/api/client/v2/model/PersonalAccessTokenAttributes.java
index 1a9b5f964af..328e30dc7f9 100644
--- a/src/main/java/com/datadog/api/client/v2/model/PersonalAccessTokenAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/PersonalAccessTokenAttributes.java
@@ -22,7 +22,6 @@
 
 /** Attributes of a personal access token. */
 @JsonPropertyOrder({
-  PersonalAccessTokenAttributes.JSON_PROPERTY_ALIAS,
   PersonalAccessTokenAttributes.JSON_PROPERTY_CREATED_AT,
   PersonalAccessTokenAttributes.JSON_PROPERTY_EXPIRES_AT,
   PersonalAccessTokenAttributes.JSON_PROPERTY_LAST_USED_AT,
@@ -35,9 +34,6 @@
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class PersonalAccessTokenAttributes {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_ALIAS = "alias";
-  private String alias;
-
   public static final String JSON_PROPERTY_CREATED_AT = "created_at";
   private OffsetDateTime createdAt;
 
@@ -59,18 +55,6 @@ public class PersonalAccessTokenAttributes {
   public static final String JSON_PROPERTY_SCOPES = "scopes";
   private List<String> scopes = null;
 
-  /**
-   * The alias (short identifier) of the personal access token.
-   *
-   * @return alias
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ALIAS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public String getAlias() {
-    return alias;
-  }
-
   /**
    * Creation date of the personal access token.
    *
@@ -279,8 +263,7 @@ public boolean equals(Object o) {
       return false;
     }
     PersonalAccessTokenAttributes personalAccessTokenAttributes = (PersonalAccessTokenAttributes) o;
-    return Objects.equals(this.alias, personalAccessTokenAttributes.alias)
-        && Objects.equals(this.createdAt, personalAccessTokenAttributes.createdAt)
+    return Objects.equals(this.createdAt, personalAccessTokenAttributes.createdAt)
         && Objects.equals(this.expiresAt, personalAccessTokenAttributes.expiresAt)
         && Objects.equals(this.lastUsedAt, personalAccessTokenAttributes.lastUsedAt)
         && Objects.equals(this.modifiedAt, personalAccessTokenAttributes.modifiedAt)
@@ -294,7 +277,6 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
-        alias,
         createdAt,
         expiresAt,
         lastUsedAt,
@@ -309,7 +291,6 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class PersonalAccessTokenAttributes {\n");
-    sb.append("    alias: ").append(toIndentedString(alias)).append("\n");
     sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
     sb.append("    expiresAt: ").append(toIndentedString(expiresAt)).append("\n");
     sb.append("    lastUsedAt: ").append(toIndentedString(lastUsedAt)).append("\n");
diff --git a/src/main/java/com/datadog/api/client/v2/model/UserAttributes.java b/src/main/java/com/datadog/api/client/v2/model/UserAttributes.java
index e3d84466c8b..e1264d262ca 100644
--- a/src/main/java/com/datadog/api/client/v2/model/UserAttributes.java
+++ b/src/main/java/com/datadog/api/client/v2/model/UserAttributes.java
@@ -32,6 +32,7 @@
   UserAttributes.JSON_PROPERTY_SERVICE_ACCOUNT,
   UserAttributes.JSON_PROPERTY_STATUS,
   UserAttributes.JSON_PROPERTY_TITLE,
+  UserAttributes.JSON_PROPERTY_UUID,
   UserAttributes.JSON_PROPERTY_VERIFIED
 })
 @jakarta.annotation.Generated(
@@ -74,6 +75,9 @@ public class UserAttributes {
   public static final String JSON_PROPERTY_TITLE = "title";
   private JsonNullable<String> title = JsonNullable.<String>undefined();
 
+  public static final String JSON_PROPERTY_UUID = "uuid";
+  private String uuid;
+
   public static final String JSON_PROPERTY_VERIFIED = "verified";
   private Boolean verified;
 
@@ -345,6 +349,18 @@ public void setTitle(String title) {
     this.title = JsonNullable.<String>of(title);
   }
 
+  /**
+   * UUID of the user.
+   *
+   * @return uuid
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getUuid() {
+    return uuid;
+  }
+
   public UserAttributes verified(Boolean verified) {
     this.verified = verified;
     return this;
@@ -434,6 +450,7 @@ public boolean equals(Object o) {
         && Objects.equals(this.serviceAccount, userAttributes.serviceAccount)
         && Objects.equals(this.status, userAttributes.status)
         && Objects.equals(this.title, userAttributes.title)
+        && Objects.equals(this.uuid, userAttributes.uuid)
         && Objects.equals(this.verified, userAttributes.verified)
         && Objects.equals(this.additionalProperties, userAttributes.additionalProperties);
   }
@@ -453,6 +470,7 @@ public int hashCode() {
         serviceAccount,
         status,
         title,
+        uuid,
         verified,
         additionalProperties);
   }
@@ -473,6 +491,7 @@ public String toString() {
     sb.append("    serviceAccount: ").append(toIndentedString(serviceAccount)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    title: ").append(toIndentedString(title)).append("\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
     sb.append("    verified: ").append(toIndentedString(verified)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
index 0b1cdf6a6a8..dbf89c929d7 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
index 91c8275f382..e94edfb7099 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
index d603e22c7bf..ff861cd3c9f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index a42ef29bfae..c82b6c27f29 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
index 20187b03f7f..d6e72cc1e7a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index a0731b5ad4a..7bf88c684fb 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index 70fc4d3589b..bb9830f6a8c 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
index 87cb96a7640..6352d5f0102 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
index e1e0b004585..cb1a6e0b10f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_all_account_configs_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 994e56ed9eb..7711ea26b7b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 7711ea26b7b..2e4479a46a7 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d10"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
index 77aa5204b9c..be15f60baf7 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
index 2be18c73072..40582f084c5 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
index adda0ec49d5..51e1a4871f0 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
index 4323550909c..97d2e012fb0 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
index c791186e6fd..8baecba84ae 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
index 394f3b77f1e..25ab575ed0d 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
index d39fee8a337..0bed01261bb 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
index 834de428629..b22410fa4ef 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
index b7e39e620cf..78166900f4b 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
index b2d3b56dbd7..9645e2b41cc 100644
--- a/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancel_a_historical_job_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
index 9b1a448d846..38717139557 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
index 43ce65998fe..8294b60bbf6 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
index 7e70b6729df..5ba8e36023e 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
@@ -18,7 +18,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2bcb392-2d71-be89-5578-460535c541af"
+    "id": "b2bcb392-2d71-be89-5578-460535c541b0"
   },
   {
     "httpRequest": {
@@ -48,7 +48,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
index 563401356dc..a885ab105be 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
   },
   {
     "httpRequest": {
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json
index 76a4e155ad0..fb2bbc86068 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f71"
+    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f70"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
index ef26cd89a47..32bcba6d838 100644
--- a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json
index cd295ed246c..82770941cf9 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95be"
+    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95bf"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
index 7d376643348..95cb4a17509 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae49"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
index 09c3eea3a79..fa161e3c9f3 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
index c7581f314f6..c5cec303481 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
index 02cf1734a56..e1271adce11 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index 1fec75541c7..6e0d881f9be 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
index 95a9b514916..18bfaac3c98 100644
--- a/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Workflow_returns_Bad_request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f6"
+    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f5"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
index c995fd8ce46..4db34a7a497 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_Workflow_returns_Bad_request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f5"
+    "id": "9dbbb4fe-ff77-d906-2de1-752f55e537f6"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
index 33f84691420..0f7572f4ef5 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index 5b2bdee0951..09067379e94 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
index f98e1c3550d..59f9627d8a8 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
index 3f9206673d4..b8a271f0acf 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
index 2cb19c254b0..955d0fd03c0 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
index 4e7150c70a8..83646ddb287 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "bf073e02-7e0b-dc8b-b075-82932236e50b"
+    "id": "bf073e02-7e0b-dc8b-b075-82932236e50a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
index 18ed773dab0..c7a019ef829 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "bf073e02-7e0b-dc8b-b075-82932236e50a"
+    "id": "bf073e02-7e0b-dc8b-b075-82932236e50b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.freeze b/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.freeze
index b457d0ec92c..7ccf87f4bd5 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.freeze
+++ b/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.freeze
@@ -1 +1 @@
-2026-04-03T21:02:56.793Z
\ No newline at end of file
+2026-04-16T20:03:06.304Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.json
index ebd30ca2de3..d7cbb9016a0 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_access_token_for_a_service_account_returns_Created_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Create_an_access_token_for_a_service_account_returns_Created_response-1775250176@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
+        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Create_an_access_token_for_a_service_account_returns_Created_response-1776369786@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"users\",\"id\":\"7d5e5ea9-2fa0-11f1-991f-62f4bfc595d0\",\"attributes\":{\"name\":null,\"handle\":\"7d5e5ea9-2fa0-11f1-991f-62f4bfc595d0\",\"created_at\":\"2026-04-03T21:02:56.980609+00:00\",\"modified_at\":\"2026-04-03T21:02:56.980609+00:00\",\"email\":\"test-create_an_access_token_for_a_service_account_returns_created_response-1775250176@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/1a703b50769c96d7b84a5470f474ef74?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
+      "body": "{\"data\":{\"type\":\"users\",\"id\":\"498cce13-39cf-11f1-9928-be1871753dee\",\"attributes\":{\"uuid\":\"498cce13-39cf-11f1-9928-be1871753dee\",\"name\":null,\"handle\":\"498cce13-39cf-11f1-9928-be1871753dee\",\"created_at\":\"2026-04-16T20:03:08.017467+00:00\",\"modified_at\":\"2026-04-16T20:03:08.017467+00:00\",\"email\":\"test-create_an_access_token_for_a_service_account_returns_created_response-1776369786@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/ed167ebfacd06c99ea70d4c121f5a7f1?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,22 +27,22 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "567c34c3-ae3c-8785-a73a-27fcc9a742ba"
+    "id": "f47bb188-a2e6-ba96-a9a6-a881be2e659e"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Create_an_access_token_for_a_service_account_returns_Created_response-1775250176\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
+        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Create_an_access_token_for_a_service_account_returns_Created_response-1776369786\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
       },
       "headers": {},
       "method": "POST",
-      "path": "/api/v2/service_accounts/7d5e5ea9-2fa0-11f1-991f-62f4bfc595d0/access_tokens",
+      "path": "/api/v2/service_accounts/498cce13-39cf-11f1-9928-be1871753dee/access_tokens",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"id\":\"6f2491f5-8c3f-45a3-962a-5f769b95e806\",\"type\":\"personal_access_tokens\",\"attributes\":{\"alias\":\"3NirNJ5Y2qB4Fmac8B4wnm\",\"created_at\":\"2026-04-03T21:02:57.288351972Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxXxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Create_an_access_token_for_a_service_account_returns_Created_response-1775250176\",\"public_portion\":\"3NirNJ5Y2qB4Fmac8B4wnm\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"7d5e5ea9-2fa0-11f1-991f-62f4bfc595d0\",\"type\":\"users\"}}}}}",
+      "body": "{\"data\":{\"id\":\"88337232-8552-4495-987c-1cfed567d461\",\"type\":\"personal_access_tokens\",\"attributes\":{\"created_at\":\"2026-04-16T20:03:08.381725456Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Create_an_access_token_for_a_service_account_returns_Created_response-1776369786\",\"public_portion\":\"ddpat_490SyfYQqhqnr008BTjQWn\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"498cce13-39cf-11f1-9928-be1871753dee\",\"type\":\"users\"}}}}}",
       "headers": {
         "Content-Type": [
           "application/vnd.api+json"
@@ -57,13 +57,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6adfa6b-1027-61d3-a8c2-030c2ba28080"
+    "id": "6d806020-4556-1183-3ebc-a80b6034dce9"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/service_accounts/7d5e5ea9-2fa0-11f1-991f-62f4bfc595d0/access_tokens/6f2491f5-8c3f-45a3-962a-5f769b95e806",
+      "path": "/api/v2/service_accounts/498cce13-39cf-11f1-9928-be1871753dee/access_tokens/88337232-8552-4495-987c-1cfed567d461",
       "keepAlive": false,
       "secure": true
     },
@@ -78,13 +78,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "09473a0a-cca9-78f1-677a-1a4f8ac133da"
+    "id": "9f6795a3-3733-f1de-83fa-480c56c66320"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/users/7d5e5ea9-2fa0-11f1-991f-62f4bfc595d0",
+      "path": "/api/v2/users/498cce13-39cf-11f1-9928-be1871753dee",
       "keepAlive": false,
       "secure": true
     },
@@ -99,6 +99,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "393e616c-bf05-7584-1cd3-0dad62ab2cff"
+    "id": "8fda343e-c920-8ee6-219a-f8b36492a756"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
index 5fdb5139b99..ae1a3ad8373 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
index 2afada8e889..127207e03a2 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
index 76a037f2ed4..2c09ac6a877 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
index 31333da4750..92627d59122 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_rule_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
index 91af4088c4a..ef0e3694a98 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
index cf1765920e9..691f6f7875c 100644
--- a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
index 8155c3aeded..626d104be82 100644
--- a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json
index efa9967a0e4..c32805bcdb2 100644
--- a/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json
@@ -18,6 +18,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2bcb392-2d71-be89-5578-460535c541b0"
+    "id": "b2bcb392-2d71-be89-5578-460535c541af"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
index 0c91755cb44..a03b13eebf8 100644
--- a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
index 17f6987468c..5c08c51b83a 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
index bb02652c1ea..c63dd04ca65 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae48"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
index bc7e7c252fa..10df5ded7d7 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
index 0a4283ae5ae..a42f408744d 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
index 1511b4f762f..c3fdd0c217b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
index 7919b99b4ff..b58cbe03324 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
index 0f7523c96c6..ebf1f92f4a9 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3c"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
index 92c10c6b507..76d59841326 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
index 73d82f08f24..6c3e76fcdd4 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
index 9d5fec45de3..b4f342c7c6b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185f"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
index aeb041f1a43..381d1b90a1b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
index 1530f93b73b..6835906bc64 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
index 7d178b53207..853e659f141 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
index ee9ff41cc5e..10d1b44602d 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
index 7808c1e347b..6b20954ff8b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
index fcf4a2bf172..e59aab67ec7 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
index f1c8d39365e..4a4af70d4d6 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
index 075a7f9db40..fdd4d1fe201 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
index 7c90bfe4fab..bdecf0c16b6 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
index ed84911497c..32e889b68d6 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
index 149174ae6d9..a265db54be7 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
index a1c5ecbb403..9906d02abaf 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d35"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
index 621a6a2a79d..3d010c58b58 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
index 23e7a36d764..e668325311c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
index f868434d6ac..d3a3a7bbb1e 100644
--- a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
index c2491988476..75b451b6900 100644
--- a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index 1e23eb77688..dbcf089d3c7 100644
--- a/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index 6b2882ea815..fe4cf251d57 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Not_Found_response.json
index ae97185c72c..8f47c5e0492 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "fa2322eb-4e11-c229-ab3c-0bd21e1ecfe9"
+    "id": "fa2322eb-4e11-c229-ab3c-0bd21e1ecfe8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_OK_response.json
index 27e64e2ebe0..04d16bff7ed 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6e597e91-1a7b-26f6-97a8-b4b2658f33d9"
+    "id": "6e597e91-1a7b-26f6-97a8-b4b2658f33da"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
index 774e33bf524..5fe868f6988 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Not_Found_response.json
index 8f47c5e0492..ae97185c72c 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "fa2322eb-4e11-c229-ab3c-0bd21e1ecfe8"
+    "id": "fa2322eb-4e11-c229-ab3c-0bd21e1ecfe9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_OK_response.json
index 04d16bff7ed..27e64e2ebe0 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6e597e91-1a7b-26f6-97a8-b4b2658f33da"
+    "id": "6e597e91-1a7b-26f6-97a8-b4b2658f33d9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
index d0faeb9a172..f2e8ebc7ed1 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
index b461aa9101d..bebb2a28f98 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
index 018b1504a4a..cab40f18769 100644
--- a/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_GCP_scan_options_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
index c713b9b4bf3..54bbc61f4be 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3eb"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
index 0baec6032c5..eccc4031f16 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
index 958f238638a..8855a987e9a 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
   },
   {
     "httpRequest": {
@@ -79,6 +79,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
index b3366690d8d..4c1dc3043b8 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
index e1bd23989d9..5534121a3e8 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_job_s_details_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80fff"
+    "id": "6bb82102-e994-f0d1-ee96-e1e3f1d80ffd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
index f6628e0a51d..d76b3217ed0 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
index 462a7eb38f0..d3568a82564 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addce"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
index 40f41bf5c71..c6e40d9ebaf 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
index 758e4fb66ad..07da3e25a95 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
index 7b4fa0f864b..8c8b8ce6d00 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json
index e1d7d6dfa5f..6e336f005de 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_rules_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e2e839d-ac73-21dc-b480-36e366ae09da"
+    "id": "7e2e839d-ac73-21dc-b480-36e366ae09d9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
index 9933d6258ad..83cf7035f14 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
index 6352d5f0102..87cb96a7640 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.freeze b/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.freeze
index 55c4828532c..767a9f9c250 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.freeze
+++ b/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.freeze
@@ -1 +1 @@
-2026-04-03T21:03:03.500Z
\ No newline at end of file
+2026-04-16T20:03:09.123Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.json
index 8ce61fc245e..3347aebddcb 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_access_token_for_a_service_account_returns_OK_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1775250183@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
+        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1776369789@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"users\",\"id\":\"8161ef90-2fa0-11f1-991f-62f4bfc595d0\",\"attributes\":{\"name\":null,\"handle\":\"8161ef90-2fa0-11f1-991f-62f4bfc595d0\",\"created_at\":\"2026-04-03T21:03:03.714879+00:00\",\"modified_at\":\"2026-04-03T21:03:03.714879+00:00\",\"email\":\"test-get_an_access_token_for_a_service_account_returns_ok_response-1775250183@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/bb3c6df0d99066bbe05cf7dff99b5561?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
+      "body": "{\"data\":{\"type\":\"users\",\"id\":\"4a56376d-39cf-11f1-9a29-2eb65349fc01\",\"attributes\":{\"uuid\":\"4a56376d-39cf-11f1-9a29-2eb65349fc01\",\"name\":null,\"handle\":\"4a56376d-39cf-11f1-9a29-2eb65349fc01\",\"created_at\":\"2026-04-16T20:03:09.337439+00:00\",\"modified_at\":\"2026-04-16T20:03:09.337439+00:00\",\"email\":\"test-get_an_access_token_for_a_service_account_returns_ok_response-1776369789@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/7473377b9dced0689feddb50f5d82d29?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,22 +27,22 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "145227f5-47e3-35aa-327f-58dc2e4b258b"
+    "id": "d077c285-8166-09b6-bafd-ac466b66d2ea"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1775250183\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
+        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1776369789\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
       },
       "headers": {},
       "method": "POST",
-      "path": "/api/v2/service_accounts/8161ef90-2fa0-11f1-991f-62f4bfc595d0/access_tokens",
+      "path": "/api/v2/service_accounts/4a56376d-39cf-11f1-9a29-2eb65349fc01/access_tokens",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"id\":\"f2362958-1e67-414b-985d-d3196afd9315\",\"type\":\"personal_access_tokens\",\"attributes\":{\"alias\":\"7N2tUOwxIjSF8QziOBIpVd\",\"created_at\":\"2026-04-03T21:03:04.002376467Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1775250183\",\"public_portion\":\"7N2tUOwxIjSF8QziOBIpVd\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"8161ef90-2fa0-11f1-991f-62f4bfc595d0\",\"type\":\"users\"}}}}}",
+      "body": "{\"data\":{\"id\":\"b84d8c2c-b88c-4f72-82ef-fc09dddd1153\",\"type\":\"personal_access_tokens\",\"attributes\":{\"created_at\":\"2026-04-16T20:03:09.695802251Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1776369789\",\"public_portion\":\"ddpat_5bm1hhcTKQzH22hPiJgkEN\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"4a56376d-39cf-11f1-9a29-2eb65349fc01\",\"type\":\"users\"}}}}}",
       "headers": {
         "Content-Type": [
           "application/vnd.api+json"
@@ -57,18 +57,18 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "fdccf204-9c1e-92e9-0008-e334c10c3ed8"
+    "id": "43c62610-8b63-b6e6-6162-25e0c9c01f18"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "GET",
-      "path": "/api/v2/service_accounts/8161ef90-2fa0-11f1-991f-62f4bfc595d0/access_tokens/f2362958-1e67-414b-985d-d3196afd9315",
+      "path": "/api/v2/service_accounts/4a56376d-39cf-11f1-9a29-2eb65349fc01/access_tokens/b84d8c2c-b88c-4f72-82ef-fc09dddd1153",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"id\":\"f2362958-1e67-414b-985d-d3196afd9315\",\"type\":\"personal_access_tokens\",\"attributes\":{\"alias\":\"7N2tUOwxIjSF8QziOBIpVd\",\"created_at\":\"2026-04-03T21:03:04.002376Z\",\"expires_at\":null,\"last_used_at\":null,\"name\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1775250183\",\"public_portion\":\"7N2tUOwxIjSF8QziOBIpVd\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"8161ef90-2fa0-11f1-991f-62f4bfc595d0\",\"type\":\"users\"}}}}}",
+      "body": "{\"data\":{\"id\":\"b84d8c2c-b88c-4f72-82ef-fc09dddd1153\",\"type\":\"personal_access_tokens\",\"attributes\":{\"created_at\":\"2026-04-16T20:03:09.695802Z\",\"expires_at\":null,\"last_used_at\":null,\"name\":\"Test-Get_an_access_token_for_a_service_account_returns_OK_response-1776369789\",\"public_portion\":\"ddpat_5bm1hhcTKQzH22hPiJgkEN\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"4a56376d-39cf-11f1-9a29-2eb65349fc01\",\"type\":\"users\"}}}}}",
       "headers": {
         "Content-Type": [
           "application/vnd.api+json"
@@ -83,13 +83,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "8e65c5a6-4047-d080-cfc9-d5fed107089c"
+    "id": "42134347-5af4-f8df-7193-56b4cfa2f4f0"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/service_accounts/8161ef90-2fa0-11f1-991f-62f4bfc595d0/access_tokens/f2362958-1e67-414b-985d-d3196afd9315",
+      "path": "/api/v2/service_accounts/4a56376d-39cf-11f1-9a29-2eb65349fc01/access_tokens/b84d8c2c-b88c-4f72-82ef-fc09dddd1153",
       "keepAlive": false,
       "secure": true
     },
@@ -104,13 +104,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c26607f1-bdf6-dc7e-1abe-ba1d99b0d986"
+    "id": "207dc4ce-726f-bb5d-f2ec-232ddf8d8fb9"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/users/8161ef90-2fa0-11f1-991f-62f4bfc595d0",
+      "path": "/api/v2/users/4a56376d-39cf-11f1-9a29-2eb65349fc01",
       "keepAlive": false,
       "secure": true
     },
@@ -125,6 +125,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "18d29cd2-ed05-67c0-ce3f-cd340445e82f"
+    "id": "98343038-3a18-ef13-9153-732118bbfdc9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
index f392f13fc4c..b79df729351 100644
--- a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
index 273c818221c..39e1970bef7 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
index e05cab1201f..f469a5cda1f 100644
--- a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index 9aabde754b9..f8de8236dab 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
index 1eccad92176..5a0fb2b36de 100644
--- a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
index d1447e359b2..08ab09fd252 100644
--- a/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
index d88ac2ed754..1d634f061da 100644
--- a/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Grant_role_to_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f5185e"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
index 61e60b91801..f5543674faa 100644
--- a/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_AWS_on_demand_tasks_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7442c701-c89c-a74b-3de9-6b4cff876178"
+    "id": "7442c701-c89c-a74b-3de9-6b4cff876179"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
index c09bb52e54b..e200ee772e9 100644
--- a/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_GCP_scan_options_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fab"
+    "id": "f9eb4412-690a-34d5-e9ac-6eb62df01fac"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index b59f7c51711..481b1a30e15 100644
--- a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.freeze b/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.freeze
index 6234af8a3e4..db15643c3b7 100644
--- a/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.freeze
+++ b/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.freeze
@@ -1 +1 @@
-2026-04-03T21:03:09.026Z
\ No newline at end of file
+2026-04-16T20:03:10.610Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.json
index 63738b91632..11c655fcc28 100644
--- a/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_access_tokens_for_a_service_account_returns_OK_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-List_access_tokens_for_a_service_account_returns_OK_response-1775250189@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
+        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-List_access_tokens_for_a_service_account_returns_OK_response-1776369790@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"users\",\"id\":\"84a7b33b-2fa0-11f1-96b6-7a9b8860a1d7\",\"attributes\":{\"name\":null,\"handle\":\"84a7b33b-2fa0-11f1-96b6-7a9b8860a1d7\",\"created_at\":\"2026-04-03T21:03:09.205232+00:00\",\"modified_at\":\"2026-04-03T21:03:09.205232+00:00\",\"email\":\"test-list_access_tokens_for_a_service_account_returns_ok_response-1775250189@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/816e106f74328dd4c20e98c116a9edeb?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}",
+      "body": "{\"data\":{\"type\":\"users\",\"id\":\"4b3b0a2c-39cf-11f1-bf73-ce6d1c25b9b4\",\"attributes\":{\"uuid\":\"4b3b0a2c-39cf-11f1-bf73-ce6d1c25b9b4\",\"name\":null,\"handle\":\"4b3b0a2c-39cf-11f1-bf73-ce6d1c25b9b4\",\"created_at\":\"2026-04-16T20:03:10.837056+00:00\",\"modified_at\":\"2026-04-16T20:03:10.837056+00:00\",\"email\":\"test-list_access_tokens_for_a_service_account_returns_ok_response-1776369790@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/0a5772e4c2381e3c1061e55142e2281a?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,13 +27,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "15159beb-c452-f76c-c58b-3dd52e769af5"
+    "id": "315fbb2a-1c68-4067-2ddf-70846fbd17d2"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "GET",
-      "path": "/api/v2/service_accounts/84a7b33b-2fa0-11f1-96b6-7a9b8860a1d7/access_tokens",
+      "path": "/api/v2/service_accounts/4b3b0a2c-39cf-11f1-bf73-ce6d1c25b9b4/access_tokens",
       "keepAlive": false,
       "secure": true
     },
@@ -53,13 +53,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "fcd67808-c945-bd4d-6169-075b41c61c92"
+    "id": "e8917630-83f6-7504-ebf6-c0d63c473dbc"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/users/84a7b33b-2fa0-11f1-96b6-7a9b8860a1d7",
+      "path": "/api/v2/users/4b3b0a2c-39cf-11f1-bf73-ce6d1c25b9b4",
       "keepAlive": false,
       "secure": true
     },
@@ -74,6 +74,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "29e3fcdb-4d74-bd98-edbd-15ce7445207c"
+    "id": "03782f84-f04f-b210-02b4-e3f5ca9577df"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
index bd48720dd5f..4ddbbbf6380 100644
--- a/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_AWS_integrations_returns_AWS_Accounts_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d11"
+    "id": "101a55f5-5a26-d616-5fb4-8d0451d83d10"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json
index 80e2da9ecca..2cd151adcdb 100644
--- a/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_rules_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7e2e839d-ac73-21dc-b480-36e366ae09d9"
+    "id": "7e2e839d-ac73-21dc-b480-36e366ae09da"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
index ca6902dd772..3a4c2c18041 100644
--- a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
index 26f01926eeb..3cb9d5c6927 100644
--- a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
index f469a5cda1f..e05cab1201f 100644
--- a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 25a1f8a4ae0..4e2a1b8a39b 100644
--- a/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d10"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
index a48da463a36..f27b1bc88fb 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
index ca2387782fd..15f40344bd7 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
index b3459ffd0fc..88ddad7a3ae 100644
--- a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
index 974c53ce63d..0a176ee003e 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json
index 15c0687ec0c..46d1bbda4f0 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b0e82961-e316-45f9-b544-8011dda3dd99"
+    "id": "b0e82961-e316-45f9-b544-8011dda3dd98"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json
index fb2bbc86068..76a4e155ad0 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f70"
+    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f71"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json
index 82770941cf9..cd295ed246c 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95bf"
+    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95be"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 458c0a50fce..122367ac740 100644
--- a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
index 9232671467e..e61e22c527a 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
index f301ca6f3ce..b704a75d7a7 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.freeze b/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.freeze
index fa38ba91a95..4a8602fd913 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.freeze
+++ b/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.freeze
@@ -1 +1 @@
-2026-04-03T21:03:10.520Z
\ No newline at end of file
+2026-04-16T20:03:12.932Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.json
index d9de91753fa..297f1a4fea9 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_an_access_token_for_a_service_account_returns_No_Content_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Revoke_an_access_token_for_a_service_account_returns_No_Content_response-1775250190@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
+        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Revoke_an_access_token_for_a_service_account_returns_No_Content_response-1776369792@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"users\",\"id\":\"860878b5-2fa0-11f1-991f-62f4bfc595d0\",\"attributes\":{\"name\":null,\"handle\":\"860878b5-2fa0-11f1-991f-62f4bfc595d0\",\"created_at\":\"2026-04-03T21:03:11.517157+00:00\",\"modified_at\":\"2026-04-03T21:03:11.517157+00:00\",\"email\":\"test-revoke_an_access_token_for_a_service_account_returns_no_content_response-1775250190@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/7d18813f3cbc71a5e46b1184fc3ad8fb?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
+      "body": "{\"data\":{\"type\":\"users\",\"id\":\"4c99fbee-39cf-11f1-beb2-cad70c641dfa\",\"attributes\":{\"uuid\":\"4c99fbee-39cf-11f1-beb2-cad70c641dfa\",\"name\":null,\"handle\":\"4c99fbee-39cf-11f1-beb2-cad70c641dfa\",\"created_at\":\"2026-04-16T20:03:13.136998+00:00\",\"modified_at\":\"2026-04-16T20:03:13.136998+00:00\",\"email\":\"test-revoke_an_access_token_for_a_service_account_returns_no_content_response-1776369792@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/7586d09a6a08e32a963f425a34463a4d?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,22 +27,22 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "8e80ce1e-baea-0855-a516-5204026b7cb0"
+    "id": "feae69d6-cf82-4560-fc06-fba6fe8c4884"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Revoke_an_access_token_for_a_service_account_returns_No_Content_response-1775250190\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
+        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Revoke_an_access_token_for_a_service_account_returns_No_Content_response-1776369792\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
       },
       "headers": {},
       "method": "POST",
-      "path": "/api/v2/service_accounts/860878b5-2fa0-11f1-991f-62f4bfc595d0/access_tokens",
+      "path": "/api/v2/service_accounts/4c99fbee-39cf-11f1-beb2-cad70c641dfa/access_tokens",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"id\":\"7346d75b-83f3-48ba-9186-899fc80bce16\",\"type\":\"personal_access_tokens\",\"attributes\":{\"alias\":\"3VWUVmuRsjFIKue2Uq9ii6\",\"created_at\":\"2026-04-03T21:03:11.782016283Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Revoke_an_access_token_for_a_service_account_returns_No_Content_response-1775250190\",\"public_portion\":\"3VWUVmuRsjFIKue2Uq9ii6\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"860878b5-2fa0-11f1-991f-62f4bfc595d0\",\"type\":\"users\"}}}}}",
+      "body": "{\"data\":{\"id\":\"a5b5e3c3-2b58-448b-a1b1-5c97f16837a6\",\"type\":\"personal_access_tokens\",\"attributes\":{\"created_at\":\"2026-04-16T20:03:13.505344652Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxXxxxxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Revoke_an_access_token_for_a_service_account_returns_No_Content_response-1776369792\",\"public_portion\":\"ddpat_52grBIAi4zKGY0uxhjLVVW\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"4c99fbee-39cf-11f1-beb2-cad70c641dfa\",\"type\":\"users\"}}}}}",
       "headers": {
         "Content-Type": [
           "application/vnd.api+json"
@@ -57,13 +57,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f38e844-7171-92c4-d557-1f9a6b65056c"
+    "id": "8a5a8bec-f645-edef-33c1-e3ea927b06ff"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/service_accounts/860878b5-2fa0-11f1-991f-62f4bfc595d0/access_tokens/7346d75b-83f3-48ba-9186-899fc80bce16",
+      "path": "/api/v2/service_accounts/4c99fbee-39cf-11f1-beb2-cad70c641dfa/access_tokens/a5b5e3c3-2b58-448b-a1b1-5c97f16837a6",
       "keepAlive": false,
       "secure": true
     },
@@ -78,13 +78,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "69600d26-98fc-c50d-de4a-9a91c7a31bbe"
+    "id": "9f2fc74e-4b0e-839a-3ec0-9da4a2a8ae4b"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/service_accounts/860878b5-2fa0-11f1-991f-62f4bfc595d0/access_tokens/7346d75b-83f3-48ba-9186-899fc80bce16",
+      "path": "/api/v2/service_accounts/4c99fbee-39cf-11f1-beb2-cad70c641dfa/access_tokens/a5b5e3c3-2b58-448b-a1b1-5c97f16837a6",
       "keepAlive": false,
       "secure": true
     },
@@ -99,13 +99,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "69600d26-98fc-c50d-de4a-9a91c7a31bbf"
+    "id": "9f2fc74e-4b0e-839a-3ec0-9da4a2a8ae4c"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/users/860878b5-2fa0-11f1-991f-62f4bfc595d0",
+      "path": "/api/v2/users/4c99fbee-39cf-11f1-beb2-cad70c641dfa",
       "keepAlive": false,
       "secure": true
     },
@@ -120,6 +120,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6877b2e2-ef94-29e4-86b5-baf7800f86bd"
+    "id": "994e08b8-d361-e7d6-a7a2-8323e62d9c95"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
index d59c27e003b..d34dbe2c91b 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
index 988f4ea02fd..f5ca912756d 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
index 5f10e5a84ba..813463d333c 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
index 2cf2f5e7036..60a873eea23 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
index cd0f546067e..4d8b7b62fd0 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
index 25c50b5140f..45c975b8ad7 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
index 5aa2107af10..102c77a74fe 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 0a176ee003e..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index b2d72b87ba2..86a19127bf9 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
index 385920ba074..44af9ec407e 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json
index 46d1bbda4f0..15c0687ec0c 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b0e82961-e316-45f9-b544-8011dda3dd98"
+    "id": "b0e82961-e316-45f9-b544-8011dda3dd99"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
index 970a0b596df..78da17d9040 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
index 33523d241e1..cb8bbfa87f3 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
index e14debdb1c1..98eacb05028 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae44"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae49"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
index 949fd15a46e..1f5fdda09e0 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
index bc71ccd8654..0b352ba3fba 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
index 7a985fbb55d..fe18d92a837 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
index 3f634cdfdc4..6b10b1f99cb 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
index 4144e776050..08144afbd3b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
index 84230fa914c..05a194ff998 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3eb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
index 5486c5522b1..7ee7239080c 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7c"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
index dff3c5435d1..c669844b54b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
index f8e2615c3f8..170166752c7 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
index cd4b267d68f..d9e8b04dedd 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
index f7ba5a0c135..87c7ca222ab 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
index 170166752c7..f8e2615c3f8 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62feb"
+    "id": "ce266f9d-5f90-251e-805b-1fa5bbd62fea"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
index 73305cd59ef..7974cef2f13 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
index 811fe023421..6aaa5818b15 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
index c0415eb8a2f..2efa53de1ac 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
index 38f465a9e25..833d5ca5043 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce4"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.freeze b/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.freeze
index 6a894d59da1..58278ff6c0f 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.freeze
+++ b/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.freeze
@@ -1 +1 @@
-2026-04-03T21:03:12.499Z
\ No newline at end of file
+2026-04-16T20:03:14.527Z
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.json
index 084402251cc..790a7566ae7 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_access_token_for_a_service_account_returns_OK_response.json
@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1775250192@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
+        "json": "{\"data\":{\"attributes\":{\"email\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1776369794@datadoghq.com\",\"service_account\":true,\"title\":\"user title\"},\"type\":\"users\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"users\",\"id\":\"86bdf0d7-2fa0-11f1-991f-62f4bfc595d0\",\"attributes\":{\"name\":null,\"handle\":\"86bdf0d7-2fa0-11f1-991f-62f4bfc595d0\",\"created_at\":\"2026-04-03T21:03:12.706435+00:00\",\"modified_at\":\"2026-04-03T21:03:12.706435+00:00\",\"email\":\"test-update_an_access_token_for_a_service_account_returns_ok_response-1775250192@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/8ef25c203ebdbe5e11acb74bd99ba7da?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
+      "body": "{\"data\":{\"type\":\"users\",\"id\":\"4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4\",\"attributes\":{\"uuid\":\"4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4\",\"name\":null,\"handle\":\"4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4\",\"created_at\":\"2026-04-16T20:03:14.742691+00:00\",\"modified_at\":\"2026-04-16T20:03:14.742691+00:00\",\"email\":\"test-update_an_access_token_for_a_service_account_returns_ok_response-1776369794@datadoghq.com\",\"icon\":\"https://secure.gravatar.com/avatar/05aacae415f13819561258b03c973881?s=48&d=retro\",\"title\":\"user title\",\"verified\":true,\"service_account\":true,\"disabled\":false,\"allowed_login_methods\":[],\"status\":\"Active\",\"last_login_time\":null},\"relationships\":{\"roles\":{\"data\":[]},\"org\":{\"data\":{\"type\":\"orgs\",\"id\":\"4dee724d-00cc-11ea-a77b-570c9d03c6c5\"}}}}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,22 +27,22 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "284472d5-9973-7d0e-2c04-6ac82d23b165"
+    "id": "fcac50ec-362b-af11-9f23-2eea03a03b40"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1775250192\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
+        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1776369794\",\"scopes\":[\"dashboards_read\"]},\"type\":\"personal_access_tokens\"}}"
       },
       "headers": {},
       "method": "POST",
-      "path": "/api/v2/service_accounts/86bdf0d7-2fa0-11f1-991f-62f4bfc595d0/access_tokens",
+      "path": "/api/v2/service_accounts/4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4/access_tokens",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"id\":\"9a7d27cc-4969-4a57-990c-03c23a9f2adc\",\"type\":\"personal_access_tokens\",\"attributes\":{\"alias\":\"4hW0tyOpjf5Dj84mZaXqwe\",\"created_at\":\"2026-04-03T21:03:12.978132411Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxXxxx_xxxxxXxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1775250192\",\"public_portion\":\"4hW0tyOpjf5Dj84mZaXqwe\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"86bdf0d7-2fa0-11f1-991f-62f4bfc595d0\",\"type\":\"users\"}}}}}",
+      "body": "{\"data\":{\"id\":\"eafa3dd9-430d-4075-a183-63171c7f3de5\",\"type\":\"personal_access_tokens\",\"attributes\":{\"created_at\":\"2026-04-16T20:03:15.138533237Z\",\"expires_at\":null,\"key\":\"xxxxx_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxXxxxxxxxxxxxxxxxxxxxx\",\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1776369794\",\"public_portion\":\"ddpat_79OZ2nUHcB3McO399ZaVVt\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4\",\"type\":\"users\"}}}}}",
       "headers": {
         "Content-Type": [
           "application/vnd.api+json"
@@ -57,22 +57,22 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "00c32353-a37b-6c00-e267-5c108c52d533"
+    "id": "f623cff4-6c3a-0e83-71be-452b054aad18"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1775250192-updated\"},\"id\":\"9a7d27cc-4969-4a57-990c-03c23a9f2adc\",\"type\":\"personal_access_tokens\"}}"
+        "json": "{\"data\":{\"attributes\":{\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1776369794-updated\"},\"id\":\"eafa3dd9-430d-4075-a183-63171c7f3de5\",\"type\":\"personal_access_tokens\"}}"
       },
       "headers": {},
       "method": "PATCH",
-      "path": "/api/v2/service_accounts/86bdf0d7-2fa0-11f1-991f-62f4bfc595d0/access_tokens/9a7d27cc-4969-4a57-990c-03c23a9f2adc",
+      "path": "/api/v2/service_accounts/4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4/access_tokens/eafa3dd9-430d-4075-a183-63171c7f3de5",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"id\":\"9a7d27cc-4969-4a57-990c-03c23a9f2adc\",\"type\":\"personal_access_tokens\",\"attributes\":{\"alias\":\"4hW0tyOpjf5Dj84mZaXqwe\",\"created_at\":\"2026-04-03T21:03:12.978132Z\",\"expires_at\":null,\"last_used_at\":null,\"modified_at\":\"2026-04-03T21:03:13.152078Z\",\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1775250192-updated\",\"public_portion\":\"4hW0tyOpjf5Dj84mZaXqwe\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"86bdf0d7-2fa0-11f1-991f-62f4bfc595d0\",\"type\":\"users\"}}}}}",
+      "body": "{\"data\":{\"id\":\"eafa3dd9-430d-4075-a183-63171c7f3de5\",\"type\":\"personal_access_tokens\",\"attributes\":{\"created_at\":\"2026-04-16T20:03:15.138533Z\",\"expires_at\":null,\"last_used_at\":null,\"modified_at\":\"2026-04-16T20:03:15.375809Z\",\"name\":\"Test-Update_an_access_token_for_a_service_account_returns_OK_response-1776369794-updated\",\"public_portion\":\"ddpat_79OZ2nUHcB3McO399ZaVVt\",\"scopes\":[\"dashboards_read\"]},\"relationships\":{\"owned_by\":{\"data\":{\"id\":\"4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4\",\"type\":\"users\"}}}}}",
       "headers": {
         "Content-Type": [
           "application/vnd.api+json"
@@ -87,13 +87,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "601591e1-22a4-cbbd-2ab8-729d01a9e7bb"
+    "id": "10f62515-3f2f-dceb-9e2f-46e87cf0e500"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/service_accounts/86bdf0d7-2fa0-11f1-991f-62f4bfc595d0/access_tokens/9a7d27cc-4969-4a57-990c-03c23a9f2adc",
+      "path": "/api/v2/service_accounts/4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4/access_tokens/eafa3dd9-430d-4075-a183-63171c7f3de5",
       "keepAlive": false,
       "secure": true
     },
@@ -108,13 +108,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d69fc8d6-6af5-6d67-b249-12a17d3fc28f"
+    "id": "ade5368b-108f-866d-8803-6d4c5735ba3c"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/users/86bdf0d7-2fa0-11f1-991f-62f4bfc595d0",
+      "path": "/api/v2/users/4d8efdef-39cf-11f1-bf73-ce6d1c25b9b4",
       "keepAlive": false,
       "secure": true
     },
@@ -129,6 +129,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "96de1c9c-aa07-1667-ed8e-5edd9be98b5e"
+    "id": "a3dce74c-505e-2fbb-b31a-a8b86157dc12"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
index d75c200e9ae..82f7a958707 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd9"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
index aa33727ca2c..3e4e610c567 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
index 876ad2e41fe..0587c45a38b 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
index a9ce37fb461..3dff6385ef2 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
index 3e0850132da..2ac4e9e9466 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6467"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
index 31556059bfd..4f21d1e7ffd 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
index 88b2bb14ac5..1ef3a7d5fe9 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
index 8acf5728617..7dd888e1dca 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
index 60921358de9..49be045f79f 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
index b4040b956bc..0d587bfafd7 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
index c06b8597bd4..8b574c36444 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
index 1a052a0e510..7a63513bd9a 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
index 6b8400bc073..a293ad3ef40 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d30"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
index 3300bd74e78..4ba02334273 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
index 4de99e63586..aad946720a2 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd8"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
index b9bf77f1d8f..733dc11b1e7 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/key_management.feature b/src/test/resources/com/datadog/api/client/v2/api/key_management.feature
index 6c464845562..365c53ed7c2 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/key_management.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/key_management.feature
@@ -221,7 +221,7 @@ Feature: Key Management
   @generated @skip @team:DataDog/credentials-management
   Scenario: Get a personal access token returns "Not Found" response
     Given new "GetPersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -229,7 +229,7 @@ Feature: Key Management
   Scenario: Get a personal access token returns "OK" response
     Given there is a valid "personal_access_token" in the system
     And new "GetPersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "personal_access_token.data.id"
+    And request contains "pat_id" parameter from "personal_access_token.data.id"
     When the request is sent
     Then the response status is 200 OK
     And the response "data.type" is equal to "personal_access_tokens"
@@ -355,21 +355,21 @@ Feature: Key Management
   Scenario: Revoke a personal access token returns "No Content" response
     Given there is a valid "personal_access_token" in the system
     And new "RevokePersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "personal_access_token.data.id"
+    And request contains "pat_id" parameter from "personal_access_token.data.id"
     When the request is sent
     Then the response status is 204 No Content
 
   @generated @skip @team:DataDog/credentials-management
   Scenario: Revoke a personal access token returns "Not Found" response
     Given new "RevokePersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/credentials-management
   Scenario: Update a personal access token returns "Bad Request" response
     Given new "UpdatePersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"name": "Updated Personal Access Token", "scopes": ["dashboards_read", "dashboards_write"]}, "id": "00112233-4455-6677-8899-aabbccddeeff", "type": "personal_access_tokens"}}
     When the request is sent
     Then the response status is 400 Bad Request
@@ -377,7 +377,7 @@ Feature: Key Management
   @generated @skip @team:DataDog/credentials-management
   Scenario: Update a personal access token returns "Not Found" response
     Given new "UpdatePersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"name": "Updated Personal Access Token", "scopes": ["dashboards_read", "dashboards_write"]}, "id": "00112233-4455-6677-8899-aabbccddeeff", "type": "personal_access_tokens"}}
     When the request is sent
     Then the response status is 404 Not Found
@@ -386,7 +386,7 @@ Feature: Key Management
   Scenario: Update a personal access token returns "OK" response
     Given there is a valid "personal_access_token" in the system
     And new "UpdatePersonalAccessToken" request
-    And request contains "pat_uuid" parameter from "personal_access_token.data.id"
+    And request contains "pat_id" parameter from "personal_access_token.data.id"
     And body with value {"data": {"type": "personal_access_tokens", "id": "{{ personal_access_token.data.id }}", "attributes": {"name": "{{ unique }}-updated"}}}
     When the request is sent
     Then the response status is 200 OK
diff --git a/src/test/resources/com/datadog/api/client/v2/api/service_accounts.feature b/src/test/resources/com/datadog/api/client/v2/api/service_accounts.feature
index 25744abc832..fa8c81440e2 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/service_accounts.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/service_accounts.feature
@@ -142,7 +142,7 @@ Feature: Service Accounts
   Scenario: Get an access token for a service account returns "Not Found" response
     Given new "GetServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -152,7 +152,7 @@ Feature: Service Accounts
     And there is a valid "service_account_access_token" for "service_account_user"
     And new "GetServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "service_account_user.data.id"
-    And request contains "pat_uuid" parameter from "service_account_access_token.data.id"
+    And request contains "pat_id" parameter from "service_account_access_token.data.id"
     When the request is sent
     Then the response status is 200 OK
     And the response "data.attributes.name" has the same value as "service_account_access_token.data.attributes.name"
@@ -232,7 +232,7 @@ Feature: Service Accounts
     And there is a valid "service_account_access_token" for "service_account_user"
     And new "RevokeServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "service_account_user.data.id"
-    And request contains "pat_uuid" parameter from "service_account_access_token.data.id"
+    And request contains "pat_id" parameter from "service_account_access_token.data.id"
     When the request is sent
     Then the response status is 204 No Content
 
@@ -240,7 +240,7 @@ Feature: Service Accounts
   Scenario: Revoke an access token for a service account returns "Not Found" response
     Given new "RevokeServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
@@ -248,7 +248,7 @@ Feature: Service Accounts
   Scenario: Update an access token for a service account returns "Bad Request" response
     Given new "UpdateServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"name": "Updated Personal Access Token", "scopes": ["dashboards_read", "dashboards_write"]}, "id": "00112233-4455-6677-8899-aabbccddeeff", "type": "personal_access_tokens"}}
     When the request is sent
     Then the response status is 400 Bad Request
@@ -257,7 +257,7 @@ Feature: Service Accounts
   Scenario: Update an access token for a service account returns "Not Found" response
     Given new "UpdateServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "REPLACE.ME"
-    And request contains "pat_uuid" parameter from "REPLACE.ME"
+    And request contains "pat_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {"name": "Updated Personal Access Token", "scopes": ["dashboards_read", "dashboards_write"]}, "id": "00112233-4455-6677-8899-aabbccddeeff", "type": "personal_access_tokens"}}
     When the request is sent
     Then the response status is 404 Not Found
@@ -268,7 +268,7 @@ Feature: Service Accounts
     And there is a valid "service_account_access_token" for "service_account_user"
     And new "UpdateServiceAccountAccessToken" request
     And request contains "service_account_id" parameter from "service_account_user.data.id"
-    And request contains "pat_uuid" parameter from "service_account_access_token.data.id"
+    And request contains "pat_id" parameter from "service_account_access_token.data.id"
     And body with value {"data": {"id": "{{ service_account_access_token.data.id }}", "type": "personal_access_tokens", "attributes": {"name": "{{ service_account_access_token.data.attributes.name }}-updated"}}}
     When the request is sent
     Then the response status is 200 OK
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index 25b2d6b0df1..061beded331 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -4324,7 +4324,7 @@
       "operationId": "RevokePersonalAccessToken",
       "parameters": [
         {
-          "name": "pat_uuid",
+          "name": "pat_id",
           "source": "data.id"
         }
       ],
@@ -5889,7 +5889,7 @@
           "source": "data.relationships.owned_by.data.id"
         },
         {
-          "name": "pat_uuid",
+          "name": "pat_id",
           "source": "data.id"
         }
       ],