diff --git a/packages/client-ts/compose.yml b/packages/client-ts/compose.yml
index 629eeb762f..2bb03c1911 100644
--- a/packages/client-ts/compose.yml
+++ b/packages/client-ts/compose.yml
@@ -1,7 +1,7 @@
 ---
 services:
     gen:
-        image: docker.io/openapitools/openapi-generator-cli:v7.21.0
+        image: docker.io/openapitools/openapi-generator-cli:v7.22.0
         restart: never
         network_mode: none
         volumes:
diff --git a/packages/client-ts/src/apis/AdminApi.ts b/packages/client-ts/src/apis/AdminApi.ts
index 82576d92db..dd73254b34 100644
--- a/packages/client-ts/src/apis/AdminApi.ts
+++ b/packages/client-ts/src/apis/AdminApi.ts
@@ -12,29 +12,19 @@
  * Do not edit the class manually.
  */
 
-import type {
-    App,
-    FileList,
-    PatchedSettingsRequest,
-    Settings,
-    SettingsRequest,
-    SystemInfo,
-    UsageEnum,
-    UsedBy,
-    Version,
-    VersionHistory,
-} from "../models/index";
+import { type App, AppFromJSON } from "../models/App";
+import { type FileList, FileListFromJSON } from "../models/FileList";
 import {
-    AppFromJSON,
-    FileListFromJSON,
+    type PatchedSettingsRequest,
     PatchedSettingsRequestToJSON,
-    SettingsFromJSON,
-    SettingsRequestToJSON,
-    SystemInfoFromJSON,
-    UsedByFromJSON,
-    VersionFromJSON,
-    VersionHistoryFromJSON,
-} from "../models/index";
+} from "../models/PatchedSettingsRequest";
+import { type Settings, SettingsFromJSON } from "../models/Settings";
+import { type SettingsRequest, SettingsRequestToJSON } from "../models/SettingsRequest";
+import { type SystemInfo, SystemInfoFromJSON } from "../models/SystemInfo";
+import { type UsageEnum } from "../models/UsageEnum";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import { type Version, VersionFromJSON } from "../models/Version";
+import { type VersionHistory, VersionHistoryFromJSON } from "../models/VersionHistory";
 import * as runtime from "../runtime";
 
 export interface AdminFileCreateRequest {
@@ -810,7 +800,7 @@ export class AdminApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/admin/version/history/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/AuthenticatorsApi.ts b/packages/client-ts/src/apis/AuthenticatorsApi.ts
index 45606fc3d0..ceef3b9220 100644
--- a/packages/client-ts/src/apis/AuthenticatorsApi.ts
+++ b/packages/client-ts/src/apis/AuthenticatorsApi.ts
@@ -12,70 +12,87 @@
  * Do not edit the class manually.
  */
 
-import type {
-    Device,
-    DuoDevice,
-    DuoDeviceRequest,
-    EmailDevice,
-    EmailDeviceRequest,
-    GoogleEndpointDevice,
-    GoogleEndpointDeviceRequest,
-    PaginatedDuoDeviceList,
-    PaginatedEmailDeviceList,
-    PaginatedGoogleEndpointDeviceList,
-    PaginatedSMSDeviceList,
-    PaginatedStaticDeviceList,
-    PaginatedTOTPDeviceList,
-    PaginatedWebAuthnDeviceList,
-    PatchedDuoDeviceRequest,
-    PatchedEmailDeviceRequest,
-    PatchedGoogleEndpointDeviceRequest,
-    PatchedSMSDeviceRequest,
-    PatchedStaticDeviceRequest,
-    PatchedTOTPDeviceRequest,
-    PatchedWebAuthnDeviceRequest,
-    SMSDevice,
-    SMSDeviceRequest,
-    StaticDevice,
-    StaticDeviceRequest,
-    TOTPDevice,
-    TOTPDeviceRequest,
-    UsedBy,
-    WebAuthnDevice,
-    WebAuthnDeviceRequest,
-} from "../models/index";
+import { type Device, DeviceFromJSON } from "../models/Device";
+import { type DuoDevice, DuoDeviceFromJSON } from "../models/DuoDevice";
+import { type DuoDeviceRequest, DuoDeviceRequestToJSON } from "../models/DuoDeviceRequest";
+import { type EmailDevice, EmailDeviceFromJSON } from "../models/EmailDevice";
+import { type EmailDeviceRequest, EmailDeviceRequestToJSON } from "../models/EmailDeviceRequest";
 import {
-    DeviceFromJSON,
-    DuoDeviceFromJSON,
-    DuoDeviceRequestToJSON,
-    EmailDeviceFromJSON,
-    EmailDeviceRequestToJSON,
+    type GoogleEndpointDevice,
     GoogleEndpointDeviceFromJSON,
+} from "../models/GoogleEndpointDevice";
+import {
+    type GoogleEndpointDeviceRequest,
     GoogleEndpointDeviceRequestToJSON,
+} from "../models/GoogleEndpointDeviceRequest";
+import {
+    type PaginatedDuoDeviceList,
     PaginatedDuoDeviceListFromJSON,
+} from "../models/PaginatedDuoDeviceList";
+import {
+    type PaginatedEmailDeviceList,
     PaginatedEmailDeviceListFromJSON,
+} from "../models/PaginatedEmailDeviceList";
+import {
+    type PaginatedGoogleEndpointDeviceList,
     PaginatedGoogleEndpointDeviceListFromJSON,
+} from "../models/PaginatedGoogleEndpointDeviceList";
+import {
+    type PaginatedSMSDeviceList,
     PaginatedSMSDeviceListFromJSON,
+} from "../models/PaginatedSMSDeviceList";
+import {
+    type PaginatedStaticDeviceList,
     PaginatedStaticDeviceListFromJSON,
+} from "../models/PaginatedStaticDeviceList";
+import {
+    type PaginatedTOTPDeviceList,
     PaginatedTOTPDeviceListFromJSON,
+} from "../models/PaginatedTOTPDeviceList";
+import {
+    type PaginatedWebAuthnDeviceList,
     PaginatedWebAuthnDeviceListFromJSON,
+} from "../models/PaginatedWebAuthnDeviceList";
+import {
+    type PatchedDuoDeviceRequest,
     PatchedDuoDeviceRequestToJSON,
+} from "../models/PatchedDuoDeviceRequest";
+import {
+    type PatchedEmailDeviceRequest,
     PatchedEmailDeviceRequestToJSON,
+} from "../models/PatchedEmailDeviceRequest";
+import {
+    type PatchedGoogleEndpointDeviceRequest,
     PatchedGoogleEndpointDeviceRequestToJSON,
+} from "../models/PatchedGoogleEndpointDeviceRequest";
+import {
+    type PatchedSMSDeviceRequest,
     PatchedSMSDeviceRequestToJSON,
+} from "../models/PatchedSMSDeviceRequest";
+import {
+    type PatchedStaticDeviceRequest,
     PatchedStaticDeviceRequestToJSON,
+} from "../models/PatchedStaticDeviceRequest";
+import {
+    type PatchedTOTPDeviceRequest,
     PatchedTOTPDeviceRequestToJSON,
+} from "../models/PatchedTOTPDeviceRequest";
+import {
+    type PatchedWebAuthnDeviceRequest,
     PatchedWebAuthnDeviceRequestToJSON,
-    SMSDeviceFromJSON,
-    SMSDeviceRequestToJSON,
-    StaticDeviceFromJSON,
-    StaticDeviceRequestToJSON,
-    TOTPDeviceFromJSON,
-    TOTPDeviceRequestToJSON,
-    UsedByFromJSON,
-    WebAuthnDeviceFromJSON,
+} from "../models/PatchedWebAuthnDeviceRequest";
+import { type SMSDevice, SMSDeviceFromJSON } from "../models/SMSDevice";
+import { type SMSDeviceRequest, SMSDeviceRequestToJSON } from "../models/SMSDeviceRequest";
+import { type StaticDevice, StaticDeviceFromJSON } from "../models/StaticDevice";
+import { type StaticDeviceRequest, StaticDeviceRequestToJSON } from "../models/StaticDeviceRequest";
+import { type TOTPDevice, TOTPDeviceFromJSON } from "../models/TOTPDevice";
+import { type TOTPDeviceRequest, TOTPDeviceRequestToJSON } from "../models/TOTPDeviceRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import { type WebAuthnDevice, WebAuthnDeviceFromJSON } from "../models/WebAuthnDevice";
+import {
+    type WebAuthnDeviceRequest,
     WebAuthnDeviceRequestToJSON,
-} from "../models/index";
+} from "../models/WebAuthnDeviceRequest";
 import * as runtime from "../runtime";
 
 export interface AuthenticatorsAdminAllListRequest {
@@ -643,7 +660,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -781,7 +798,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -847,7 +864,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -921,7 +938,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1054,7 +1071,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1196,7 +1213,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1262,7 +1279,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1336,7 +1353,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1473,10 +1490,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/endpoint/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1618,10 +1632,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/endpoint/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1691,10 +1702,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/endpoint/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1770,10 +1778,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/endpoint/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1910,7 +1915,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2048,7 +2053,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2114,7 +2119,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2188,7 +2193,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2323,7 +2328,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2465,7 +2470,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2533,7 +2538,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2609,7 +2614,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2744,7 +2749,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2885,7 +2890,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2951,7 +2956,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3025,7 +3030,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3160,7 +3165,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3302,7 +3307,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3372,7 +3377,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3448,7 +3453,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/admin/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3565,7 +3570,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3702,7 +3707,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3768,7 +3773,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3838,7 +3843,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/duo/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3900,7 +3905,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/duo/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3964,7 +3969,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4101,7 +4106,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4167,7 +4172,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4240,7 +4245,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/email/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4302,7 +4307,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/email/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4442,10 +4447,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/endpoint/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -4512,10 +4514,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/endpoint/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -4580,7 +4579,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4717,7 +4716,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4783,7 +4782,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4853,7 +4852,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/sms/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4915,7 +4914,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/sms/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4979,7 +4978,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5116,7 +5115,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5184,7 +5183,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5260,7 +5259,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/static/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5324,7 +5323,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/static/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5389,7 +5388,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5526,7 +5525,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5592,7 +5591,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5662,7 +5661,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/totp/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5724,7 +5723,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/totp/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5789,7 +5788,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5927,7 +5926,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5997,7 +5996,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6073,7 +6072,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/webauthn/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6141,7 +6140,7 @@ export class AuthenticatorsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/authenticators/webauthn/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/CoreApi.ts b/packages/client-ts/src/apis/CoreApi.ts
index dda06c179a..2740ca957e 100644
--- a/packages/client-ts/src/apis/CoreApi.ts
+++ b/packages/client-ts/src/apis/CoreApi.ts
@@ -12,110 +12,117 @@
  * Do not edit the class manually.
  */
 
-import type {
-    Application,
-    ApplicationEntitlement,
-    ApplicationEntitlementRequest,
-    ApplicationRequest,
-    AuthenticatedSession,
-    Brand,
-    BrandRequest,
-    BulkDeleteSessionResponse,
-    CurrentBrand,
-    DataExport,
-    Group,
-    GroupRequest,
-    ImpersonationRequest,
-    IntentEnum,
-    Link,
-    PaginatedApplicationEntitlementList,
-    PaginatedApplicationList,
-    PaginatedAuthenticatedSessionList,
-    PaginatedBrandList,
-    PaginatedGroupList,
-    PaginatedTokenList,
-    PaginatedUserConsentList,
-    PaginatedUserList,
-    PatchedApplicationEntitlementRequest,
-    PatchedApplicationRequest,
-    PatchedBrandRequest,
-    PatchedGroupRequest,
-    PatchedTokenRequest,
-    PatchedUserRequest,
-    PolicyTestResult,
-    SessionUser,
-    Token,
-    TokenRequest,
-    TokenSetKeyRequest,
-    TokenView,
-    TransactionApplicationRequest,
-    TransactionApplicationResponse,
-    UsedBy,
-    User,
-    UserAccountLockdownRequest,
-    UserAccountRequest,
-    UserConsent,
-    UserPasswordHashSetRequest,
-    UserPasswordSetRequest,
-    UserPath,
-    UserRecoveryEmailRequest,
-    UserRecoveryLinkRequest,
-    UserRequest,
-    UserServiceAccountRequest,
-    UserServiceAccountResponse,
-    UserTypeEnum,
-} from "../models/index";
+import { type Application, ApplicationFromJSON } from "../models/Application";
 import {
+    type ApplicationEntitlement,
     ApplicationEntitlementFromJSON,
+} from "../models/ApplicationEntitlement";
+import {
+    type ApplicationEntitlementRequest,
     ApplicationEntitlementRequestToJSON,
-    ApplicationFromJSON,
-    ApplicationRequestToJSON,
+} from "../models/ApplicationEntitlementRequest";
+import { type ApplicationRequest, ApplicationRequestToJSON } from "../models/ApplicationRequest";
+import {
+    type AuthenticatedSession,
     AuthenticatedSessionFromJSON,
-    BrandFromJSON,
-    BrandRequestToJSON,
+} from "../models/AuthenticatedSession";
+import { type Brand, BrandFromJSON } from "../models/Brand";
+import { type BrandRequest, BrandRequestToJSON } from "../models/BrandRequest";
+import {
+    type BulkDeleteSessionResponse,
     BulkDeleteSessionResponseFromJSON,
-    CurrentBrandFromJSON,
-    DataExportFromJSON,
-    GroupFromJSON,
-    GroupRequestToJSON,
+} from "../models/BulkDeleteSessionResponse";
+import { type CurrentBrand, CurrentBrandFromJSON } from "../models/CurrentBrand";
+import { type DataExport, DataExportFromJSON } from "../models/DataExport";
+import { type Group, GroupFromJSON } from "../models/Group";
+import { type GroupRequest, GroupRequestToJSON } from "../models/GroupRequest";
+import {
+    type ImpersonationRequest,
     ImpersonationRequestToJSON,
-    LinkFromJSON,
+} from "../models/ImpersonationRequest";
+import { type IntentEnum } from "../models/IntentEnum";
+import { type Link, LinkFromJSON } from "../models/Link";
+import {
+    type PaginatedApplicationEntitlementList,
     PaginatedApplicationEntitlementListFromJSON,
+} from "../models/PaginatedApplicationEntitlementList";
+import {
+    type PaginatedApplicationList,
     PaginatedApplicationListFromJSON,
+} from "../models/PaginatedApplicationList";
+import {
+    type PaginatedAuthenticatedSessionList,
     PaginatedAuthenticatedSessionListFromJSON,
-    PaginatedBrandListFromJSON,
-    PaginatedGroupListFromJSON,
-    PaginatedTokenListFromJSON,
+} from "../models/PaginatedAuthenticatedSessionList";
+import { type PaginatedBrandList, PaginatedBrandListFromJSON } from "../models/PaginatedBrandList";
+import { type PaginatedGroupList, PaginatedGroupListFromJSON } from "../models/PaginatedGroupList";
+import { type PaginatedTokenList, PaginatedTokenListFromJSON } from "../models/PaginatedTokenList";
+import {
+    type PaginatedUserConsentList,
     PaginatedUserConsentListFromJSON,
-    PaginatedUserListFromJSON,
+} from "../models/PaginatedUserConsentList";
+import { type PaginatedUserList, PaginatedUserListFromJSON } from "../models/PaginatedUserList";
+import {
+    type PatchedApplicationEntitlementRequest,
     PatchedApplicationEntitlementRequestToJSON,
+} from "../models/PatchedApplicationEntitlementRequest";
+import {
+    type PatchedApplicationRequest,
     PatchedApplicationRequestToJSON,
-    PatchedBrandRequestToJSON,
-    PatchedGroupRequestToJSON,
-    PatchedTokenRequestToJSON,
-    PatchedUserRequestToJSON,
-    PolicyTestResultFromJSON,
-    SessionUserFromJSON,
-    TokenFromJSON,
-    TokenRequestToJSON,
-    TokenSetKeyRequestToJSON,
-    TokenViewFromJSON,
+} from "../models/PatchedApplicationRequest";
+import { type PatchedBrandRequest, PatchedBrandRequestToJSON } from "../models/PatchedBrandRequest";
+import { type PatchedGroupRequest, PatchedGroupRequestToJSON } from "../models/PatchedGroupRequest";
+import { type PatchedTokenRequest, PatchedTokenRequestToJSON } from "../models/PatchedTokenRequest";
+import { type PatchedUserRequest, PatchedUserRequestToJSON } from "../models/PatchedUserRequest";
+import { type PolicyTestResult, PolicyTestResultFromJSON } from "../models/PolicyTestResult";
+import { type SessionUser, SessionUserFromJSON } from "../models/SessionUser";
+import { type Token, TokenFromJSON } from "../models/Token";
+import { type TokenRequest, TokenRequestToJSON } from "../models/TokenRequest";
+import { type TokenSetKeyRequest, TokenSetKeyRequestToJSON } from "../models/TokenSetKeyRequest";
+import { type TokenView, TokenViewFromJSON } from "../models/TokenView";
+import {
+    type TransactionApplicationRequest,
     TransactionApplicationRequestToJSON,
+} from "../models/TransactionApplicationRequest";
+import {
+    type TransactionApplicationResponse,
     TransactionApplicationResponseFromJSON,
-    UsedByFromJSON,
+} from "../models/TransactionApplicationResponse";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import { type User, UserFromJSON } from "../models/User";
+import {
+    type UserAccountLockdownRequest,
     UserAccountLockdownRequestToJSON,
-    UserAccountRequestToJSON,
-    UserConsentFromJSON,
-    UserFromJSON,
+} from "../models/UserAccountLockdownRequest";
+import { type UserAccountRequest, UserAccountRequestToJSON } from "../models/UserAccountRequest";
+import { type UserConsent, UserConsentFromJSON } from "../models/UserConsent";
+import {
+    type UserPasswordHashSetRequest,
     UserPasswordHashSetRequestToJSON,
+} from "../models/UserPasswordHashSetRequest";
+import {
+    type UserPasswordSetRequest,
     UserPasswordSetRequestToJSON,
-    UserPathFromJSON,
+} from "../models/UserPasswordSetRequest";
+import { type UserPath, UserPathFromJSON } from "../models/UserPath";
+import {
+    type UserRecoveryEmailRequest,
     UserRecoveryEmailRequestToJSON,
+} from "../models/UserRecoveryEmailRequest";
+import {
+    type UserRecoveryLinkRequest,
     UserRecoveryLinkRequestToJSON,
-    UserRequestToJSON,
+} from "../models/UserRecoveryLinkRequest";
+import { type UserRequest, UserRequestToJSON } from "../models/UserRequest";
+import {
+    type UserServiceAccountRequest,
     UserServiceAccountRequestToJSON,
+} from "../models/UserServiceAccountRequest";
+import {
+    type UserServiceAccountResponse,
     UserServiceAccountResponseFromJSON,
-} from "../models/index";
+} from "../models/UserServiceAccountResponse";
+import { type UserTypeEnum } from "../models/UserTypeEnum";
 import * as runtime from "../runtime";
 
 export interface CoreApplicationEntitlementsCreateRequest {
@@ -634,7 +641,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/application_entitlements/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -787,7 +794,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/application_entitlements/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -860,7 +867,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/application_entitlements/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -939,7 +946,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/application_entitlements/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -1012,7 +1019,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/application_entitlements/{pbm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -1083,10 +1090,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/applications/{slug}/check_access/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1216,10 +1220,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/applications/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1388,10 +1389,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/applications/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1457,10 +1455,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/applications/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1530,10 +1525,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/applications/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1595,10 +1587,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/applications/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1729,10 +1718,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/authenticated_sessions/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1880,10 +1866,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/authenticated_sessions/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1950,10 +1933,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/authenticated_sessions/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2133,7 +2113,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/brands/{brand_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"brand_uuid"}}`,
+            "{brand_uuid}",
             encodeURIComponent(String(requestParameters["brandUuid"])),
         );
 
@@ -2334,7 +2314,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/brands/{brand_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"brand_uuid"}}`,
+            "{brand_uuid}",
             encodeURIComponent(String(requestParameters["brandUuid"])),
         );
 
@@ -2399,7 +2379,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/brands/{brand_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"brand_uuid"}}`,
+            "{brand_uuid}",
             encodeURIComponent(String(requestParameters["brandUuid"])),
         );
 
@@ -2472,7 +2452,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/brands/{brand_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"brand_uuid"}}`,
+            "{brand_uuid}",
             encodeURIComponent(String(requestParameters["brandUuid"])),
         );
 
@@ -2537,7 +2517,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/brands/{brand_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"brand_uuid"}}`,
+            "{brand_uuid}",
             encodeURIComponent(String(requestParameters["brandUuid"])),
         );
 
@@ -2610,7 +2590,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/add_user/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -2737,7 +2717,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -2909,7 +2889,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -2983,7 +2963,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/remove_user/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -3063,7 +3043,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -3136,7 +3116,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -3201,7 +3181,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/groups/{group_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"group_uuid"}}`,
+            "{group_uuid}",
             encodeURIComponent(String(requestParameters["groupUuid"])),
         );
 
@@ -3328,7 +3308,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3492,7 +3472,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3557,7 +3537,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3630,7 +3610,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/set_key/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3703,7 +3683,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3768,7 +3748,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3832,7 +3812,7 @@ export class CoreApi extends runtime.BaseAPI {
 
         let urlPath = `/core/tokens/{identifier}/view_key/`;
         urlPath = urlPath.replace(
-            `{${"identifier"}}`,
+            "{identifier}",
             encodeURIComponent(String(requestParameters["identifier"])),
         );
 
@@ -3966,7 +3946,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/user_consent/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4105,7 +4085,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/user_consent/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4166,7 +4146,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/user_consent/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4350,7 +4330,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4590,7 +4570,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/impersonate/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4939,7 +4919,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5060,7 +5040,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/recovery/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5131,7 +5111,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/recovery_email/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5193,7 +5173,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5332,7 +5312,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/set_password/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5402,7 +5382,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/set_password_hash/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5473,7 +5453,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5535,7 +5515,7 @@ export class CoreApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/core/users/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/CryptoApi.ts b/packages/client-ts/src/apis/CryptoApi.ts
index c52c192a36..1638e8d366 100644
--- a/packages/client-ts/src/apis/CryptoApi.ts
+++ b/packages/client-ts/src/apis/CryptoApi.ts
@@ -12,25 +12,26 @@
  * Do not edit the class manually.
  */
 
-import type {
-    CertificateData,
-    CertificateGenerationRequest,
-    CertificateKeyPair,
-    CertificateKeyPairRequest,
-    KeyTypeEnum,
-    PaginatedCertificateKeyPairList,
-    PatchedCertificateKeyPairRequest,
-    UsedBy,
-} from "../models/index";
+import { type CertificateData, CertificateDataFromJSON } from "../models/CertificateData";
 import {
-    CertificateDataFromJSON,
+    type CertificateGenerationRequest,
     CertificateGenerationRequestToJSON,
-    CertificateKeyPairFromJSON,
+} from "../models/CertificateGenerationRequest";
+import { type CertificateKeyPair, CertificateKeyPairFromJSON } from "../models/CertificateKeyPair";
+import {
+    type CertificateKeyPairRequest,
     CertificateKeyPairRequestToJSON,
+} from "../models/CertificateKeyPairRequest";
+import { type KeyTypeEnum } from "../models/KeyTypeEnum";
+import {
+    type PaginatedCertificateKeyPairList,
     PaginatedCertificateKeyPairListFromJSON,
+} from "../models/PaginatedCertificateKeyPairList";
+import {
+    type PatchedCertificateKeyPairRequest,
     PatchedCertificateKeyPairRequestToJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PatchedCertificateKeyPairRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface CryptoCertificatekeypairsCreateRequest {
@@ -185,7 +186,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
@@ -413,7 +414,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
@@ -486,7 +487,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
@@ -565,7 +566,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
@@ -636,7 +637,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
@@ -708,7 +709,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/view_certificate/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
@@ -784,7 +785,7 @@ export class CryptoApi extends runtime.BaseAPI {
 
         let urlPath = `/crypto/certificatekeypairs/{kp_uuid}/view_private_key/`;
         urlPath = urlPath.replace(
-            `{${"kp_uuid"}}`,
+            "{kp_uuid}",
             encodeURIComponent(String(requestParameters["kpUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/EndpointsApi.ts b/packages/client-ts/src/apis/EndpointsApi.ts
index d038e1d744..9dfc58a261 100644
--- a/packages/client-ts/src/apis/EndpointsApi.ts
+++ b/packages/client-ts/src/apis/EndpointsApi.ts
@@ -12,110 +12,152 @@
  * Do not edit the class manually.
  */
 
-import type {
-    AgentAuthenticationResponse,
-    AgentConfig,
-    AgentConnector,
-    AgentConnectorRequest,
-    AgentPSSODeviceRegistrationRequest,
-    AgentPSSODeviceRegistrationResponse,
-    AgentPSSOUserRegistrationRequest,
-    AgentTokenResponse,
-    AppleIndependentSecureEnclave,
-    AppleIndependentSecureEnclaveRequest,
-    Connector,
-    DeviceAccessGroup,
-    DeviceAccessGroupRequest,
-    DeviceFactsRequest,
-    DeviceSummary,
-    DeviceUserBinding,
-    DeviceUserBindingRequest,
-    EndpointDevice,
-    EndpointDeviceDetails,
-    EndpointDeviceRequest,
-    EnrollmentToken,
-    EnrollmentTokenRequest,
-    EnrollRequest,
-    FleetConnector,
-    FleetConnectorRequest,
-    GoogleChromeConnector,
-    GoogleChromeConnectorRequest,
-    MDMConfigRequest,
-    MDMConfigResponse,
-    PaginatedAgentConnectorList,
-    PaginatedAppleIndependentSecureEnclaveList,
-    PaginatedConnectorList,
-    PaginatedDeviceAccessGroupList,
-    PaginatedDeviceUserBindingList,
-    PaginatedEndpointDeviceList,
-    PaginatedEnrollmentTokenList,
-    PaginatedFleetConnectorList,
-    PaginatedGoogleChromeConnectorList,
-    PatchedAgentConnectorRequest,
-    PatchedAppleIndependentSecureEnclaveRequest,
-    PatchedDeviceAccessGroupRequest,
-    PatchedDeviceUserBindingRequest,
-    PatchedEndpointDeviceRequest,
-    PatchedEnrollmentTokenRequest,
-    PatchedFleetConnectorRequest,
-    PatchedGoogleChromeConnectorRequest,
-    TokenView,
-    TypeCreate,
-    UsedBy,
-    UserSelf,
-} from "../models/index";
 import {
+    type AgentAuthenticationResponse,
     AgentAuthenticationResponseFromJSON,
-    AgentConfigFromJSON,
-    AgentConnectorFromJSON,
+} from "../models/AgentAuthenticationResponse";
+import { type AgentConfig, AgentConfigFromJSON } from "../models/AgentConfig";
+import { type AgentConnector, AgentConnectorFromJSON } from "../models/AgentConnector";
+import {
+    type AgentConnectorRequest,
     AgentConnectorRequestToJSON,
+} from "../models/AgentConnectorRequest";
+import {
+    type AgentPSSODeviceRegistrationRequest,
     AgentPSSODeviceRegistrationRequestToJSON,
+} from "../models/AgentPSSODeviceRegistrationRequest";
+import {
+    type AgentPSSODeviceRegistrationResponse,
     AgentPSSODeviceRegistrationResponseFromJSON,
+} from "../models/AgentPSSODeviceRegistrationResponse";
+import {
+    type AgentPSSOUserRegistrationRequest,
     AgentPSSOUserRegistrationRequestToJSON,
-    AgentTokenResponseFromJSON,
+} from "../models/AgentPSSOUserRegistrationRequest";
+import { type AgentTokenResponse, AgentTokenResponseFromJSON } from "../models/AgentTokenResponse";
+import {
+    type AppleIndependentSecureEnclave,
     AppleIndependentSecureEnclaveFromJSON,
+} from "../models/AppleIndependentSecureEnclave";
+import {
+    type AppleIndependentSecureEnclaveRequest,
     AppleIndependentSecureEnclaveRequestToJSON,
-    ConnectorFromJSON,
-    DeviceAccessGroupFromJSON,
+} from "../models/AppleIndependentSecureEnclaveRequest";
+import { type Connector, ConnectorFromJSON } from "../models/Connector";
+import { type DeviceAccessGroup, DeviceAccessGroupFromJSON } from "../models/DeviceAccessGroup";
+import {
+    type DeviceAccessGroupRequest,
     DeviceAccessGroupRequestToJSON,
-    DeviceFactsRequestToJSON,
-    DeviceSummaryFromJSON,
-    DeviceUserBindingFromJSON,
+} from "../models/DeviceAccessGroupRequest";
+import { type DeviceFactsRequest, DeviceFactsRequestToJSON } from "../models/DeviceFactsRequest";
+import { type DeviceSummary, DeviceSummaryFromJSON } from "../models/DeviceSummary";
+import { type DeviceUserBinding, DeviceUserBindingFromJSON } from "../models/DeviceUserBinding";
+import {
+    type DeviceUserBindingRequest,
     DeviceUserBindingRequestToJSON,
+} from "../models/DeviceUserBindingRequest";
+import { type EndpointDevice, EndpointDeviceFromJSON } from "../models/EndpointDevice";
+import {
+    type EndpointDeviceDetails,
     EndpointDeviceDetailsFromJSON,
-    EndpointDeviceFromJSON,
+} from "../models/EndpointDeviceDetails";
+import {
+    type EndpointDeviceRequest,
     EndpointDeviceRequestToJSON,
-    EnrollmentTokenFromJSON,
+} from "../models/EndpointDeviceRequest";
+import { type EnrollmentToken, EnrollmentTokenFromJSON } from "../models/EnrollmentToken";
+import {
+    type EnrollmentTokenRequest,
     EnrollmentTokenRequestToJSON,
-    EnrollRequestToJSON,
-    FleetConnectorFromJSON,
+} from "../models/EnrollmentTokenRequest";
+import { type EnrollRequest, EnrollRequestToJSON } from "../models/EnrollRequest";
+import { type FleetConnector, FleetConnectorFromJSON } from "../models/FleetConnector";
+import {
+    type FleetConnectorRequest,
     FleetConnectorRequestToJSON,
+} from "../models/FleetConnectorRequest";
+import {
+    type GoogleChromeConnector,
     GoogleChromeConnectorFromJSON,
+} from "../models/GoogleChromeConnector";
+import {
+    type GoogleChromeConnectorRequest,
     GoogleChromeConnectorRequestToJSON,
-    MDMConfigRequestToJSON,
-    MDMConfigResponseFromJSON,
+} from "../models/GoogleChromeConnectorRequest";
+import { type MDMConfigRequest, MDMConfigRequestToJSON } from "../models/MDMConfigRequest";
+import { type MDMConfigResponse, MDMConfigResponseFromJSON } from "../models/MDMConfigResponse";
+import {
+    type PaginatedAgentConnectorList,
     PaginatedAgentConnectorListFromJSON,
+} from "../models/PaginatedAgentConnectorList";
+import {
+    type PaginatedAppleIndependentSecureEnclaveList,
     PaginatedAppleIndependentSecureEnclaveListFromJSON,
+} from "../models/PaginatedAppleIndependentSecureEnclaveList";
+import {
+    type PaginatedConnectorList,
     PaginatedConnectorListFromJSON,
+} from "../models/PaginatedConnectorList";
+import {
+    type PaginatedDeviceAccessGroupList,
     PaginatedDeviceAccessGroupListFromJSON,
+} from "../models/PaginatedDeviceAccessGroupList";
+import {
+    type PaginatedDeviceUserBindingList,
     PaginatedDeviceUserBindingListFromJSON,
+} from "../models/PaginatedDeviceUserBindingList";
+import {
+    type PaginatedEndpointDeviceList,
     PaginatedEndpointDeviceListFromJSON,
+} from "../models/PaginatedEndpointDeviceList";
+import {
+    type PaginatedEnrollmentTokenList,
     PaginatedEnrollmentTokenListFromJSON,
+} from "../models/PaginatedEnrollmentTokenList";
+import {
+    type PaginatedFleetConnectorList,
     PaginatedFleetConnectorListFromJSON,
+} from "../models/PaginatedFleetConnectorList";
+import {
+    type PaginatedGoogleChromeConnectorList,
     PaginatedGoogleChromeConnectorListFromJSON,
+} from "../models/PaginatedGoogleChromeConnectorList";
+import {
+    type PatchedAgentConnectorRequest,
     PatchedAgentConnectorRequestToJSON,
+} from "../models/PatchedAgentConnectorRequest";
+import {
+    type PatchedAppleIndependentSecureEnclaveRequest,
     PatchedAppleIndependentSecureEnclaveRequestToJSON,
+} from "../models/PatchedAppleIndependentSecureEnclaveRequest";
+import {
+    type PatchedDeviceAccessGroupRequest,
     PatchedDeviceAccessGroupRequestToJSON,
+} from "../models/PatchedDeviceAccessGroupRequest";
+import {
+    type PatchedDeviceUserBindingRequest,
     PatchedDeviceUserBindingRequestToJSON,
+} from "../models/PatchedDeviceUserBindingRequest";
+import {
+    type PatchedEndpointDeviceRequest,
     PatchedEndpointDeviceRequestToJSON,
+} from "../models/PatchedEndpointDeviceRequest";
+import {
+    type PatchedEnrollmentTokenRequest,
     PatchedEnrollmentTokenRequestToJSON,
+} from "../models/PatchedEnrollmentTokenRequest";
+import {
+    type PatchedFleetConnectorRequest,
     PatchedFleetConnectorRequestToJSON,
+} from "../models/PatchedFleetConnectorRequest";
+import {
+    type PatchedGoogleChromeConnectorRequest,
     PatchedGoogleChromeConnectorRequestToJSON,
-    TokenViewFromJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
-    UserSelfFromJSON,
-} from "../models/index";
+} from "../models/PatchedGoogleChromeConnectorRequest";
+import { type TokenView, TokenViewFromJSON } from "../models/TokenView";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import { type UserSelf, UserSelfFromJSON } from "../models/UserSelf";
 import * as runtime from "../runtime";
 
 export interface EndpointsAgentsConnectorsAuthFedCreateRequest {
@@ -736,7 +778,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -952,7 +994,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/connectors/{connector_uuid}/mdm_config/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -1025,7 +1067,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -1098,7 +1140,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -1177,7 +1219,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -1248,7 +1290,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/connectors/{connector_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -1385,7 +1427,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/enrollment_tokens/{token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"token_uuid"}}`,
+            "{token_uuid}",
             encodeURIComponent(String(requestParameters["tokenUuid"])),
         );
 
@@ -1534,7 +1576,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/enrollment_tokens/{token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"token_uuid"}}`,
+            "{token_uuid}",
             encodeURIComponent(String(requestParameters["tokenUuid"])),
         );
 
@@ -1607,7 +1649,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/enrollment_tokens/{token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"token_uuid"}}`,
+            "{token_uuid}",
             encodeURIComponent(String(requestParameters["tokenUuid"])),
         );
 
@@ -1686,7 +1728,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/enrollment_tokens/{token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"token_uuid"}}`,
+            "{token_uuid}",
             encodeURIComponent(String(requestParameters["tokenUuid"])),
         );
 
@@ -1757,7 +1799,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/enrollment_tokens/{token_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"token_uuid"}}`,
+            "{token_uuid}",
             encodeURIComponent(String(requestParameters["tokenUuid"])),
         );
 
@@ -1825,7 +1867,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/agents/enrollment_tokens/{token_uuid}/view_key/`;
         urlPath = urlPath.replace(
-            `{${"token_uuid"}}`,
+            "{token_uuid}",
             encodeURIComponent(String(requestParameters["tokenUuid"])),
         );
 
@@ -1963,10 +2005,7 @@ export class EndpointsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/endpoints/agents/psso/ise/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2108,10 +2147,7 @@ export class EndpointsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/endpoints/agents/psso/ise/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2181,10 +2217,7 @@ export class EndpointsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/endpoints/agents/psso/ise/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2260,10 +2293,7 @@ export class EndpointsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/endpoints/agents/psso/ise/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2333,10 +2363,7 @@ export class EndpointsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/endpoints/agents/psso/ise/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2520,7 +2547,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -2654,7 +2681,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -2772,7 +2799,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/connectors/{connector_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -2909,7 +2936,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_access_groups/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -3058,7 +3085,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_access_groups/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -3131,7 +3158,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_access_groups/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -3210,7 +3237,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_access_groups/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -3281,7 +3308,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_access_groups/{pbm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -3418,7 +3445,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -3586,7 +3613,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -3659,7 +3686,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -3738,7 +3765,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -3809,7 +3836,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/device_bindings/{policy_binding_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -3877,7 +3904,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/devices/{device_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"device_uuid"}}`,
+            "{device_uuid}",
             encodeURIComponent(String(requestParameters["deviceUuid"])),
         );
 
@@ -4021,7 +4048,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/devices/{device_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"device_uuid"}}`,
+            "{device_uuid}",
             encodeURIComponent(String(requestParameters["deviceUuid"])),
         );
 
@@ -4094,7 +4121,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/devices/{device_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"device_uuid"}}`,
+            "{device_uuid}",
             encodeURIComponent(String(requestParameters["deviceUuid"])),
         );
 
@@ -4220,7 +4247,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/devices/{device_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"device_uuid"}}`,
+            "{device_uuid}",
             encodeURIComponent(String(requestParameters["deviceUuid"])),
         );
 
@@ -4287,7 +4314,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/devices/{device_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"device_uuid"}}`,
+            "{device_uuid}",
             encodeURIComponent(String(requestParameters["deviceUuid"])),
         );
 
@@ -4420,7 +4447,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/fleet/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -4565,7 +4592,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/fleet/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -4638,7 +4665,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/fleet/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -4717,7 +4744,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/fleet/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -4788,7 +4815,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/fleet/connectors/{connector_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -4927,7 +4954,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/google_chrome/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -5072,7 +5099,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/google_chrome/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -5145,7 +5172,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/google_chrome/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -5224,7 +5251,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/google_chrome/connectors/{connector_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
@@ -5297,7 +5324,7 @@ export class EndpointsApi extends runtime.BaseAPI {
 
         let urlPath = `/endpoints/google_chrome/connectors/{connector_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"connector_uuid"}}`,
+            "{connector_uuid}",
             encodeURIComponent(String(requestParameters["connectorUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/EnterpriseApi.ts b/packages/client-ts/src/apis/EnterpriseApi.ts
index 60a367d2fb..9e4ebcd4a8 100644
--- a/packages/client-ts/src/apis/EnterpriseApi.ts
+++ b/packages/client-ts/src/apis/EnterpriseApi.ts
@@ -12,26 +12,20 @@
  * Do not edit the class manually.
  */
 
-import type {
-    InstallID,
-    License,
-    LicenseForecast,
-    LicenseRequest,
-    LicenseSummary,
-    PaginatedLicenseList,
-    PatchedLicenseRequest,
-    UsedBy,
-} from "../models/index";
+import { type InstallID, InstallIDFromJSON } from "../models/InstallID";
+import { type License, LicenseFromJSON } from "../models/License";
+import { type LicenseForecast, LicenseForecastFromJSON } from "../models/LicenseForecast";
+import { type LicenseRequest, LicenseRequestToJSON } from "../models/LicenseRequest";
+import { type LicenseSummary, LicenseSummaryFromJSON } from "../models/LicenseSummary";
 import {
-    InstallIDFromJSON,
-    LicenseForecastFromJSON,
-    LicenseFromJSON,
-    LicenseRequestToJSON,
-    LicenseSummaryFromJSON,
+    type PaginatedLicenseList,
     PaginatedLicenseListFromJSON,
+} from "../models/PaginatedLicenseList";
+import {
+    type PatchedLicenseRequest,
     PatchedLicenseRequestToJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PatchedLicenseRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface EnterpriseLicenseCreateRequest {
@@ -167,7 +161,7 @@ export class EnterpriseApi extends runtime.BaseAPI {
 
         let urlPath = `/enterprise/license/{license_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"license_uuid"}}`,
+            "{license_uuid}",
             encodeURIComponent(String(requestParameters["licenseUuid"])),
         );
 
@@ -407,7 +401,7 @@ export class EnterpriseApi extends runtime.BaseAPI {
 
         let urlPath = `/enterprise/license/{license_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"license_uuid"}}`,
+            "{license_uuid}",
             encodeURIComponent(String(requestParameters["licenseUuid"])),
         );
 
@@ -476,7 +470,7 @@ export class EnterpriseApi extends runtime.BaseAPI {
 
         let urlPath = `/enterprise/license/{license_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"license_uuid"}}`,
+            "{license_uuid}",
             encodeURIComponent(String(requestParameters["licenseUuid"])),
         );
 
@@ -612,7 +606,7 @@ export class EnterpriseApi extends runtime.BaseAPI {
 
         let urlPath = `/enterprise/license/{license_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"license_uuid"}}`,
+            "{license_uuid}",
             encodeURIComponent(String(requestParameters["licenseUuid"])),
         );
 
@@ -677,7 +671,7 @@ export class EnterpriseApi extends runtime.BaseAPI {
 
         let urlPath = `/enterprise/license/{license_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"license_uuid"}}`,
+            "{license_uuid}",
             encodeURIComponent(String(requestParameters["licenseUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/EventsApi.ts b/packages/client-ts/src/apis/EventsApi.ts
index 18b8a7de8b..714115cf1f 100644
--- a/packages/client-ts/src/apis/EventsApi.ts
+++ b/packages/client-ts/src/apis/EventsApi.ts
@@ -12,59 +12,62 @@
  * Do not edit the class manually.
  */
 
-import type {
-    DataExport,
-    Event,
-    EventActions,
-    EventRequest,
-    EventStats,
-    EventTopPerUser,
-    EventVolume,
-    Notification,
-    NotificationRequest,
-    NotificationRule,
-    NotificationRuleRequest,
-    NotificationTransport,
-    NotificationTransportRequest,
-    NotificationTransportTest,
-    PaginatedEventList,
-    PaginatedNotificationList,
-    PaginatedNotificationRuleList,
-    PaginatedNotificationTransportList,
-    PatchedEventRequest,
-    PatchedNotificationRequest,
-    PatchedNotificationRuleRequest,
-    PatchedNotificationTransportRequest,
-    SeverityEnum,
-    TransportModeEnum,
-    TypeCreate,
-    UsedBy,
-} from "../models/index";
+import { type DataExport, DataExportFromJSON } from "../models/DataExport";
+import { type Event, EventFromJSON } from "../models/Event";
+import { type EventActions } from "../models/EventActions";
+import { type EventRequest, EventRequestToJSON } from "../models/EventRequest";
+import { type EventStats, EventStatsFromJSON } from "../models/EventStats";
+import { type EventTopPerUser, EventTopPerUserFromJSON } from "../models/EventTopPerUser";
+import { type EventVolume, EventVolumeFromJSON } from "../models/EventVolume";
+import { type Notification, NotificationFromJSON } from "../models/Notification";
+import { type NotificationRequest, NotificationRequestToJSON } from "../models/NotificationRequest";
+import { type NotificationRule, NotificationRuleFromJSON } from "../models/NotificationRule";
 import {
-    DataExportFromJSON,
-    EventFromJSON,
-    EventRequestToJSON,
-    EventStatsFromJSON,
-    EventTopPerUserFromJSON,
-    EventVolumeFromJSON,
-    NotificationFromJSON,
-    NotificationRequestToJSON,
-    NotificationRuleFromJSON,
+    type NotificationRuleRequest,
     NotificationRuleRequestToJSON,
+} from "../models/NotificationRuleRequest";
+import {
+    type NotificationTransport,
     NotificationTransportFromJSON,
+} from "../models/NotificationTransport";
+import {
+    type NotificationTransportRequest,
     NotificationTransportRequestToJSON,
+} from "../models/NotificationTransportRequest";
+import {
+    type NotificationTransportTest,
     NotificationTransportTestFromJSON,
-    PaginatedEventListFromJSON,
+} from "../models/NotificationTransportTest";
+import { type PaginatedEventList, PaginatedEventListFromJSON } from "../models/PaginatedEventList";
+import {
+    type PaginatedNotificationList,
     PaginatedNotificationListFromJSON,
+} from "../models/PaginatedNotificationList";
+import {
+    type PaginatedNotificationRuleList,
     PaginatedNotificationRuleListFromJSON,
+} from "../models/PaginatedNotificationRuleList";
+import {
+    type PaginatedNotificationTransportList,
     PaginatedNotificationTransportListFromJSON,
-    PatchedEventRequestToJSON,
+} from "../models/PaginatedNotificationTransportList";
+import { type PatchedEventRequest, PatchedEventRequestToJSON } from "../models/PatchedEventRequest";
+import {
+    type PatchedNotificationRequest,
     PatchedNotificationRequestToJSON,
+} from "../models/PatchedNotificationRequest";
+import {
+    type PatchedNotificationRuleRequest,
     PatchedNotificationRuleRequestToJSON,
+} from "../models/PatchedNotificationRuleRequest";
+import {
+    type PatchedNotificationTransportRequest,
     PatchedNotificationTransportRequestToJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PatchedNotificationTransportRequest";
+import { type SeverityEnum } from "../models/SeverityEnum";
+import { type TransportModeEnum } from "../models/TransportModeEnum";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface EventsEventsCreateRequest {
@@ -416,7 +419,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/events/{event_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"event_uuid"}}`,
+            "{event_uuid}",
             encodeURIComponent(String(requestParameters["eventUuid"])),
         );
 
@@ -693,7 +696,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/events/{event_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"event_uuid"}}`,
+            "{event_uuid}",
             encodeURIComponent(String(requestParameters["eventUuid"])),
         );
 
@@ -758,7 +761,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/events/{event_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"event_uuid"}}`,
+            "{event_uuid}",
             encodeURIComponent(String(requestParameters["eventUuid"])),
         );
 
@@ -1006,7 +1009,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/events/{event_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"event_uuid"}}`,
+            "{event_uuid}",
             encodeURIComponent(String(requestParameters["eventUuid"])),
         );
 
@@ -1177,10 +1180,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/notifications/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1385,10 +1385,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/notifications/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1456,10 +1453,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/notifications/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1527,10 +1521,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/notifications/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1594,10 +1585,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/notifications/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1728,7 +1716,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/rules/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -1876,7 +1864,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/rules/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -1945,7 +1933,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/rules/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -2020,7 +2008,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/rules/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -2087,7 +2075,7 @@ export class EventsApi extends runtime.BaseAPI {
 
         let urlPath = `/events/rules/{pbm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -2217,10 +2205,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/transports/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2369,10 +2354,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/transports/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2442,10 +2424,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/transports/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2508,10 +2487,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/transports/{uuid}/test/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2583,10 +2559,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/transports/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2652,10 +2625,7 @@ export class EventsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/events/transports/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/FlowsApi.ts b/packages/client-ts/src/apis/FlowsApi.ts
index 3969f0a5ea..38611fac02 100644
--- a/packages/client-ts/src/apis/FlowsApi.ts
+++ b/packages/client-ts/src/apis/FlowsApi.ts
@@ -12,44 +12,37 @@
  * Do not edit the class manually.
  */
 
-import type {
-    Cache,
-    ChallengeTypes,
-    DeniedActionEnum,
-    Flow,
-    FlowChallengeResponseRequest,
-    FlowDesignationEnum,
-    FlowDiagram,
-    FlowInspection,
-    FlowRequest,
-    FlowStageBinding,
-    FlowStageBindingRequest,
-    InvalidResponseActionEnum,
-    Link,
-    PaginatedFlowList,
-    PaginatedFlowStageBindingList,
-    PatchedFlowRequest,
-    PatchedFlowStageBindingRequest,
-    PolicyEngineMode,
-    UsedBy,
-} from "../models/index";
+import { type Cache, CacheFromJSON } from "../models/Cache";
+import { type ChallengeTypes, ChallengeTypesFromJSON } from "../models/ChallengeTypes";
+import { type DeniedActionEnum } from "../models/DeniedActionEnum";
+import { type Flow, FlowFromJSON } from "../models/Flow";
 import {
-    CacheFromJSON,
-    ChallengeTypesFromJSON,
+    type FlowChallengeResponseRequest,
     FlowChallengeResponseRequestToJSON,
-    FlowDiagramFromJSON,
-    FlowFromJSON,
-    FlowInspectionFromJSON,
-    FlowRequestToJSON,
-    FlowStageBindingFromJSON,
+} from "../models/FlowChallengeResponseRequest";
+import { type FlowDesignationEnum } from "../models/FlowDesignationEnum";
+import { type FlowDiagram, FlowDiagramFromJSON } from "../models/FlowDiagram";
+import { type FlowInspection, FlowInspectionFromJSON } from "../models/FlowInspection";
+import { type FlowRequest, FlowRequestToJSON } from "../models/FlowRequest";
+import { type FlowStageBinding, FlowStageBindingFromJSON } from "../models/FlowStageBinding";
+import {
+    type FlowStageBindingRequest,
     FlowStageBindingRequestToJSON,
-    LinkFromJSON,
-    PaginatedFlowListFromJSON,
+} from "../models/FlowStageBindingRequest";
+import { type InvalidResponseActionEnum } from "../models/InvalidResponseActionEnum";
+import { type Link, LinkFromJSON } from "../models/Link";
+import { type PaginatedFlowList, PaginatedFlowListFromJSON } from "../models/PaginatedFlowList";
+import {
+    type PaginatedFlowStageBindingList,
     PaginatedFlowStageBindingListFromJSON,
-    PatchedFlowRequestToJSON,
+} from "../models/PaginatedFlowStageBindingList";
+import { type PatchedFlowRequest, PatchedFlowRequestToJSON } from "../models/PatchedFlowRequest";
+import {
+    type PatchedFlowStageBindingRequest,
     PatchedFlowStageBindingRequestToJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PatchedFlowStageBindingRequest";
+import { type PolicyEngineMode } from "../models/PolicyEngineMode";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface FlowsBindingsCreateRequest {
@@ -257,7 +250,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/bindings/{fsb_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"fsb_uuid"}}`,
+            "{fsb_uuid}",
             encodeURIComponent(String(requestParameters["fsbUuid"])),
         );
 
@@ -433,7 +426,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/bindings/{fsb_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"fsb_uuid"}}`,
+            "{fsb_uuid}",
             encodeURIComponent(String(requestParameters["fsbUuid"])),
         );
 
@@ -502,7 +495,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/bindings/{fsb_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"fsb_uuid"}}`,
+            "{fsb_uuid}",
             encodeURIComponent(String(requestParameters["fsbUuid"])),
         );
 
@@ -577,7 +570,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/bindings/{fsb_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"fsb_uuid"}}`,
+            "{fsb_uuid}",
             encodeURIComponent(String(requestParameters["fsbUuid"])),
         );
 
@@ -644,7 +637,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/bindings/{fsb_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"fsb_uuid"}}`,
+            "{fsb_uuid}",
             encodeURIComponent(String(requestParameters["fsbUuid"])),
         );
 
@@ -719,7 +712,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/executor/{flow_slug}/`;
         urlPath = urlPath.replace(
-            `{${"flow_slug"}}`,
+            "{flow_slug}",
             encodeURIComponent(String(requestParameters["flowSlug"])),
         );
 
@@ -798,7 +791,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/executor/{flow_slug}/`;
         urlPath = urlPath.replace(
-            `{${"flow_slug"}}`,
+            "{flow_slug}",
             encodeURIComponent(String(requestParameters["flowSlug"])),
         );
 
@@ -867,7 +860,7 @@ export class FlowsApi extends runtime.BaseAPI {
 
         let urlPath = `/flows/inspector/{flow_slug}/`;
         urlPath = urlPath.replace(
-            `{${"flow_slug"}}`,
+            "{flow_slug}",
             encodeURIComponent(String(requestParameters["flowSlug"])),
         );
 
@@ -1092,10 +1085,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1155,10 +1145,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/diagram/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1223,10 +1210,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/execute/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1291,10 +1275,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/export/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1452,10 +1433,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1520,10 +1498,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1593,10 +1568,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1658,10 +1630,7 @@ export class FlowsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/flows/instances/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/LifecycleApi.ts b/packages/client-ts/src/apis/LifecycleApi.ts
index a301cb9975..5287ea9a10 100644
--- a/packages/client-ts/src/apis/LifecycleApi.ts
+++ b/packages/client-ts/src/apis/LifecycleApi.ts
@@ -12,28 +12,30 @@
  * Do not edit the class manually.
  */
 
-import type {
-    LifecycleIteration,
-    LifecycleIterationRequest,
-    LifecycleRule,
-    LifecycleRuleRequest,
-    PaginatedLifecycleIterationList,
-    PaginatedLifecycleRuleList,
-    PatchedLifecycleRuleRequest,
-    Review,
-    ReviewRequest,
-} from "../models/index";
+import { type LifecycleIteration, LifecycleIterationFromJSON } from "../models/LifecycleIteration";
 import {
-    LifecycleIterationFromJSON,
+    type LifecycleIterationRequest,
     LifecycleIterationRequestToJSON,
-    LifecycleRuleFromJSON,
+} from "../models/LifecycleIterationRequest";
+import { type LifecycleRule, LifecycleRuleFromJSON } from "../models/LifecycleRule";
+import {
+    type LifecycleRuleRequest,
     LifecycleRuleRequestToJSON,
+} from "../models/LifecycleRuleRequest";
+import {
+    type PaginatedLifecycleIterationList,
     PaginatedLifecycleIterationListFromJSON,
+} from "../models/PaginatedLifecycleIterationList";
+import {
+    type PaginatedLifecycleRuleList,
     PaginatedLifecycleRuleListFromJSON,
+} from "../models/PaginatedLifecycleRuleList";
+import {
+    type PatchedLifecycleRuleRequest,
     PatchedLifecycleRuleRequestToJSON,
-    ReviewFromJSON,
-    ReviewRequestToJSON,
-} from "../models/index";
+} from "../models/PatchedLifecycleRuleRequest";
+import { type Review, ReviewFromJSON } from "../models/Review";
+import { type ReviewRequest, ReviewRequestToJSON } from "../models/ReviewRequest";
 import * as runtime from "../runtime";
 
 export interface LifecycleIterationsCreateRequest {
@@ -206,11 +208,11 @@ export class LifecycleApi extends runtime.BaseAPI {
 
         let urlPath = `/lifecycle/iterations/latest/{content_type}/{object_id}/`;
         urlPath = urlPath.replace(
-            `{${"content_type"}}`,
+            "{content_type}",
             encodeURIComponent(String(requestParameters["contentType"])),
         );
         urlPath = urlPath.replace(
-            `{${"object_id"}}`,
+            "{object_id}",
             encodeURIComponent(String(requestParameters["objectId"])),
         );
 
@@ -483,7 +485,7 @@ export class LifecycleApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/lifecycle/rules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -616,7 +618,7 @@ export class LifecycleApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/lifecycle/rules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -683,7 +685,7 @@ export class LifecycleApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/lifecycle/rules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -753,7 +755,7 @@ export class LifecycleApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/lifecycle/rules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/ManagedApi.ts b/packages/client-ts/src/apis/ManagedApi.ts
index c941de9450..1eb039ca40 100644
--- a/packages/client-ts/src/apis/ManagedApi.ts
+++ b/packages/client-ts/src/apis/ManagedApi.ts
@@ -12,24 +12,25 @@
  * Do not edit the class manually.
  */
 
-import type {
-    BlueprintFile,
-    BlueprintImportResult,
-    BlueprintInstance,
-    BlueprintInstanceRequest,
-    PaginatedBlueprintInstanceList,
-    PatchedBlueprintInstanceRequest,
-    UsedBy,
-} from "../models/index";
+import { type BlueprintFile, BlueprintFileFromJSON } from "../models/BlueprintFile";
 import {
-    BlueprintFileFromJSON,
+    type BlueprintImportResult,
     BlueprintImportResultFromJSON,
-    BlueprintInstanceFromJSON,
+} from "../models/BlueprintImportResult";
+import { type BlueprintInstance, BlueprintInstanceFromJSON } from "../models/BlueprintInstance";
+import {
+    type BlueprintInstanceRequest,
     BlueprintInstanceRequestToJSON,
+} from "../models/BlueprintInstanceRequest";
+import {
+    type PaginatedBlueprintInstanceList,
     PaginatedBlueprintInstanceListFromJSON,
+} from "../models/PaginatedBlueprintInstanceList";
+import {
+    type PatchedBlueprintInstanceRequest,
     PatchedBlueprintInstanceRequestToJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PatchedBlueprintInstanceRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface ManagedBlueprintsApplyCreateRequest {
@@ -109,7 +110,7 @@ export class ManagedApi extends runtime.BaseAPI {
 
         let urlPath = `/managed/blueprints/{instance_uuid}/apply/`;
         urlPath = urlPath.replace(
-            `{${"instance_uuid"}}`,
+            "{instance_uuid}",
             encodeURIComponent(String(requestParameters["instanceUuid"])),
         );
 
@@ -295,7 +296,7 @@ export class ManagedApi extends runtime.BaseAPI {
 
         let urlPath = `/managed/blueprints/{instance_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"instance_uuid"}}`,
+            "{instance_uuid}",
             encodeURIComponent(String(requestParameters["instanceUuid"])),
         );
 
@@ -524,7 +525,7 @@ export class ManagedApi extends runtime.BaseAPI {
 
         let urlPath = `/managed/blueprints/{instance_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"instance_uuid"}}`,
+            "{instance_uuid}",
             encodeURIComponent(String(requestParameters["instanceUuid"])),
         );
 
@@ -597,7 +598,7 @@ export class ManagedApi extends runtime.BaseAPI {
 
         let urlPath = `/managed/blueprints/{instance_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"instance_uuid"}}`,
+            "{instance_uuid}",
             encodeURIComponent(String(requestParameters["instanceUuid"])),
         );
 
@@ -672,7 +673,7 @@ export class ManagedApi extends runtime.BaseAPI {
 
         let urlPath = `/managed/blueprints/{instance_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"instance_uuid"}}`,
+            "{instance_uuid}",
             encodeURIComponent(String(requestParameters["instanceUuid"])),
         );
 
@@ -739,7 +740,7 @@ export class ManagedApi extends runtime.BaseAPI {
 
         let urlPath = `/managed/blueprints/{instance_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"instance_uuid"}}`,
+            "{instance_uuid}",
             encodeURIComponent(String(requestParameters["instanceUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/Oauth2Api.ts b/packages/client-ts/src/apis/Oauth2Api.ts
index fed335528d..8a98e11474 100644
--- a/packages/client-ts/src/apis/Oauth2Api.ts
+++ b/packages/client-ts/src/apis/Oauth2Api.ts
@@ -12,20 +12,20 @@
  * Do not edit the class manually.
  */
 
-import type {
-    ExpiringBaseGrantModel,
-    PaginatedExpiringBaseGrantModelList,
-    PaginatedTokenModelList,
-    TokenModel,
-    UsedBy,
-} from "../models/index";
 import {
+    type ExpiringBaseGrantModel,
     ExpiringBaseGrantModelFromJSON,
+} from "../models/ExpiringBaseGrantModel";
+import {
+    type PaginatedExpiringBaseGrantModelList,
     PaginatedExpiringBaseGrantModelListFromJSON,
+} from "../models/PaginatedExpiringBaseGrantModelList";
+import {
+    type PaginatedTokenModelList,
     PaginatedTokenModelListFromJSON,
-    TokenModelFromJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PaginatedTokenModelList";
+import { type TokenModel, TokenModelFromJSON } from "../models/TokenModel";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface Oauth2AccessTokensDestroyRequest {
@@ -122,7 +122,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/access_tokens/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -261,7 +261,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/access_tokens/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -322,7 +322,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/access_tokens/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -387,7 +387,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/authorization_codes/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -531,7 +531,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/authorization_codes/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -598,7 +598,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/authorization_codes/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -663,7 +663,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/refresh_tokens/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -802,7 +802,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/refresh_tokens/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -866,7 +866,7 @@ export class Oauth2Api extends runtime.BaseAPI {
         }
 
         let urlPath = `/oauth2/refresh_tokens/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/OutpostsApi.ts b/packages/client-ts/src/apis/OutpostsApi.ts
index b8a9dd1a41..39f6b8b13a 100644
--- a/packages/client-ts/src/apis/OutpostsApi.ts
+++ b/packages/client-ts/src/apis/OutpostsApi.ts
@@ -12,58 +12,78 @@
  * Do not edit the class manually.
  */
 
-import type {
-    DockerServiceConnection,
-    DockerServiceConnectionRequest,
-    KubernetesServiceConnection,
-    KubernetesServiceConnectionRequest,
-    LDAPCheckAccess,
-    Outpost,
-    OutpostDefaultConfig,
-    OutpostHealth,
-    OutpostRequest,
-    PaginatedDockerServiceConnectionList,
-    PaginatedKubernetesServiceConnectionList,
-    PaginatedLDAPOutpostConfigList,
-    PaginatedOutpostList,
-    PaginatedProxyOutpostConfigList,
-    PaginatedRadiusOutpostConfigList,
-    PaginatedServiceConnectionList,
-    PatchedDockerServiceConnectionRequest,
-    PatchedKubernetesServiceConnectionRequest,
-    PatchedOutpostRequest,
-    RadiusCheckAccess,
-    ServiceConnection,
-    ServiceConnectionState,
-    TypeCreate,
-    UsedBy,
-} from "../models/index";
 import {
+    type DockerServiceConnection,
     DockerServiceConnectionFromJSON,
+} from "../models/DockerServiceConnection";
+import {
+    type DockerServiceConnectionRequest,
     DockerServiceConnectionRequestToJSON,
+} from "../models/DockerServiceConnectionRequest";
+import {
+    type KubernetesServiceConnection,
     KubernetesServiceConnectionFromJSON,
+} from "../models/KubernetesServiceConnection";
+import {
+    type KubernetesServiceConnectionRequest,
     KubernetesServiceConnectionRequestToJSON,
-    LDAPCheckAccessFromJSON,
+} from "../models/KubernetesServiceConnectionRequest";
+import { type LDAPCheckAccess, LDAPCheckAccessFromJSON } from "../models/LDAPCheckAccess";
+import { type Outpost, OutpostFromJSON } from "../models/Outpost";
+import {
+    type OutpostDefaultConfig,
     OutpostDefaultConfigFromJSON,
-    OutpostFromJSON,
-    OutpostHealthFromJSON,
-    OutpostRequestToJSON,
+} from "../models/OutpostDefaultConfig";
+import { type OutpostHealth, OutpostHealthFromJSON } from "../models/OutpostHealth";
+import { type OutpostRequest, OutpostRequestToJSON } from "../models/OutpostRequest";
+import {
+    type PaginatedDockerServiceConnectionList,
     PaginatedDockerServiceConnectionListFromJSON,
+} from "../models/PaginatedDockerServiceConnectionList";
+import {
+    type PaginatedKubernetesServiceConnectionList,
     PaginatedKubernetesServiceConnectionListFromJSON,
+} from "../models/PaginatedKubernetesServiceConnectionList";
+import {
+    type PaginatedLDAPOutpostConfigList,
     PaginatedLDAPOutpostConfigListFromJSON,
+} from "../models/PaginatedLDAPOutpostConfigList";
+import {
+    type PaginatedOutpostList,
     PaginatedOutpostListFromJSON,
+} from "../models/PaginatedOutpostList";
+import {
+    type PaginatedProxyOutpostConfigList,
     PaginatedProxyOutpostConfigListFromJSON,
+} from "../models/PaginatedProxyOutpostConfigList";
+import {
+    type PaginatedRadiusOutpostConfigList,
     PaginatedRadiusOutpostConfigListFromJSON,
+} from "../models/PaginatedRadiusOutpostConfigList";
+import {
+    type PaginatedServiceConnectionList,
     PaginatedServiceConnectionListFromJSON,
+} from "../models/PaginatedServiceConnectionList";
+import {
+    type PatchedDockerServiceConnectionRequest,
     PatchedDockerServiceConnectionRequestToJSON,
+} from "../models/PatchedDockerServiceConnectionRequest";
+import {
+    type PatchedKubernetesServiceConnectionRequest,
     PatchedKubernetesServiceConnectionRequestToJSON,
+} from "../models/PatchedKubernetesServiceConnectionRequest";
+import {
+    type PatchedOutpostRequest,
     PatchedOutpostRequestToJSON,
-    RadiusCheckAccessFromJSON,
-    ServiceConnectionFromJSON,
+} from "../models/PatchedOutpostRequest";
+import { type RadiusCheckAccess, RadiusCheckAccessFromJSON } from "../models/RadiusCheckAccess";
+import { type ServiceConnection, ServiceConnectionFromJSON } from "../models/ServiceConnection";
+import {
+    type ServiceConnectionState,
     ServiceConnectionStateFromJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/ServiceConnectionState";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface OutpostsInstancesCreateRequest {
@@ -397,10 +417,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/instances/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -502,10 +519,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/instances/{uuid}/health/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -678,10 +692,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/instances/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -747,10 +758,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/instances/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -820,10 +828,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/instances/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -885,10 +890,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/instances/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -956,7 +958,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/ldap/{id}/check_access/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1173,7 +1175,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/radius/{id}/check_access/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1311,10 +1313,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/all/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1454,10 +1453,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/all/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1524,10 +1520,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/all/{uuid}/state/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1645,10 +1638,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/all/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1784,10 +1774,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/docker/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1945,10 +1932,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/docker/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2018,10 +2002,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/docker/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2097,10 +2078,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/docker/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2170,10 +2148,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/docker/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2309,10 +2284,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/kubernetes/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2458,10 +2430,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/kubernetes/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2533,10 +2502,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/kubernetes/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2612,10 +2578,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/kubernetes/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -2685,10 +2648,7 @@ export class OutpostsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/outposts/service_connections/kubernetes/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/PoliciesApi.ts b/packages/client-ts/src/apis/PoliciesApi.ts
index d32d66f182..fa099c6709 100644
--- a/packages/client-ts/src/apis/PoliciesApi.ts
+++ b/packages/client-ts/src/apis/PoliciesApi.ts
@@ -12,103 +12,140 @@
  * Do not edit the class manually.
  */
 
-import type {
-    Cache,
-    DetailedCountry,
-    DummyPolicy,
-    DummyPolicyRequest,
-    EventActions,
-    EventMatcherPolicy,
-    EventMatcherPolicyRequest,
-    ExpressionPolicy,
-    ExpressionPolicyRequest,
-    GeoIPPolicy,
-    GeoIPPolicyRequest,
-    PaginatedDummyPolicyList,
-    PaginatedEventMatcherPolicyList,
-    PaginatedExpressionPolicyList,
-    PaginatedGeoIPPolicyList,
-    PaginatedPasswordExpiryPolicyList,
-    PaginatedPasswordPolicyList,
-    PaginatedPolicyBindingList,
-    PaginatedPolicyList,
-    PaginatedReputationList,
-    PaginatedReputationPolicyList,
-    PaginatedUniquePasswordPolicyList,
-    PasswordExpiryPolicy,
-    PasswordExpiryPolicyRequest,
-    PasswordPolicy,
-    PasswordPolicyRequest,
-    PatchedDummyPolicyRequest,
-    PatchedEventMatcherPolicyRequest,
-    PatchedExpressionPolicyRequest,
-    PatchedGeoIPPolicyRequest,
-    PatchedPasswordExpiryPolicyRequest,
-    PatchedPasswordPolicyRequest,
-    PatchedPolicyBindingRequest,
-    PatchedReputationPolicyRequest,
-    PatchedUniquePasswordPolicyRequest,
-    Policy,
-    PolicyBinding,
-    PolicyBindingRequest,
-    PolicyTestRequest,
-    PolicyTestResult,
-    Reputation,
-    ReputationPolicy,
-    ReputationPolicyRequest,
-    TypeCreate,
-    UniquePasswordPolicy,
-    UniquePasswordPolicyRequest,
-    UsedBy,
-} from "../models/index";
+import { type Cache, CacheFromJSON } from "../models/Cache";
+import { type DetailedCountry, DetailedCountryFromJSON } from "../models/DetailedCountry";
+import { type DummyPolicy, DummyPolicyFromJSON } from "../models/DummyPolicy";
+import { type DummyPolicyRequest, DummyPolicyRequestToJSON } from "../models/DummyPolicyRequest";
+import { type EventActions } from "../models/EventActions";
+import { type EventMatcherPolicy, EventMatcherPolicyFromJSON } from "../models/EventMatcherPolicy";
 import {
-    CacheFromJSON,
-    DetailedCountryFromJSON,
-    DummyPolicyFromJSON,
-    DummyPolicyRequestToJSON,
-    EventMatcherPolicyFromJSON,
+    type EventMatcherPolicyRequest,
     EventMatcherPolicyRequestToJSON,
-    ExpressionPolicyFromJSON,
+} from "../models/EventMatcherPolicyRequest";
+import { type ExpressionPolicy, ExpressionPolicyFromJSON } from "../models/ExpressionPolicy";
+import {
+    type ExpressionPolicyRequest,
     ExpressionPolicyRequestToJSON,
-    GeoIPPolicyFromJSON,
-    GeoIPPolicyRequestToJSON,
+} from "../models/ExpressionPolicyRequest";
+import { type GeoIPPolicy, GeoIPPolicyFromJSON } from "../models/GeoIPPolicy";
+import { type GeoIPPolicyRequest, GeoIPPolicyRequestToJSON } from "../models/GeoIPPolicyRequest";
+import {
+    type PaginatedDummyPolicyList,
     PaginatedDummyPolicyListFromJSON,
+} from "../models/PaginatedDummyPolicyList";
+import {
+    type PaginatedEventMatcherPolicyList,
     PaginatedEventMatcherPolicyListFromJSON,
+} from "../models/PaginatedEventMatcherPolicyList";
+import {
+    type PaginatedExpressionPolicyList,
     PaginatedExpressionPolicyListFromJSON,
+} from "../models/PaginatedExpressionPolicyList";
+import {
+    type PaginatedGeoIPPolicyList,
     PaginatedGeoIPPolicyListFromJSON,
+} from "../models/PaginatedGeoIPPolicyList";
+import {
+    type PaginatedPasswordExpiryPolicyList,
     PaginatedPasswordExpiryPolicyListFromJSON,
+} from "../models/PaginatedPasswordExpiryPolicyList";
+import {
+    type PaginatedPasswordPolicyList,
     PaginatedPasswordPolicyListFromJSON,
+} from "../models/PaginatedPasswordPolicyList";
+import {
+    type PaginatedPolicyBindingList,
     PaginatedPolicyBindingListFromJSON,
+} from "../models/PaginatedPolicyBindingList";
+import {
+    type PaginatedPolicyList,
     PaginatedPolicyListFromJSON,
+} from "../models/PaginatedPolicyList";
+import {
+    type PaginatedReputationList,
     PaginatedReputationListFromJSON,
+} from "../models/PaginatedReputationList";
+import {
+    type PaginatedReputationPolicyList,
     PaginatedReputationPolicyListFromJSON,
+} from "../models/PaginatedReputationPolicyList";
+import {
+    type PaginatedUniquePasswordPolicyList,
     PaginatedUniquePasswordPolicyListFromJSON,
+} from "../models/PaginatedUniquePasswordPolicyList";
+import {
+    type PasswordExpiryPolicy,
     PasswordExpiryPolicyFromJSON,
+} from "../models/PasswordExpiryPolicy";
+import {
+    type PasswordExpiryPolicyRequest,
     PasswordExpiryPolicyRequestToJSON,
-    PasswordPolicyFromJSON,
+} from "../models/PasswordExpiryPolicyRequest";
+import { type PasswordPolicy, PasswordPolicyFromJSON } from "../models/PasswordPolicy";
+import {
+    type PasswordPolicyRequest,
     PasswordPolicyRequestToJSON,
+} from "../models/PasswordPolicyRequest";
+import {
+    type PatchedDummyPolicyRequest,
     PatchedDummyPolicyRequestToJSON,
+} from "../models/PatchedDummyPolicyRequest";
+import {
+    type PatchedEventMatcherPolicyRequest,
     PatchedEventMatcherPolicyRequestToJSON,
+} from "../models/PatchedEventMatcherPolicyRequest";
+import {
+    type PatchedExpressionPolicyRequest,
     PatchedExpressionPolicyRequestToJSON,
+} from "../models/PatchedExpressionPolicyRequest";
+import {
+    type PatchedGeoIPPolicyRequest,
     PatchedGeoIPPolicyRequestToJSON,
+} from "../models/PatchedGeoIPPolicyRequest";
+import {
+    type PatchedPasswordExpiryPolicyRequest,
     PatchedPasswordExpiryPolicyRequestToJSON,
+} from "../models/PatchedPasswordExpiryPolicyRequest";
+import {
+    type PatchedPasswordPolicyRequest,
     PatchedPasswordPolicyRequestToJSON,
+} from "../models/PatchedPasswordPolicyRequest";
+import {
+    type PatchedPolicyBindingRequest,
     PatchedPolicyBindingRequestToJSON,
+} from "../models/PatchedPolicyBindingRequest";
+import {
+    type PatchedReputationPolicyRequest,
     PatchedReputationPolicyRequestToJSON,
+} from "../models/PatchedReputationPolicyRequest";
+import {
+    type PatchedUniquePasswordPolicyRequest,
     PatchedUniquePasswordPolicyRequestToJSON,
-    PolicyBindingFromJSON,
+} from "../models/PatchedUniquePasswordPolicyRequest";
+import { type Policy, PolicyFromJSON } from "../models/Policy";
+import { type PolicyBinding, PolicyBindingFromJSON } from "../models/PolicyBinding";
+import {
+    type PolicyBindingRequest,
     PolicyBindingRequestToJSON,
-    PolicyFromJSON,
-    PolicyTestRequestToJSON,
-    PolicyTestResultFromJSON,
-    ReputationFromJSON,
-    ReputationPolicyFromJSON,
+} from "../models/PolicyBindingRequest";
+import { type PolicyTestRequest, PolicyTestRequestToJSON } from "../models/PolicyTestRequest";
+import { type PolicyTestResult, PolicyTestResultFromJSON } from "../models/PolicyTestResult";
+import { type Reputation, ReputationFromJSON } from "../models/Reputation";
+import { type ReputationPolicy, ReputationPolicyFromJSON } from "../models/ReputationPolicy";
+import {
+    type ReputationPolicyRequest,
     ReputationPolicyRequestToJSON,
-    TypeCreateFromJSON,
+} from "../models/ReputationPolicyRequest";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import {
+    type UniquePasswordPolicy,
     UniquePasswordPolicyFromJSON,
+} from "../models/UniquePasswordPolicy";
+import {
+    type UniquePasswordPolicyRequest,
     UniquePasswordPolicyRequestToJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/UniquePasswordPolicyRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface PoliciesAllDestroyRequest {
@@ -658,7 +695,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/all/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -800,7 +837,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/all/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -873,7 +910,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/all/{policy_uuid}/test/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -991,7 +1028,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/all/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -1120,7 +1157,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -1284,7 +1321,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -1357,7 +1394,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -1432,7 +1469,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/bindings/{policy_binding_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -1499,7 +1536,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/bindings/{policy_binding_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_binding_uuid"}}`,
+            "{policy_binding_uuid}",
             encodeURIComponent(String(requestParameters["policyBindingUuid"])),
         );
 
@@ -1626,7 +1663,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/dummy/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -1796,7 +1833,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/dummy/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -1861,7 +1898,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/dummy/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -1934,7 +1971,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/dummy/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -1999,7 +2036,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/dummy/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2128,7 +2165,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/event_matcher/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2306,7 +2343,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/event_matcher/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2379,7 +2416,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/event_matcher/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2458,7 +2495,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/event_matcher/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2525,7 +2562,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/event_matcher/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2658,7 +2695,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/expression/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2820,7 +2857,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/expression/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2893,7 +2930,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/expression/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -2968,7 +3005,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/expression/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3035,7 +3072,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/expression/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3166,7 +3203,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/geoip/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3357,7 +3394,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/geoip/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3422,7 +3459,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/geoip/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3495,7 +3532,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/geoip/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3560,7 +3597,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/geoip/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3689,7 +3726,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3823,7 +3860,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password_expiry/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -3990,7 +4027,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password_expiry/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4063,7 +4100,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password_expiry/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4142,7 +4179,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password_expiry/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4215,7 +4252,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password_expiry/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4430,7 +4467,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4503,7 +4540,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4578,7 +4615,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4645,7 +4682,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/password/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4774,7 +4811,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -4944,7 +4981,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5017,7 +5054,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5083,7 +5120,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/scores/{reputation_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"reputation_uuid"}}`,
+            "{reputation_uuid}",
             encodeURIComponent(String(requestParameters["reputationUuid"])),
         );
 
@@ -5240,7 +5277,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/scores/{reputation_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"reputation_uuid"}}`,
+            "{reputation_uuid}",
             encodeURIComponent(String(requestParameters["reputationUuid"])),
         );
 
@@ -5308,7 +5345,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/scores/{reputation_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"reputation_uuid"}}`,
+            "{reputation_uuid}",
             encodeURIComponent(String(requestParameters["reputationUuid"])),
         );
 
@@ -5385,7 +5422,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5452,7 +5489,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/reputation/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5591,7 +5628,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/unique_password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5759,7 +5796,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/unique_password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5832,7 +5869,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/unique_password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5911,7 +5948,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/unique_password/{policy_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
@@ -5984,7 +6021,7 @@ export class PoliciesApi extends runtime.BaseAPI {
 
         let urlPath = `/policies/unique_password/{policy_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"policy_uuid"}}`,
+            "{policy_uuid}",
             encodeURIComponent(String(requestParameters["policyUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/PropertymappingsApi.ts b/packages/client-ts/src/apis/PropertymappingsApi.ts
index 664898eb14..48044dfe8d 100644
--- a/packages/client-ts/src/apis/PropertymappingsApi.ts
+++ b/packages/client-ts/src/apis/PropertymappingsApi.ts
@@ -12,142 +12,246 @@
  * Do not edit the class manually.
  */
 
-import type {
-    GoogleWorkspaceProviderMapping,
-    GoogleWorkspaceProviderMappingRequest,
-    KerberosSourcePropertyMapping,
-    KerberosSourcePropertyMappingRequest,
-    LDAPSourcePropertyMapping,
-    LDAPSourcePropertyMappingRequest,
-    MicrosoftEntraProviderMapping,
-    MicrosoftEntraProviderMappingRequest,
-    NotificationWebhookMapping,
-    NotificationWebhookMappingRequest,
-    OAuthSourcePropertyMapping,
-    OAuthSourcePropertyMappingRequest,
-    PaginatedGoogleWorkspaceProviderMappingList,
-    PaginatedKerberosSourcePropertyMappingList,
-    PaginatedLDAPSourcePropertyMappingList,
-    PaginatedMicrosoftEntraProviderMappingList,
-    PaginatedNotificationWebhookMappingList,
-    PaginatedOAuthSourcePropertyMappingList,
-    PaginatedPlexSourcePropertyMappingList,
-    PaginatedPropertyMappingList,
-    PaginatedRACPropertyMappingList,
-    PaginatedRadiusProviderPropertyMappingList,
-    PaginatedSAMLPropertyMappingList,
-    PaginatedSAMLSourcePropertyMappingList,
-    PaginatedSCIMMappingList,
-    PaginatedSCIMSourcePropertyMappingList,
-    PaginatedScopeMappingList,
-    PaginatedTelegramSourcePropertyMappingList,
-    PatchedGoogleWorkspaceProviderMappingRequest,
-    PatchedKerberosSourcePropertyMappingRequest,
-    PatchedLDAPSourcePropertyMappingRequest,
-    PatchedMicrosoftEntraProviderMappingRequest,
-    PatchedNotificationWebhookMappingRequest,
-    PatchedOAuthSourcePropertyMappingRequest,
-    PatchedPlexSourcePropertyMappingRequest,
-    PatchedRACPropertyMappingRequest,
-    PatchedRadiusProviderPropertyMappingRequest,
-    PatchedSAMLPropertyMappingRequest,
-    PatchedSAMLSourcePropertyMappingRequest,
-    PatchedSCIMMappingRequest,
-    PatchedSCIMSourcePropertyMappingRequest,
-    PatchedScopeMappingRequest,
-    PatchedTelegramSourcePropertyMappingRequest,
-    PlexSourcePropertyMapping,
-    PlexSourcePropertyMappingRequest,
-    PropertyMapping,
-    PropertyMappingTestRequest,
-    PropertyMappingTestResult,
-    RACPropertyMapping,
-    RACPropertyMappingRequest,
-    RadiusProviderPropertyMapping,
-    RadiusProviderPropertyMappingRequest,
-    SAMLPropertyMapping,
-    SAMLPropertyMappingRequest,
-    SAMLSourcePropertyMapping,
-    SAMLSourcePropertyMappingRequest,
-    SCIMMapping,
-    SCIMMappingRequest,
-    SCIMSourcePropertyMapping,
-    SCIMSourcePropertyMappingRequest,
-    ScopeMapping,
-    ScopeMappingRequest,
-    TelegramSourcePropertyMapping,
-    TelegramSourcePropertyMappingRequest,
-    TypeCreate,
-    UsedBy,
-} from "../models/index";
 import {
+    type GoogleWorkspaceProviderMapping,
     GoogleWorkspaceProviderMappingFromJSON,
+} from "../models/GoogleWorkspaceProviderMapping";
+import {
+    type GoogleWorkspaceProviderMappingRequest,
     GoogleWorkspaceProviderMappingRequestToJSON,
+} from "../models/GoogleWorkspaceProviderMappingRequest";
+import {
+    type KerberosSourcePropertyMapping,
     KerberosSourcePropertyMappingFromJSON,
+} from "../models/KerberosSourcePropertyMapping";
+import {
+    type KerberosSourcePropertyMappingRequest,
     KerberosSourcePropertyMappingRequestToJSON,
+} from "../models/KerberosSourcePropertyMappingRequest";
+import {
+    type LDAPSourcePropertyMapping,
     LDAPSourcePropertyMappingFromJSON,
+} from "../models/LDAPSourcePropertyMapping";
+import {
+    type LDAPSourcePropertyMappingRequest,
     LDAPSourcePropertyMappingRequestToJSON,
+} from "../models/LDAPSourcePropertyMappingRequest";
+import {
+    type MicrosoftEntraProviderMapping,
     MicrosoftEntraProviderMappingFromJSON,
+} from "../models/MicrosoftEntraProviderMapping";
+import {
+    type MicrosoftEntraProviderMappingRequest,
     MicrosoftEntraProviderMappingRequestToJSON,
+} from "../models/MicrosoftEntraProviderMappingRequest";
+import {
+    type NotificationWebhookMapping,
     NotificationWebhookMappingFromJSON,
+} from "../models/NotificationWebhookMapping";
+import {
+    type NotificationWebhookMappingRequest,
     NotificationWebhookMappingRequestToJSON,
+} from "../models/NotificationWebhookMappingRequest";
+import {
+    type OAuthSourcePropertyMapping,
     OAuthSourcePropertyMappingFromJSON,
+} from "../models/OAuthSourcePropertyMapping";
+import {
+    type OAuthSourcePropertyMappingRequest,
     OAuthSourcePropertyMappingRequestToJSON,
+} from "../models/OAuthSourcePropertyMappingRequest";
+import {
+    type PaginatedGoogleWorkspaceProviderMappingList,
     PaginatedGoogleWorkspaceProviderMappingListFromJSON,
+} from "../models/PaginatedGoogleWorkspaceProviderMappingList";
+import {
+    type PaginatedKerberosSourcePropertyMappingList,
     PaginatedKerberosSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedKerberosSourcePropertyMappingList";
+import {
+    type PaginatedLDAPSourcePropertyMappingList,
     PaginatedLDAPSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedLDAPSourcePropertyMappingList";
+import {
+    type PaginatedMicrosoftEntraProviderMappingList,
     PaginatedMicrosoftEntraProviderMappingListFromJSON,
+} from "../models/PaginatedMicrosoftEntraProviderMappingList";
+import {
+    type PaginatedNotificationWebhookMappingList,
     PaginatedNotificationWebhookMappingListFromJSON,
+} from "../models/PaginatedNotificationWebhookMappingList";
+import {
+    type PaginatedOAuthSourcePropertyMappingList,
     PaginatedOAuthSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedOAuthSourcePropertyMappingList";
+import {
+    type PaginatedPlexSourcePropertyMappingList,
     PaginatedPlexSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedPlexSourcePropertyMappingList";
+import {
+    type PaginatedPropertyMappingList,
     PaginatedPropertyMappingListFromJSON,
+} from "../models/PaginatedPropertyMappingList";
+import {
+    type PaginatedRACPropertyMappingList,
     PaginatedRACPropertyMappingListFromJSON,
+} from "../models/PaginatedRACPropertyMappingList";
+import {
+    type PaginatedRadiusProviderPropertyMappingList,
     PaginatedRadiusProviderPropertyMappingListFromJSON,
+} from "../models/PaginatedRadiusProviderPropertyMappingList";
+import {
+    type PaginatedSAMLPropertyMappingList,
     PaginatedSAMLPropertyMappingListFromJSON,
+} from "../models/PaginatedSAMLPropertyMappingList";
+import {
+    type PaginatedSAMLSourcePropertyMappingList,
     PaginatedSAMLSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedSAMLSourcePropertyMappingList";
+import {
+    type PaginatedSCIMMappingList,
     PaginatedSCIMMappingListFromJSON,
+} from "../models/PaginatedSCIMMappingList";
+import {
+    type PaginatedSCIMSourcePropertyMappingList,
     PaginatedSCIMSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedSCIMSourcePropertyMappingList";
+import {
+    type PaginatedScopeMappingList,
     PaginatedScopeMappingListFromJSON,
+} from "../models/PaginatedScopeMappingList";
+import {
+    type PaginatedTelegramSourcePropertyMappingList,
     PaginatedTelegramSourcePropertyMappingListFromJSON,
+} from "../models/PaginatedTelegramSourcePropertyMappingList";
+import {
+    type PatchedGoogleWorkspaceProviderMappingRequest,
     PatchedGoogleWorkspaceProviderMappingRequestToJSON,
+} from "../models/PatchedGoogleWorkspaceProviderMappingRequest";
+import {
+    type PatchedKerberosSourcePropertyMappingRequest,
     PatchedKerberosSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedKerberosSourcePropertyMappingRequest";
+import {
+    type PatchedLDAPSourcePropertyMappingRequest,
     PatchedLDAPSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedLDAPSourcePropertyMappingRequest";
+import {
+    type PatchedMicrosoftEntraProviderMappingRequest,
     PatchedMicrosoftEntraProviderMappingRequestToJSON,
+} from "../models/PatchedMicrosoftEntraProviderMappingRequest";
+import {
+    type PatchedNotificationWebhookMappingRequest,
     PatchedNotificationWebhookMappingRequestToJSON,
+} from "../models/PatchedNotificationWebhookMappingRequest";
+import {
+    type PatchedOAuthSourcePropertyMappingRequest,
     PatchedOAuthSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedOAuthSourcePropertyMappingRequest";
+import {
+    type PatchedPlexSourcePropertyMappingRequest,
     PatchedPlexSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedPlexSourcePropertyMappingRequest";
+import {
+    type PatchedRACPropertyMappingRequest,
     PatchedRACPropertyMappingRequestToJSON,
+} from "../models/PatchedRACPropertyMappingRequest";
+import {
+    type PatchedRadiusProviderPropertyMappingRequest,
     PatchedRadiusProviderPropertyMappingRequestToJSON,
+} from "../models/PatchedRadiusProviderPropertyMappingRequest";
+import {
+    type PatchedSAMLPropertyMappingRequest,
     PatchedSAMLPropertyMappingRequestToJSON,
+} from "../models/PatchedSAMLPropertyMappingRequest";
+import {
+    type PatchedSAMLSourcePropertyMappingRequest,
     PatchedSAMLSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedSAMLSourcePropertyMappingRequest";
+import {
+    type PatchedSCIMMappingRequest,
     PatchedSCIMMappingRequestToJSON,
+} from "../models/PatchedSCIMMappingRequest";
+import {
+    type PatchedSCIMSourcePropertyMappingRequest,
     PatchedSCIMSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedSCIMSourcePropertyMappingRequest";
+import {
+    type PatchedScopeMappingRequest,
     PatchedScopeMappingRequestToJSON,
+} from "../models/PatchedScopeMappingRequest";
+import {
+    type PatchedTelegramSourcePropertyMappingRequest,
     PatchedTelegramSourcePropertyMappingRequestToJSON,
+} from "../models/PatchedTelegramSourcePropertyMappingRequest";
+import {
+    type PlexSourcePropertyMapping,
     PlexSourcePropertyMappingFromJSON,
+} from "../models/PlexSourcePropertyMapping";
+import {
+    type PlexSourcePropertyMappingRequest,
     PlexSourcePropertyMappingRequestToJSON,
-    PropertyMappingFromJSON,
+} from "../models/PlexSourcePropertyMappingRequest";
+import { type PropertyMapping, PropertyMappingFromJSON } from "../models/PropertyMapping";
+import {
+    type PropertyMappingTestRequest,
     PropertyMappingTestRequestToJSON,
+} from "../models/PropertyMappingTestRequest";
+import {
+    type PropertyMappingTestResult,
     PropertyMappingTestResultFromJSON,
-    RACPropertyMappingFromJSON,
+} from "../models/PropertyMappingTestResult";
+import { type RACPropertyMapping, RACPropertyMappingFromJSON } from "../models/RACPropertyMapping";
+import {
+    type RACPropertyMappingRequest,
     RACPropertyMappingRequestToJSON,
+} from "../models/RACPropertyMappingRequest";
+import {
+    type RadiusProviderPropertyMapping,
     RadiusProviderPropertyMappingFromJSON,
+} from "../models/RadiusProviderPropertyMapping";
+import {
+    type RadiusProviderPropertyMappingRequest,
     RadiusProviderPropertyMappingRequestToJSON,
+} from "../models/RadiusProviderPropertyMappingRequest";
+import {
+    type SAMLPropertyMapping,
     SAMLPropertyMappingFromJSON,
+} from "../models/SAMLPropertyMapping";
+import {
+    type SAMLPropertyMappingRequest,
     SAMLPropertyMappingRequestToJSON,
+} from "../models/SAMLPropertyMappingRequest";
+import {
+    type SAMLSourcePropertyMapping,
     SAMLSourcePropertyMappingFromJSON,
+} from "../models/SAMLSourcePropertyMapping";
+import {
+    type SAMLSourcePropertyMappingRequest,
     SAMLSourcePropertyMappingRequestToJSON,
-    SCIMMappingFromJSON,
-    SCIMMappingRequestToJSON,
+} from "../models/SAMLSourcePropertyMappingRequest";
+import { type SCIMMapping, SCIMMappingFromJSON } from "../models/SCIMMapping";
+import { type SCIMMappingRequest, SCIMMappingRequestToJSON } from "../models/SCIMMappingRequest";
+import {
+    type SCIMSourcePropertyMapping,
     SCIMSourcePropertyMappingFromJSON,
+} from "../models/SCIMSourcePropertyMapping";
+import {
+    type SCIMSourcePropertyMappingRequest,
     SCIMSourcePropertyMappingRequestToJSON,
-    ScopeMappingFromJSON,
-    ScopeMappingRequestToJSON,
+} from "../models/SCIMSourcePropertyMappingRequest";
+import { type ScopeMapping, ScopeMappingFromJSON } from "../models/ScopeMapping";
+import { type ScopeMappingRequest, ScopeMappingRequestToJSON } from "../models/ScopeMappingRequest";
+import {
+    type TelegramSourcePropertyMapping,
     TelegramSourcePropertyMappingFromJSON,
+} from "../models/TelegramSourcePropertyMapping";
+import {
+    type TelegramSourcePropertyMappingRequest,
     TelegramSourcePropertyMappingRequestToJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/TelegramSourcePropertyMappingRequest";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface PropertymappingsAllDestroyRequest {
@@ -752,7 +856,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/all/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -898,7 +1002,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/all/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -973,7 +1077,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/all/{pm_uuid}/test/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1095,7 +1199,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/all/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1234,7 +1338,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/notification/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1379,7 +1483,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/notification/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1452,7 +1556,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/notification/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1531,7 +1635,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/notification/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1604,7 +1708,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/notification/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1743,7 +1847,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/google_workspace/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1903,7 +2007,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/google_workspace/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -1978,7 +2082,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/google_workspace/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2059,7 +2163,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/google_workspace/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2132,7 +2236,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/google_workspace/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2273,7 +2377,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/microsoft_entra/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2433,7 +2537,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/microsoft_entra/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2508,7 +2612,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/microsoft_entra/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2587,7 +2691,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/microsoft_entra/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2660,7 +2764,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/microsoft_entra/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2799,7 +2903,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/rac/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -2948,7 +3052,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/rac/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3021,7 +3125,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/rac/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3100,7 +3204,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/rac/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3171,7 +3275,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/rac/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3310,7 +3414,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/radius/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3463,7 +3567,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/radius/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3536,7 +3640,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/radius/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3615,7 +3719,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/radius/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3688,7 +3792,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/radius/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3825,7 +3929,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -3986,7 +4090,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4059,7 +4163,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4138,7 +4242,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4209,7 +4313,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/saml/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4344,7 +4448,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4497,7 +4601,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4566,7 +4670,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4643,7 +4747,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4712,7 +4816,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scim/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -4849,7 +4953,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scope/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5006,7 +5110,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scope/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5077,7 +5181,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scope/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5156,7 +5260,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scope/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5227,7 +5331,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/provider/scope/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5366,7 +5470,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/kerberos/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5519,7 +5623,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/kerberos/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5592,7 +5696,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/kerberos/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5671,7 +5775,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/kerberos/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5744,7 +5848,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/kerberos/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -5883,7 +5987,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/ldap/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6036,7 +6140,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/ldap/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6109,7 +6213,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/ldap/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6188,7 +6292,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/ldap/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6261,7 +6365,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/ldap/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6400,7 +6504,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/oauth/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6553,7 +6657,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/oauth/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6626,7 +6730,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/oauth/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6705,7 +6809,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/oauth/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6778,7 +6882,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/oauth/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -6917,7 +7021,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/plex/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7070,7 +7174,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/plex/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7143,7 +7247,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/plex/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7222,7 +7326,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/plex/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7295,7 +7399,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/plex/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7434,7 +7538,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7587,7 +7691,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7660,7 +7764,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7739,7 +7843,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/saml/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7812,7 +7916,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/saml/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -7951,7 +8055,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8104,7 +8208,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8177,7 +8281,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8256,7 +8360,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/scim/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8329,7 +8433,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/scim/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8468,7 +8572,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/telegram/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8621,7 +8725,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/telegram/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8694,7 +8798,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/telegram/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8773,7 +8877,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/telegram/{pm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
@@ -8846,7 +8950,7 @@ export class PropertymappingsApi extends runtime.BaseAPI {
 
         let urlPath = `/propertymappings/source/telegram/{pm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pm_uuid"}}`,
+            "{pm_uuid}",
             encodeURIComponent(String(requestParameters["pmUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/ProvidersApi.ts b/packages/client-ts/src/apis/ProvidersApi.ts
index 480861dcb1..3bd186db2e 100644
--- a/packages/client-ts/src/apis/ProvidersApi.ts
+++ b/packages/client-ts/src/apis/ProvidersApi.ts
@@ -12,163 +12,237 @@
  * Do not edit the class manually.
  */
 
-import type {
-    ClientTypeEnum,
-    DigestAlgorithmEnum,
-    ForceBindingEnum,
-    GoogleWorkspaceProvider,
-    GoogleWorkspaceProviderGroup,
-    GoogleWorkspaceProviderGroupRequest,
-    GoogleWorkspaceProviderRequest,
-    GoogleWorkspaceProviderUser,
-    GoogleWorkspaceProviderUserRequest,
-    IssuerModeEnum,
-    LDAPProvider,
-    LDAPProviderRequest,
-    MicrosoftEntraProvider,
-    MicrosoftEntraProviderGroup,
-    MicrosoftEntraProviderGroupRequest,
-    MicrosoftEntraProviderRequest,
-    MicrosoftEntraProviderUser,
-    MicrosoftEntraProviderUserRequest,
-    OAuth2Provider,
-    OAuth2ProviderRequest,
-    OAuth2ProviderSetupURLs,
-    PaginatedGoogleWorkspaceProviderGroupList,
-    PaginatedGoogleWorkspaceProviderList,
-    PaginatedGoogleWorkspaceProviderUserList,
-    PaginatedLDAPProviderList,
-    PaginatedMicrosoftEntraProviderGroupList,
-    PaginatedMicrosoftEntraProviderList,
-    PaginatedMicrosoftEntraProviderUserList,
-    PaginatedOAuth2ProviderList,
-    PaginatedProviderList,
-    PaginatedProxyProviderList,
-    PaginatedRACProviderList,
-    PaginatedRadiusProviderList,
-    PaginatedSAMLProviderList,
-    PaginatedSCIMProviderGroupList,
-    PaginatedSCIMProviderList,
-    PaginatedSCIMProviderUserList,
-    PaginatedSSFProviderList,
-    PaginatedWSFederationProviderList,
-    PatchedGoogleWorkspaceProviderRequest,
-    PatchedLDAPProviderRequest,
-    PatchedMicrosoftEntraProviderRequest,
-    PatchedOAuth2ProviderRequest,
-    PatchedProxyProviderRequest,
-    PatchedRACProviderRequest,
-    PatchedRadiusProviderRequest,
-    PatchedSAMLProviderRequest,
-    PatchedSCIMProviderRequest,
-    PatchedSSFProviderRequest,
-    PatchedWSFederationProviderRequest,
-    PropertyMappingPreview,
-    Provider,
-    ProxyProvider,
-    ProxyProviderRequest,
-    RACProvider,
-    RACProviderRequest,
-    RadiusProvider,
-    RadiusProviderRequest,
-    SAMLBindingsEnum,
-    SAMLLogoutMethods,
-    SAMLMetadata,
-    SAMLNameIDPolicyEnum,
-    SAMLProvider,
-    SAMLProviderRequest,
-    SCIMProvider,
-    SCIMProviderGroup,
-    SCIMProviderGroupRequest,
-    SCIMProviderRequest,
-    SCIMProviderUser,
-    SCIMProviderUserRequest,
-    SignatureAlgorithmEnum,
-    SSFProvider,
-    SSFProviderRequest,
-    SubModeEnum,
-    SyncObjectRequest,
-    SyncObjectResult,
-    SyncStatus,
-    TypeCreate,
-    UsedBy,
-    WSFederationProvider,
-    WSFederationProviderRequest,
-} from "../models/index";
+import { type ClientTypeEnum } from "../models/ClientTypeEnum";
+import { type DigestAlgorithmEnum } from "../models/DigestAlgorithmEnum";
+import { type ForceBindingEnum } from "../models/ForceBindingEnum";
 import {
+    type GoogleWorkspaceProvider,
     GoogleWorkspaceProviderFromJSON,
+} from "../models/GoogleWorkspaceProvider";
+import {
+    type GoogleWorkspaceProviderGroup,
     GoogleWorkspaceProviderGroupFromJSON,
+} from "../models/GoogleWorkspaceProviderGroup";
+import {
+    type GoogleWorkspaceProviderGroupRequest,
     GoogleWorkspaceProviderGroupRequestToJSON,
+} from "../models/GoogleWorkspaceProviderGroupRequest";
+import {
+    type GoogleWorkspaceProviderRequest,
     GoogleWorkspaceProviderRequestToJSON,
+} from "../models/GoogleWorkspaceProviderRequest";
+import {
+    type GoogleWorkspaceProviderUser,
     GoogleWorkspaceProviderUserFromJSON,
+} from "../models/GoogleWorkspaceProviderUser";
+import {
+    type GoogleWorkspaceProviderUserRequest,
     GoogleWorkspaceProviderUserRequestToJSON,
-    LDAPProviderFromJSON,
-    LDAPProviderRequestToJSON,
+} from "../models/GoogleWorkspaceProviderUserRequest";
+import { type IssuerModeEnum } from "../models/IssuerModeEnum";
+import { type LDAPProvider, LDAPProviderFromJSON } from "../models/LDAPProvider";
+import { type LDAPProviderRequest, LDAPProviderRequestToJSON } from "../models/LDAPProviderRequest";
+import {
+    type MicrosoftEntraProvider,
     MicrosoftEntraProviderFromJSON,
+} from "../models/MicrosoftEntraProvider";
+import {
+    type MicrosoftEntraProviderGroup,
     MicrosoftEntraProviderGroupFromJSON,
+} from "../models/MicrosoftEntraProviderGroup";
+import {
+    type MicrosoftEntraProviderGroupRequest,
     MicrosoftEntraProviderGroupRequestToJSON,
+} from "../models/MicrosoftEntraProviderGroupRequest";
+import {
+    type MicrosoftEntraProviderRequest,
     MicrosoftEntraProviderRequestToJSON,
+} from "../models/MicrosoftEntraProviderRequest";
+import {
+    type MicrosoftEntraProviderUser,
     MicrosoftEntraProviderUserFromJSON,
+} from "../models/MicrosoftEntraProviderUser";
+import {
+    type MicrosoftEntraProviderUserRequest,
     MicrosoftEntraProviderUserRequestToJSON,
-    OAuth2ProviderFromJSON,
+} from "../models/MicrosoftEntraProviderUserRequest";
+import { type OAuth2Provider, OAuth2ProviderFromJSON } from "../models/OAuth2Provider";
+import {
+    type OAuth2ProviderRequest,
     OAuth2ProviderRequestToJSON,
+} from "../models/OAuth2ProviderRequest";
+import {
+    type OAuth2ProviderSetupURLs,
     OAuth2ProviderSetupURLsFromJSON,
+} from "../models/OAuth2ProviderSetupURLs";
+import {
+    type PaginatedGoogleWorkspaceProviderGroupList,
     PaginatedGoogleWorkspaceProviderGroupListFromJSON,
+} from "../models/PaginatedGoogleWorkspaceProviderGroupList";
+import {
+    type PaginatedGoogleWorkspaceProviderList,
     PaginatedGoogleWorkspaceProviderListFromJSON,
+} from "../models/PaginatedGoogleWorkspaceProviderList";
+import {
+    type PaginatedGoogleWorkspaceProviderUserList,
     PaginatedGoogleWorkspaceProviderUserListFromJSON,
+} from "../models/PaginatedGoogleWorkspaceProviderUserList";
+import {
+    type PaginatedLDAPProviderList,
     PaginatedLDAPProviderListFromJSON,
+} from "../models/PaginatedLDAPProviderList";
+import {
+    type PaginatedMicrosoftEntraProviderGroupList,
     PaginatedMicrosoftEntraProviderGroupListFromJSON,
+} from "../models/PaginatedMicrosoftEntraProviderGroupList";
+import {
+    type PaginatedMicrosoftEntraProviderList,
     PaginatedMicrosoftEntraProviderListFromJSON,
+} from "../models/PaginatedMicrosoftEntraProviderList";
+import {
+    type PaginatedMicrosoftEntraProviderUserList,
     PaginatedMicrosoftEntraProviderUserListFromJSON,
+} from "../models/PaginatedMicrosoftEntraProviderUserList";
+import {
+    type PaginatedOAuth2ProviderList,
     PaginatedOAuth2ProviderListFromJSON,
+} from "../models/PaginatedOAuth2ProviderList";
+import {
+    type PaginatedProviderList,
     PaginatedProviderListFromJSON,
+} from "../models/PaginatedProviderList";
+import {
+    type PaginatedProxyProviderList,
     PaginatedProxyProviderListFromJSON,
+} from "../models/PaginatedProxyProviderList";
+import {
+    type PaginatedRACProviderList,
     PaginatedRACProviderListFromJSON,
+} from "../models/PaginatedRACProviderList";
+import {
+    type PaginatedRadiusProviderList,
     PaginatedRadiusProviderListFromJSON,
+} from "../models/PaginatedRadiusProviderList";
+import {
+    type PaginatedSAMLProviderList,
     PaginatedSAMLProviderListFromJSON,
+} from "../models/PaginatedSAMLProviderList";
+import {
+    type PaginatedSCIMProviderGroupList,
     PaginatedSCIMProviderGroupListFromJSON,
+} from "../models/PaginatedSCIMProviderGroupList";
+import {
+    type PaginatedSCIMProviderList,
     PaginatedSCIMProviderListFromJSON,
+} from "../models/PaginatedSCIMProviderList";
+import {
+    type PaginatedSCIMProviderUserList,
     PaginatedSCIMProviderUserListFromJSON,
+} from "../models/PaginatedSCIMProviderUserList";
+import {
+    type PaginatedSSFProviderList,
     PaginatedSSFProviderListFromJSON,
+} from "../models/PaginatedSSFProviderList";
+import {
+    type PaginatedWSFederationProviderList,
     PaginatedWSFederationProviderListFromJSON,
+} from "../models/PaginatedWSFederationProviderList";
+import {
+    type PatchedGoogleWorkspaceProviderRequest,
     PatchedGoogleWorkspaceProviderRequestToJSON,
+} from "../models/PatchedGoogleWorkspaceProviderRequest";
+import {
+    type PatchedLDAPProviderRequest,
     PatchedLDAPProviderRequestToJSON,
+} from "../models/PatchedLDAPProviderRequest";
+import {
+    type PatchedMicrosoftEntraProviderRequest,
     PatchedMicrosoftEntraProviderRequestToJSON,
+} from "../models/PatchedMicrosoftEntraProviderRequest";
+import {
+    type PatchedOAuth2ProviderRequest,
     PatchedOAuth2ProviderRequestToJSON,
+} from "../models/PatchedOAuth2ProviderRequest";
+import {
+    type PatchedProxyProviderRequest,
     PatchedProxyProviderRequestToJSON,
+} from "../models/PatchedProxyProviderRequest";
+import {
+    type PatchedRACProviderRequest,
     PatchedRACProviderRequestToJSON,
+} from "../models/PatchedRACProviderRequest";
+import {
+    type PatchedRadiusProviderRequest,
     PatchedRadiusProviderRequestToJSON,
+} from "../models/PatchedRadiusProviderRequest";
+import {
+    type PatchedSAMLProviderRequest,
     PatchedSAMLProviderRequestToJSON,
+} from "../models/PatchedSAMLProviderRequest";
+import {
+    type PatchedSCIMProviderRequest,
     PatchedSCIMProviderRequestToJSON,
+} from "../models/PatchedSCIMProviderRequest";
+import {
+    type PatchedSSFProviderRequest,
     PatchedSSFProviderRequestToJSON,
+} from "../models/PatchedSSFProviderRequest";
+import {
+    type PatchedWSFederationProviderRequest,
     PatchedWSFederationProviderRequestToJSON,
+} from "../models/PatchedWSFederationProviderRequest";
+import {
+    type PropertyMappingPreview,
     PropertyMappingPreviewFromJSON,
-    ProviderFromJSON,
-    ProxyProviderFromJSON,
+} from "../models/PropertyMappingPreview";
+import { type Provider, ProviderFromJSON } from "../models/Provider";
+import { type ProxyProvider, ProxyProviderFromJSON } from "../models/ProxyProvider";
+import {
+    type ProxyProviderRequest,
     ProxyProviderRequestToJSON,
-    RACProviderFromJSON,
-    RACProviderRequestToJSON,
-    RadiusProviderFromJSON,
+} from "../models/ProxyProviderRequest";
+import { type RACProvider, RACProviderFromJSON } from "../models/RACProvider";
+import { type RACProviderRequest, RACProviderRequestToJSON } from "../models/RACProviderRequest";
+import { type RadiusProvider, RadiusProviderFromJSON } from "../models/RadiusProvider";
+import {
+    type RadiusProviderRequest,
     RadiusProviderRequestToJSON,
-    SAMLMetadataFromJSON,
-    SAMLProviderFromJSON,
-    SAMLProviderRequestToJSON,
-    SCIMProviderFromJSON,
-    SCIMProviderGroupFromJSON,
+} from "../models/RadiusProviderRequest";
+import { type SAMLBindingsEnum } from "../models/SAMLBindingsEnum";
+import { type SAMLLogoutMethods } from "../models/SAMLLogoutMethods";
+import { type SAMLMetadata, SAMLMetadataFromJSON } from "../models/SAMLMetadata";
+import { type SAMLNameIDPolicyEnum } from "../models/SAMLNameIDPolicyEnum";
+import { type SAMLProvider, SAMLProviderFromJSON } from "../models/SAMLProvider";
+import { type SAMLProviderRequest, SAMLProviderRequestToJSON } from "../models/SAMLProviderRequest";
+import { type SCIMProvider, SCIMProviderFromJSON } from "../models/SCIMProvider";
+import { type SCIMProviderGroup, SCIMProviderGroupFromJSON } from "../models/SCIMProviderGroup";
+import {
+    type SCIMProviderGroupRequest,
     SCIMProviderGroupRequestToJSON,
-    SCIMProviderRequestToJSON,
-    SCIMProviderUserFromJSON,
+} from "../models/SCIMProviderGroupRequest";
+import { type SCIMProviderRequest, SCIMProviderRequestToJSON } from "../models/SCIMProviderRequest";
+import { type SCIMProviderUser, SCIMProviderUserFromJSON } from "../models/SCIMProviderUser";
+import {
+    type SCIMProviderUserRequest,
     SCIMProviderUserRequestToJSON,
-    SSFProviderFromJSON,
-    SSFProviderRequestToJSON,
-    SyncObjectRequestToJSON,
-    SyncObjectResultFromJSON,
-    SyncStatusFromJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
+} from "../models/SCIMProviderUserRequest";
+import { type SignatureAlgorithmEnum } from "../models/SignatureAlgorithmEnum";
+import { type SSFProvider, SSFProviderFromJSON } from "../models/SSFProvider";
+import { type SSFProviderRequest, SSFProviderRequestToJSON } from "../models/SSFProviderRequest";
+import { type SubModeEnum } from "../models/SubModeEnum";
+import { type SyncObjectRequest, SyncObjectRequestToJSON } from "../models/SyncObjectRequest";
+import { type SyncObjectResult, SyncObjectResultFromJSON } from "../models/SyncObjectResult";
+import { type SyncStatus, SyncStatusFromJSON } from "../models/SyncStatus";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import {
+    type WSFederationProvider,
     WSFederationProviderFromJSON,
+} from "../models/WSFederationProvider";
+import {
+    type WSFederationProviderRequest,
     WSFederationProviderRequestToJSON,
-} from "../models/index";
+} from "../models/WSFederationProviderRequest";
 import * as runtime from "../runtime";
 
 export interface ProvidersAllDestroyRequest {
@@ -923,7 +997,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1062,7 +1136,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1174,7 +1248,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/all/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1306,7 +1380,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1438,7 +1512,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1586,7 +1660,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1653,7 +1727,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace_groups/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1812,7 +1886,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1882,7 +1956,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1958,7 +2032,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/sync/object/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2026,7 +2100,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/sync/status/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2100,7 +2174,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2170,7 +2244,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2306,7 +2380,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2454,7 +2528,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2521,7 +2595,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/google_workspace_users/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2651,7 +2725,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2823,7 +2897,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2887,7 +2961,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2959,7 +3033,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3023,7 +3097,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ldap/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3155,7 +3229,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3287,7 +3361,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3435,7 +3509,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3502,7 +3576,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra_groups/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3656,7 +3730,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3726,7 +3800,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3802,7 +3876,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/sync/object/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3870,7 +3944,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/sync/status/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3944,7 +4018,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4014,7 +4088,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4150,7 +4224,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4298,7 +4372,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4365,7 +4439,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/microsoft_entra_users/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4495,7 +4569,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4681,7 +4755,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4755,7 +4829,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/preview_user/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4822,7 +4896,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4885,7 +4959,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/setup_urls/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4961,7 +5035,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5025,7 +5099,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/oauth2/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5151,7 +5225,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/proxy/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5352,7 +5426,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/proxy/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5421,7 +5495,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/proxy/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5493,7 +5567,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/proxy/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5557,7 +5631,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/proxy/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5681,7 +5755,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/rac/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5822,7 +5896,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/rac/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5884,7 +5958,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/rac/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5954,7 +6028,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/rac/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6016,7 +6090,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/rac/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6142,7 +6216,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/radius/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6292,7 +6366,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/radius/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6362,7 +6436,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/radius/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6434,7 +6508,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/radius/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6498,7 +6572,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/radius/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -6624,7 +6698,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7005,7 +7079,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/metadata/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7074,7 +7148,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7142,7 +7216,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/preview_user/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7209,7 +7283,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7281,7 +7355,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7345,7 +7419,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/saml/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7471,7 +7545,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7596,7 +7670,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7739,7 +7813,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7805,7 +7879,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim_groups/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -7960,7 +8034,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8024,7 +8098,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8096,7 +8170,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/sync/object/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8164,7 +8238,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/sync/status/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8238,7 +8312,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8302,7 +8376,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8428,7 +8502,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8571,7 +8645,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8634,7 +8708,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/scim_users/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8762,7 +8836,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ssf/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8903,7 +8977,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ssf/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8965,7 +9039,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ssf/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9035,7 +9109,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ssf/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9097,7 +9171,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/ssf/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9225,7 +9299,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9489,7 +9563,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/metadata/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9558,7 +9632,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9631,7 +9705,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/preview_user/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9698,7 +9772,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9770,7 +9844,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9836,7 +9910,7 @@ export class ProvidersApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/providers/wsfed/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/RacApi.ts b/packages/client-ts/src/apis/RacApi.ts
index 011814dd6f..3955dd9bbb 100644
--- a/packages/client-ts/src/apis/RacApi.ts
+++ b/packages/client-ts/src/apis/RacApi.ts
@@ -12,28 +12,30 @@
  * Do not edit the class manually.
  */
 
-import type {
-    ConnectionToken,
-    ConnectionTokenRequest,
-    Endpoint,
-    EndpointRequest,
-    PaginatedConnectionTokenList,
-    PaginatedEndpointList,
-    PatchedConnectionTokenRequest,
-    PatchedEndpointRequest,
-    UsedBy,
-} from "../models/index";
+import { type ConnectionToken, ConnectionTokenFromJSON } from "../models/ConnectionToken";
 import {
-    ConnectionTokenFromJSON,
+    type ConnectionTokenRequest,
     ConnectionTokenRequestToJSON,
-    EndpointFromJSON,
-    EndpointRequestToJSON,
+} from "../models/ConnectionTokenRequest";
+import { type Endpoint, EndpointFromJSON } from "../models/Endpoint";
+import { type EndpointRequest, EndpointRequestToJSON } from "../models/EndpointRequest";
+import {
+    type PaginatedConnectionTokenList,
     PaginatedConnectionTokenListFromJSON,
+} from "../models/PaginatedConnectionTokenList";
+import {
+    type PaginatedEndpointList,
     PaginatedEndpointListFromJSON,
+} from "../models/PaginatedEndpointList";
+import {
+    type PatchedConnectionTokenRequest,
     PatchedConnectionTokenRequestToJSON,
+} from "../models/PatchedConnectionTokenRequest";
+import {
+    type PatchedEndpointRequest,
     PatchedEndpointRequestToJSON,
-    UsedByFromJSON,
-} from "../models/index";
+} from "../models/PatchedEndpointRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
 import * as runtime from "../runtime";
 
 export interface RacConnectionTokensDestroyRequest {
@@ -136,7 +138,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/connection_tokens/{connection_token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connection_token_uuid"}}`,
+            "{connection_token_uuid}",
             encodeURIComponent(String(requestParameters["connectionTokenUuid"])),
         );
 
@@ -284,7 +286,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/connection_tokens/{connection_token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connection_token_uuid"}}`,
+            "{connection_token_uuid}",
             encodeURIComponent(String(requestParameters["connectionTokenUuid"])),
         );
 
@@ -357,7 +359,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/connection_tokens/{connection_token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connection_token_uuid"}}`,
+            "{connection_token_uuid}",
             encodeURIComponent(String(requestParameters["connectionTokenUuid"])),
         );
 
@@ -435,7 +437,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/connection_tokens/{connection_token_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"connection_token_uuid"}}`,
+            "{connection_token_uuid}",
             encodeURIComponent(String(requestParameters["connectionTokenUuid"])),
         );
 
@@ -502,7 +504,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/connection_tokens/{connection_token_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"connection_token_uuid"}}`,
+            "{connection_token_uuid}",
             encodeURIComponent(String(requestParameters["connectionTokenUuid"])),
         );
 
@@ -633,7 +635,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/endpoints/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -781,7 +783,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/endpoints/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -846,7 +848,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/endpoints/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -919,7 +921,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/endpoints/{pbm_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
@@ -984,7 +986,7 @@ export class RacApi extends runtime.BaseAPI {
 
         let urlPath = `/rac/endpoints/{pbm_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"pbm_uuid"}}`,
+            "{pbm_uuid}",
             encodeURIComponent(String(requestParameters["pbmUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/RbacApi.ts b/packages/client-ts/src/apis/RbacApi.ts
index 03d34d1896..92a15d5619 100644
--- a/packages/client-ts/src/apis/RbacApi.ts
+++ b/packages/client-ts/src/apis/RbacApi.ts
@@ -12,44 +12,53 @@
  * Do not edit the class manually.
  */
 
-import type {
-    InitialPermissions,
-    InitialPermissionsRequest,
-    PaginatedExtraRoleObjectPermissionList,
-    PaginatedInitialPermissionsList,
-    PaginatedPermissionList,
-    PaginatedRoleAssignedObjectPermissionList,
-    PaginatedRoleList,
-    PatchedInitialPermissionsRequest,
-    PatchedPermissionAssignRequest,
-    PatchedRoleRequest,
-    Permission,
-    PermissionAssignRequest,
-    PermissionAssignResult,
-    Role,
-    RoleRequest,
-    UsedBy,
-    UserAccountSerializerForRoleRequest,
-} from "../models/index";
+import { type InitialPermissions, InitialPermissionsFromJSON } from "../models/InitialPermissions";
 import {
-    InitialPermissionsFromJSON,
+    type InitialPermissionsRequest,
     InitialPermissionsRequestToJSON,
+} from "../models/InitialPermissionsRequest";
+import {
+    type PaginatedExtraRoleObjectPermissionList,
     PaginatedExtraRoleObjectPermissionListFromJSON,
+} from "../models/PaginatedExtraRoleObjectPermissionList";
+import {
+    type PaginatedInitialPermissionsList,
     PaginatedInitialPermissionsListFromJSON,
+} from "../models/PaginatedInitialPermissionsList";
+import {
+    type PaginatedPermissionList,
     PaginatedPermissionListFromJSON,
+} from "../models/PaginatedPermissionList";
+import {
+    type PaginatedRoleAssignedObjectPermissionList,
     PaginatedRoleAssignedObjectPermissionListFromJSON,
-    PaginatedRoleListFromJSON,
+} from "../models/PaginatedRoleAssignedObjectPermissionList";
+import { type PaginatedRoleList, PaginatedRoleListFromJSON } from "../models/PaginatedRoleList";
+import {
+    type PatchedInitialPermissionsRequest,
     PatchedInitialPermissionsRequestToJSON,
+} from "../models/PatchedInitialPermissionsRequest";
+import {
+    type PatchedPermissionAssignRequest,
     PatchedPermissionAssignRequestToJSON,
-    PatchedRoleRequestToJSON,
+} from "../models/PatchedPermissionAssignRequest";
+import { type PatchedRoleRequest, PatchedRoleRequestToJSON } from "../models/PatchedRoleRequest";
+import { type Permission, PermissionFromJSON } from "../models/Permission";
+import {
+    type PermissionAssignRequest,
     PermissionAssignRequestToJSON,
+} from "../models/PermissionAssignRequest";
+import {
+    type PermissionAssignResult,
     PermissionAssignResultFromJSON,
-    PermissionFromJSON,
-    RoleFromJSON,
-    RoleRequestToJSON,
-    UsedByFromJSON,
+} from "../models/PermissionAssignResult";
+import { type Role, RoleFromJSON } from "../models/Role";
+import { type RoleRequest, RoleRequestToJSON } from "../models/RoleRequest";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import {
+    type UserAccountSerializerForRoleRequest,
     UserAccountSerializerForRoleRequestToJSON,
-} from "../models/index";
+} from "../models/UserAccountSerializerForRoleRequest";
 import * as runtime from "../runtime";
 
 export interface RbacInitialPermissionsCreateRequest {
@@ -277,7 +286,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/initial_permissions/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -415,7 +424,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/initial_permissions/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -485,7 +494,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/initial_permissions/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -561,7 +570,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/initial_permissions/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -629,7 +638,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/initial_permissions/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -703,10 +712,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/permissions/assigned_by_roles/{uuid}/assign/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -866,10 +872,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/permissions/assigned_by_roles/{uuid}/unassign/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1025,7 +1028,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/permissions/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1170,10 +1173,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/add_user/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1299,10 +1299,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1459,10 +1456,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1533,10 +1527,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/remove_user/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1599,10 +1590,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1672,10 +1660,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -1737,10 +1722,7 @@ export class RbacApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/rbac/roles/{uuid}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/ReportsApi.ts b/packages/client-ts/src/apis/ReportsApi.ts
index 6bbebf572b..5ce75b4dee 100644
--- a/packages/client-ts/src/apis/ReportsApi.ts
+++ b/packages/client-ts/src/apis/ReportsApi.ts
@@ -12,8 +12,11 @@
  * Do not edit the class manually.
  */
 
-import type { DataExport, PaginatedDataExportList } from "../models/index";
-import { DataExportFromJSON, PaginatedDataExportListFromJSON } from "../models/index";
+import { type DataExport, DataExportFromJSON } from "../models/DataExport";
+import {
+    type PaginatedDataExportList,
+    PaginatedDataExportListFromJSON,
+} from "../models/PaginatedDataExportList";
 import * as runtime from "../runtime";
 
 export interface ReportsExportsDestroyRequest {
@@ -62,7 +65,7 @@ export class ReportsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/reports/exports/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -189,7 +192,7 @@ export class ReportsApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/reports/exports/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/RootApi.ts b/packages/client-ts/src/apis/RootApi.ts
index ed8437e5f0..55b497bfa6 100644
--- a/packages/client-ts/src/apis/RootApi.ts
+++ b/packages/client-ts/src/apis/RootApi.ts
@@ -12,8 +12,7 @@
  * Do not edit the class manually.
  */
 
-import type { Config } from "../models/index";
-import { ConfigFromJSON } from "../models/index";
+import { type Config, ConfigFromJSON } from "../models/Config";
 import * as runtime from "../runtime";
 
 /**
diff --git a/packages/client-ts/src/apis/SchemaApi.ts b/packages/client-ts/src/apis/SchemaApi.ts
index a6d668e8e8..3abfa32b39 100644
--- a/packages/client-ts/src/apis/SchemaApi.ts
+++ b/packages/client-ts/src/apis/SchemaApi.ts
@@ -12,7 +12,8 @@
  * Do not edit the class manually.
  */
 
-import type { FormatEnum, LangEnum } from "../models/index";
+import { type FormatEnum } from "../models/FormatEnum";
+import { type LangEnum } from "../models/LangEnum";
 import * as runtime from "../runtime";
 
 export interface SchemaRetrieveRequest {
diff --git a/packages/client-ts/src/apis/SourcesApi.ts b/packages/client-ts/src/apis/SourcesApi.ts
index 79bb3e7ca4..08a0b96357 100644
--- a/packages/client-ts/src/apis/SourcesApi.ts
+++ b/packages/client-ts/src/apis/SourcesApi.ts
@@ -12,226 +12,358 @@
  * Do not edit the class manually.
  */
 
-import type {
-    BindingTypeEnum,
-    DigestAlgorithmEnum,
-    GroupKerberosSourceConnection,
-    GroupKerberosSourceConnectionRequest,
-    GroupLDAPSourceConnection,
-    GroupLDAPSourceConnectionRequest,
-    GroupMatchingModeEnum,
-    GroupOAuthSourceConnection,
-    GroupOAuthSourceConnectionRequest,
-    GroupPlexSourceConnection,
-    GroupPlexSourceConnectionRequest,
-    GroupSAMLSourceConnection,
-    GroupSAMLSourceConnectionRequest,
-    GroupSourceConnection,
-    GroupSourceConnectionRequest,
-    GroupTelegramSourceConnection,
-    GroupTelegramSourceConnectionRequest,
-    KadminTypeEnum,
-    KerberosSource,
-    KerberosSourceRequest,
-    LDAPDebug,
-    LDAPSource,
-    LDAPSourceRequest,
-    OAuthSource,
-    OAuthSourceRequest,
-    PaginatedGroupKerberosSourceConnectionList,
-    PaginatedGroupLDAPSourceConnectionList,
-    PaginatedGroupOAuthSourceConnectionList,
-    PaginatedGroupPlexSourceConnectionList,
-    PaginatedGroupSAMLSourceConnectionList,
-    PaginatedGroupSourceConnectionList,
-    PaginatedGroupTelegramSourceConnectionList,
-    PaginatedKerberosSourceList,
-    PaginatedLDAPSourceList,
-    PaginatedOAuthSourceList,
-    PaginatedPlexSourceList,
-    PaginatedSAMLSourceList,
-    PaginatedSCIMSourceGroupList,
-    PaginatedSCIMSourceList,
-    PaginatedSCIMSourceUserList,
-    PaginatedSourceList,
-    PaginatedTelegramSourceList,
-    PaginatedUserKerberosSourceConnectionList,
-    PaginatedUserLDAPSourceConnectionList,
-    PaginatedUserOAuthSourceConnectionList,
-    PaginatedUserPlexSourceConnectionList,
-    PaginatedUserSAMLSourceConnectionList,
-    PaginatedUserSourceConnectionList,
-    PaginatedUserTelegramSourceConnectionList,
-    PatchedGroupKerberosSourceConnectionRequest,
-    PatchedGroupLDAPSourceConnectionRequest,
-    PatchedGroupOAuthSourceConnectionRequest,
-    PatchedGroupPlexSourceConnectionRequest,
-    PatchedGroupSAMLSourceConnectionRequest,
-    PatchedGroupSourceConnectionRequest,
-    PatchedGroupTelegramSourceConnectionRequest,
-    PatchedKerberosSourceRequest,
-    PatchedLDAPSourceRequest,
-    PatchedOAuthSourceRequest,
-    PatchedPlexSourceRequest,
-    PatchedSAMLSourceRequest,
-    PatchedSCIMSourceGroupRequest,
-    PatchedSCIMSourceRequest,
-    PatchedSCIMSourceUserRequest,
-    PatchedTelegramSourceRequest,
-    PatchedUserKerberosSourceConnectionRequest,
-    PatchedUserLDAPSourceConnectionRequest,
-    PatchedUserOAuthSourceConnectionRequest,
-    PatchedUserPlexSourceConnectionRequest,
-    PatchedUserSAMLSourceConnectionRequest,
-    PatchedUserSourceConnectionRequest,
-    PatchedUserTelegramSourceConnectionRequest,
-    PlexSource,
-    PlexSourceRequest,
-    PlexTokenRedeemRequest,
-    PolicyEngineMode,
-    RedirectChallenge,
-    SAMLMetadata,
-    SAMLNameIDPolicyEnum,
-    SAMLSource,
-    SAMLSourceRequest,
-    SCIMSource,
-    SCIMSourceGroup,
-    SCIMSourceGroupRequest,
-    SCIMSourceRequest,
-    SCIMSourceUser,
-    SCIMSourceUserRequest,
-    SignatureAlgorithmEnum,
-    Source,
-    SourceType,
-    SyncStatus,
-    TelegramAuthRequest,
-    TelegramSource,
-    TelegramSourceRequest,
-    TypeCreate,
-    UsedBy,
-    UserKerberosSourceConnection,
-    UserKerberosSourceConnectionRequest,
-    UserLDAPSourceConnection,
-    UserLDAPSourceConnectionRequest,
-    UserMatchingModeEnum,
-    UserOAuthSourceConnection,
-    UserOAuthSourceConnectionRequest,
-    UserPlexSourceConnection,
-    UserPlexSourceConnectionRequest,
-    UserSAMLSourceConnection,
-    UserSAMLSourceConnectionRequest,
-    UserSetting,
-    UserSourceConnection,
-    UserSourceConnectionRequest,
-    UserTelegramSourceConnection,
-    UserTelegramSourceConnectionRequest,
-} from "../models/index";
+import { type BindingTypeEnum } from "../models/BindingTypeEnum";
+import { type DigestAlgorithmEnum } from "../models/DigestAlgorithmEnum";
 import {
+    type GroupKerberosSourceConnection,
     GroupKerberosSourceConnectionFromJSON,
+} from "../models/GroupKerberosSourceConnection";
+import {
+    type GroupKerberosSourceConnectionRequest,
     GroupKerberosSourceConnectionRequestToJSON,
+} from "../models/GroupKerberosSourceConnectionRequest";
+import {
+    type GroupLDAPSourceConnection,
     GroupLDAPSourceConnectionFromJSON,
+} from "../models/GroupLDAPSourceConnection";
+import {
+    type GroupLDAPSourceConnectionRequest,
     GroupLDAPSourceConnectionRequestToJSON,
+} from "../models/GroupLDAPSourceConnectionRequest";
+import { type GroupMatchingModeEnum } from "../models/GroupMatchingModeEnum";
+import {
+    type GroupOAuthSourceConnection,
     GroupOAuthSourceConnectionFromJSON,
+} from "../models/GroupOAuthSourceConnection";
+import {
+    type GroupOAuthSourceConnectionRequest,
     GroupOAuthSourceConnectionRequestToJSON,
+} from "../models/GroupOAuthSourceConnectionRequest";
+import {
+    type GroupPlexSourceConnection,
     GroupPlexSourceConnectionFromJSON,
+} from "../models/GroupPlexSourceConnection";
+import {
+    type GroupPlexSourceConnectionRequest,
     GroupPlexSourceConnectionRequestToJSON,
+} from "../models/GroupPlexSourceConnectionRequest";
+import {
+    type GroupSAMLSourceConnection,
     GroupSAMLSourceConnectionFromJSON,
+} from "../models/GroupSAMLSourceConnection";
+import {
+    type GroupSAMLSourceConnectionRequest,
     GroupSAMLSourceConnectionRequestToJSON,
+} from "../models/GroupSAMLSourceConnectionRequest";
+import {
+    type GroupSourceConnection,
     GroupSourceConnectionFromJSON,
+} from "../models/GroupSourceConnection";
+import {
+    type GroupSourceConnectionRequest,
     GroupSourceConnectionRequestToJSON,
+} from "../models/GroupSourceConnectionRequest";
+import {
+    type GroupTelegramSourceConnection,
     GroupTelegramSourceConnectionFromJSON,
+} from "../models/GroupTelegramSourceConnection";
+import {
+    type GroupTelegramSourceConnectionRequest,
     GroupTelegramSourceConnectionRequestToJSON,
-    KerberosSourceFromJSON,
+} from "../models/GroupTelegramSourceConnectionRequest";
+import { type KadminTypeEnum } from "../models/KadminTypeEnum";
+import { type KerberosSource, KerberosSourceFromJSON } from "../models/KerberosSource";
+import {
+    type KerberosSourceRequest,
     KerberosSourceRequestToJSON,
-    LDAPDebugFromJSON,
-    LDAPSourceFromJSON,
-    LDAPSourceRequestToJSON,
-    OAuthSourceFromJSON,
-    OAuthSourceRequestToJSON,
+} from "../models/KerberosSourceRequest";
+import { type LDAPDebug, LDAPDebugFromJSON } from "../models/LDAPDebug";
+import { type LDAPSource, LDAPSourceFromJSON } from "../models/LDAPSource";
+import { type LDAPSourceRequest, LDAPSourceRequestToJSON } from "../models/LDAPSourceRequest";
+import { type OAuthSource, OAuthSourceFromJSON } from "../models/OAuthSource";
+import { type OAuthSourceRequest, OAuthSourceRequestToJSON } from "../models/OAuthSourceRequest";
+import {
+    type PaginatedGroupKerberosSourceConnectionList,
     PaginatedGroupKerberosSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupKerberosSourceConnectionList";
+import {
+    type PaginatedGroupLDAPSourceConnectionList,
     PaginatedGroupLDAPSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupLDAPSourceConnectionList";
+import {
+    type PaginatedGroupOAuthSourceConnectionList,
     PaginatedGroupOAuthSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupOAuthSourceConnectionList";
+import {
+    type PaginatedGroupPlexSourceConnectionList,
     PaginatedGroupPlexSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupPlexSourceConnectionList";
+import {
+    type PaginatedGroupSAMLSourceConnectionList,
     PaginatedGroupSAMLSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupSAMLSourceConnectionList";
+import {
+    type PaginatedGroupSourceConnectionList,
     PaginatedGroupSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupSourceConnectionList";
+import {
+    type PaginatedGroupTelegramSourceConnectionList,
     PaginatedGroupTelegramSourceConnectionListFromJSON,
+} from "../models/PaginatedGroupTelegramSourceConnectionList";
+import {
+    type PaginatedKerberosSourceList,
     PaginatedKerberosSourceListFromJSON,
+} from "../models/PaginatedKerberosSourceList";
+import {
+    type PaginatedLDAPSourceList,
     PaginatedLDAPSourceListFromJSON,
+} from "../models/PaginatedLDAPSourceList";
+import {
+    type PaginatedOAuthSourceList,
     PaginatedOAuthSourceListFromJSON,
+} from "../models/PaginatedOAuthSourceList";
+import {
+    type PaginatedPlexSourceList,
     PaginatedPlexSourceListFromJSON,
+} from "../models/PaginatedPlexSourceList";
+import {
+    type PaginatedSAMLSourceList,
     PaginatedSAMLSourceListFromJSON,
+} from "../models/PaginatedSAMLSourceList";
+import {
+    type PaginatedSCIMSourceGroupList,
     PaginatedSCIMSourceGroupListFromJSON,
+} from "../models/PaginatedSCIMSourceGroupList";
+import {
+    type PaginatedSCIMSourceList,
     PaginatedSCIMSourceListFromJSON,
+} from "../models/PaginatedSCIMSourceList";
+import {
+    type PaginatedSCIMSourceUserList,
     PaginatedSCIMSourceUserListFromJSON,
+} from "../models/PaginatedSCIMSourceUserList";
+import {
+    type PaginatedSourceList,
     PaginatedSourceListFromJSON,
+} from "../models/PaginatedSourceList";
+import {
+    type PaginatedTelegramSourceList,
     PaginatedTelegramSourceListFromJSON,
+} from "../models/PaginatedTelegramSourceList";
+import {
+    type PaginatedUserKerberosSourceConnectionList,
     PaginatedUserKerberosSourceConnectionListFromJSON,
+} from "../models/PaginatedUserKerberosSourceConnectionList";
+import {
+    type PaginatedUserLDAPSourceConnectionList,
     PaginatedUserLDAPSourceConnectionListFromJSON,
+} from "../models/PaginatedUserLDAPSourceConnectionList";
+import {
+    type PaginatedUserOAuthSourceConnectionList,
     PaginatedUserOAuthSourceConnectionListFromJSON,
+} from "../models/PaginatedUserOAuthSourceConnectionList";
+import {
+    type PaginatedUserPlexSourceConnectionList,
     PaginatedUserPlexSourceConnectionListFromJSON,
+} from "../models/PaginatedUserPlexSourceConnectionList";
+import {
+    type PaginatedUserSAMLSourceConnectionList,
     PaginatedUserSAMLSourceConnectionListFromJSON,
+} from "../models/PaginatedUserSAMLSourceConnectionList";
+import {
+    type PaginatedUserSourceConnectionList,
     PaginatedUserSourceConnectionListFromJSON,
+} from "../models/PaginatedUserSourceConnectionList";
+import {
+    type PaginatedUserTelegramSourceConnectionList,
     PaginatedUserTelegramSourceConnectionListFromJSON,
+} from "../models/PaginatedUserTelegramSourceConnectionList";
+import {
+    type PatchedGroupKerberosSourceConnectionRequest,
     PatchedGroupKerberosSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupKerberosSourceConnectionRequest";
+import {
+    type PatchedGroupLDAPSourceConnectionRequest,
     PatchedGroupLDAPSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupLDAPSourceConnectionRequest";
+import {
+    type PatchedGroupOAuthSourceConnectionRequest,
     PatchedGroupOAuthSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupOAuthSourceConnectionRequest";
+import {
+    type PatchedGroupPlexSourceConnectionRequest,
     PatchedGroupPlexSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupPlexSourceConnectionRequest";
+import {
+    type PatchedGroupSAMLSourceConnectionRequest,
     PatchedGroupSAMLSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupSAMLSourceConnectionRequest";
+import {
+    type PatchedGroupSourceConnectionRequest,
     PatchedGroupSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupSourceConnectionRequest";
+import {
+    type PatchedGroupTelegramSourceConnectionRequest,
     PatchedGroupTelegramSourceConnectionRequestToJSON,
+} from "../models/PatchedGroupTelegramSourceConnectionRequest";
+import {
+    type PatchedKerberosSourceRequest,
     PatchedKerberosSourceRequestToJSON,
+} from "../models/PatchedKerberosSourceRequest";
+import {
+    type PatchedLDAPSourceRequest,
     PatchedLDAPSourceRequestToJSON,
+} from "../models/PatchedLDAPSourceRequest";
+import {
+    type PatchedOAuthSourceRequest,
     PatchedOAuthSourceRequestToJSON,
+} from "../models/PatchedOAuthSourceRequest";
+import {
+    type PatchedPlexSourceRequest,
     PatchedPlexSourceRequestToJSON,
+} from "../models/PatchedPlexSourceRequest";
+import {
+    type PatchedSAMLSourceRequest,
     PatchedSAMLSourceRequestToJSON,
+} from "../models/PatchedSAMLSourceRequest";
+import {
+    type PatchedSCIMSourceGroupRequest,
     PatchedSCIMSourceGroupRequestToJSON,
+} from "../models/PatchedSCIMSourceGroupRequest";
+import {
+    type PatchedSCIMSourceRequest,
     PatchedSCIMSourceRequestToJSON,
+} from "../models/PatchedSCIMSourceRequest";
+import {
+    type PatchedSCIMSourceUserRequest,
     PatchedSCIMSourceUserRequestToJSON,
+} from "../models/PatchedSCIMSourceUserRequest";
+import {
+    type PatchedTelegramSourceRequest,
     PatchedTelegramSourceRequestToJSON,
+} from "../models/PatchedTelegramSourceRequest";
+import {
+    type PatchedUserKerberosSourceConnectionRequest,
     PatchedUserKerberosSourceConnectionRequestToJSON,
+} from "../models/PatchedUserKerberosSourceConnectionRequest";
+import {
+    type PatchedUserLDAPSourceConnectionRequest,
     PatchedUserLDAPSourceConnectionRequestToJSON,
+} from "../models/PatchedUserLDAPSourceConnectionRequest";
+import {
+    type PatchedUserOAuthSourceConnectionRequest,
     PatchedUserOAuthSourceConnectionRequestToJSON,
+} from "../models/PatchedUserOAuthSourceConnectionRequest";
+import {
+    type PatchedUserPlexSourceConnectionRequest,
     PatchedUserPlexSourceConnectionRequestToJSON,
+} from "../models/PatchedUserPlexSourceConnectionRequest";
+import {
+    type PatchedUserSAMLSourceConnectionRequest,
     PatchedUserSAMLSourceConnectionRequestToJSON,
+} from "../models/PatchedUserSAMLSourceConnectionRequest";
+import {
+    type PatchedUserSourceConnectionRequest,
     PatchedUserSourceConnectionRequestToJSON,
+} from "../models/PatchedUserSourceConnectionRequest";
+import {
+    type PatchedUserTelegramSourceConnectionRequest,
     PatchedUserTelegramSourceConnectionRequestToJSON,
-    PlexSourceFromJSON,
-    PlexSourceRequestToJSON,
+} from "../models/PatchedUserTelegramSourceConnectionRequest";
+import { type PlexSource, PlexSourceFromJSON } from "../models/PlexSource";
+import { type PlexSourceRequest, PlexSourceRequestToJSON } from "../models/PlexSourceRequest";
+import {
+    type PlexTokenRedeemRequest,
     PlexTokenRedeemRequestToJSON,
-    RedirectChallengeFromJSON,
-    SAMLMetadataFromJSON,
-    SAMLSourceFromJSON,
-    SAMLSourceRequestToJSON,
-    SCIMSourceFromJSON,
-    SCIMSourceGroupFromJSON,
+} from "../models/PlexTokenRedeemRequest";
+import { type PolicyEngineMode } from "../models/PolicyEngineMode";
+import { type RedirectChallenge, RedirectChallengeFromJSON } from "../models/RedirectChallenge";
+import { type SAMLMetadata, SAMLMetadataFromJSON } from "../models/SAMLMetadata";
+import { type SAMLNameIDPolicyEnum } from "../models/SAMLNameIDPolicyEnum";
+import { type SAMLSource, SAMLSourceFromJSON } from "../models/SAMLSource";
+import { type SAMLSourceRequest, SAMLSourceRequestToJSON } from "../models/SAMLSourceRequest";
+import { type SCIMSource, SCIMSourceFromJSON } from "../models/SCIMSource";
+import { type SCIMSourceGroup, SCIMSourceGroupFromJSON } from "../models/SCIMSourceGroup";
+import {
+    type SCIMSourceGroupRequest,
     SCIMSourceGroupRequestToJSON,
-    SCIMSourceRequestToJSON,
-    SCIMSourceUserFromJSON,
+} from "../models/SCIMSourceGroupRequest";
+import { type SCIMSourceRequest, SCIMSourceRequestToJSON } from "../models/SCIMSourceRequest";
+import { type SCIMSourceUser, SCIMSourceUserFromJSON } from "../models/SCIMSourceUser";
+import {
+    type SCIMSourceUserRequest,
     SCIMSourceUserRequestToJSON,
-    SourceFromJSON,
-    SourceTypeFromJSON,
-    SyncStatusFromJSON,
-    TelegramAuthRequestToJSON,
-    TelegramSourceFromJSON,
+} from "../models/SCIMSourceUserRequest";
+import { type SignatureAlgorithmEnum } from "../models/SignatureAlgorithmEnum";
+import { type Source, SourceFromJSON } from "../models/Source";
+import { type SourceType, SourceTypeFromJSON } from "../models/SourceType";
+import { type SyncStatus, SyncStatusFromJSON } from "../models/SyncStatus";
+import { type TelegramAuthRequest, TelegramAuthRequestToJSON } from "../models/TelegramAuthRequest";
+import { type TelegramSource, TelegramSourceFromJSON } from "../models/TelegramSource";
+import {
+    type TelegramSourceRequest,
     TelegramSourceRequestToJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
+} from "../models/TelegramSourceRequest";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import {
+    type UserKerberosSourceConnection,
     UserKerberosSourceConnectionFromJSON,
+} from "../models/UserKerberosSourceConnection";
+import {
+    type UserKerberosSourceConnectionRequest,
     UserKerberosSourceConnectionRequestToJSON,
+} from "../models/UserKerberosSourceConnectionRequest";
+import {
+    type UserLDAPSourceConnection,
     UserLDAPSourceConnectionFromJSON,
+} from "../models/UserLDAPSourceConnection";
+import {
+    type UserLDAPSourceConnectionRequest,
     UserLDAPSourceConnectionRequestToJSON,
+} from "../models/UserLDAPSourceConnectionRequest";
+import { type UserMatchingModeEnum } from "../models/UserMatchingModeEnum";
+import {
+    type UserOAuthSourceConnection,
     UserOAuthSourceConnectionFromJSON,
+} from "../models/UserOAuthSourceConnection";
+import {
+    type UserOAuthSourceConnectionRequest,
     UserOAuthSourceConnectionRequestToJSON,
+} from "../models/UserOAuthSourceConnectionRequest";
+import {
+    type UserPlexSourceConnection,
     UserPlexSourceConnectionFromJSON,
+} from "../models/UserPlexSourceConnection";
+import {
+    type UserPlexSourceConnectionRequest,
     UserPlexSourceConnectionRequestToJSON,
+} from "../models/UserPlexSourceConnectionRequest";
+import {
+    type UserSAMLSourceConnection,
     UserSAMLSourceConnectionFromJSON,
+} from "../models/UserSAMLSourceConnection";
+import {
+    type UserSAMLSourceConnectionRequest,
     UserSAMLSourceConnectionRequestToJSON,
-    UserSettingFromJSON,
+} from "../models/UserSAMLSourceConnectionRequest";
+import { type UserSetting, UserSettingFromJSON } from "../models/UserSetting";
+import {
+    type UserSourceConnection,
     UserSourceConnectionFromJSON,
+} from "../models/UserSourceConnection";
+import {
+    type UserSourceConnectionRequest,
     UserSourceConnectionRequestToJSON,
+} from "../models/UserSourceConnectionRequest";
+import {
+    type UserTelegramSourceConnection,
     UserTelegramSourceConnectionFromJSON,
+} from "../models/UserTelegramSourceConnection";
+import {
+    type UserTelegramSourceConnectionRequest,
     UserTelegramSourceConnectionRequestToJSON,
-} from "../models/index";
+} from "../models/UserTelegramSourceConnectionRequest";
 import * as runtime from "../runtime";
 
 export interface SourcesAllDestroyRequest {
@@ -1212,10 +1344,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/all/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1362,10 +1491,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/all/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1477,10 +1603,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/all/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -1592,7 +1715,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1738,7 +1861,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1808,7 +1931,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1884,7 +2007,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -1954,7 +2077,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/all/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2090,7 +2213,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2236,7 +2359,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2306,7 +2429,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2382,7 +2505,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2452,7 +2575,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/kerberos/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2588,7 +2711,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2734,7 +2857,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2804,7 +2927,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2880,7 +3003,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -2950,7 +3073,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/ldap/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3086,7 +3209,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3232,7 +3355,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3302,7 +3425,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3378,7 +3501,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3448,7 +3571,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/oauth/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3584,7 +3707,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3730,7 +3853,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3800,7 +3923,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3876,7 +3999,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -3946,7 +4069,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/plex/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4082,7 +4205,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4228,7 +4351,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4298,7 +4421,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4374,7 +4497,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4444,7 +4567,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/saml/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4580,7 +4703,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4726,7 +4849,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4796,7 +4919,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4872,7 +4995,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -4942,7 +5065,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/group_connections/telegram/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -5072,10 +5195,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/kerberos/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5253,10 +5373,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/kerberos/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5326,10 +5443,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/kerberos/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5392,10 +5506,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/kerberos/{slug}/sync/status/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5469,10 +5580,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/kerberos/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5536,10 +5644,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/kerberos/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5663,10 +5768,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/debug/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5727,10 +5829,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -5974,10 +6073,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6039,10 +6135,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6103,10 +6196,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/sync/status/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6180,10 +6270,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6245,10 +6332,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/ldap/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6372,10 +6456,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/oauth/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6576,10 +6657,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/oauth/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6641,10 +6719,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/oauth/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6776,10 +6851,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/oauth/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6841,10 +6913,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/oauth/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -6968,10 +7037,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/plex/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7148,10 +7214,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/plex/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7353,10 +7416,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/plex/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7426,10 +7486,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/plex/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7491,10 +7548,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/plex/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7618,10 +7672,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/saml/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7849,10 +7900,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/saml/{slug}/metadata/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7920,10 +7968,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/saml/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -7985,10 +8030,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/saml/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -8058,10 +8100,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/saml/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -8123,10 +8162,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/saml/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -8250,10 +8286,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -8378,7 +8411,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8523,7 +8556,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8593,7 +8626,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8665,7 +8698,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_groups/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8729,7 +8762,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_groups/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -8878,10 +8911,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -8943,10 +8973,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -9016,10 +9043,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -9081,10 +9105,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -9210,7 +9231,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9355,7 +9376,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9425,7 +9446,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9497,7 +9518,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_users/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9561,7 +9582,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/scim_users/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -9631,10 +9652,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/telegram/{slug}/connect_user/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -9767,10 +9785,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/telegram/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -9947,10 +9962,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/telegram/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -10020,10 +10032,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/telegram/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -10095,10 +10104,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/telegram/{slug}/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -10162,10 +10168,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/telegram/{slug}/used_by/`;
-        urlPath = urlPath.replace(
-            `{${"slug"}}`,
-            encodeURIComponent(String(requestParameters["slug"])),
-        );
+        urlPath = urlPath.replace("{slug}", encodeURIComponent(String(requestParameters["slug"])));
 
         return {
             path: urlPath,
@@ -10226,7 +10229,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10372,7 +10375,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10442,7 +10445,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10518,7 +10521,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/all/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10588,7 +10591,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/all/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10724,7 +10727,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10870,7 +10873,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -10940,7 +10943,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11016,7 +11019,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/kerberos/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11086,7 +11089,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/kerberos/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11222,7 +11225,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11368,7 +11371,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11438,7 +11441,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11514,7 +11517,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/ldap/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11584,7 +11587,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/ldap/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11720,7 +11723,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11866,7 +11869,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -11936,7 +11939,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12012,7 +12015,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/oauth/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12082,7 +12085,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/oauth/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12218,7 +12221,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12364,7 +12367,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12434,7 +12437,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12510,7 +12513,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/plex/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12580,7 +12583,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/plex/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12716,7 +12719,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12862,7 +12865,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -12932,7 +12935,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13008,7 +13011,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/saml/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13078,7 +13081,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/saml/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13214,7 +13217,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13360,7 +13363,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13430,7 +13433,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13506,7 +13509,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/telegram/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -13576,7 +13579,7 @@ export class SourcesApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/sources/user_connections/telegram/{id}/used_by/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/SsfApi.ts b/packages/client-ts/src/apis/SsfApi.ts
index 37a827d955..8fd0bb0dab 100644
--- a/packages/client-ts/src/apis/SsfApi.ts
+++ b/packages/client-ts/src/apis/SsfApi.ts
@@ -12,8 +12,12 @@
  * Do not edit the class manually.
  */
 
-import type { DeliveryMethodEnum, PaginatedSSFStreamList, SSFStream } from "../models/index";
-import { PaginatedSSFStreamListFromJSON, SSFStreamFromJSON } from "../models/index";
+import { type DeliveryMethodEnum } from "../models/DeliveryMethodEnum";
+import {
+    type PaginatedSSFStreamList,
+    PaginatedSSFStreamListFromJSON,
+} from "../models/PaginatedSSFStreamList";
+import { type SSFStream, SSFStreamFromJSON } from "../models/SSFStream";
 import * as runtime from "../runtime";
 
 export interface SsfStreamsDestroyRequest {
@@ -65,10 +69,7 @@ export class SsfApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/ssf/streams/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
@@ -211,10 +212,7 @@ export class SsfApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/ssf/streams/{uuid}/`;
-        urlPath = urlPath.replace(
-            `{${"uuid"}}`,
-            encodeURIComponent(String(requestParameters["uuid"])),
-        );
+        urlPath = urlPath.replace("{uuid}", encodeURIComponent(String(requestParameters["uuid"])));
 
         return {
             path: urlPath,
diff --git a/packages/client-ts/src/apis/StagesApi.ts b/packages/client-ts/src/apis/StagesApi.ts
index aa44ccfe78..d7fcc14284 100644
--- a/packages/client-ts/src/apis/StagesApi.ts
+++ b/packages/client-ts/src/apis/StagesApi.ts
@@ -12,273 +12,415 @@
  * Do not edit the class manually.
  */
 
-import type {
-    AccountLockdownStage,
-    AccountLockdownStageRequest,
-    AuthenticatorAttachmentEnum,
-    AuthenticatorDuoStage,
-    AuthenticatorDuoStageDeviceImportResponse,
-    AuthenticatorDuoStageManualDeviceImportRequest,
-    AuthenticatorDuoStageRequest,
-    AuthenticatorEmailStage,
-    AuthenticatorEmailStageRequest,
-    AuthenticatorEndpointGDTCStage,
-    AuthenticatorEndpointGDTCStageRequest,
-    AuthenticatorSMSStage,
-    AuthenticatorSMSStageRequest,
-    AuthenticatorStaticStage,
-    AuthenticatorStaticStageRequest,
-    AuthenticatorTOTPStage,
-    AuthenticatorTOTPStageRequest,
-    AuthenticatorValidateStage,
-    AuthenticatorValidateStageRequest,
-    AuthenticatorWebAuthnStage,
-    AuthenticatorWebAuthnStageRequest,
-    AuthTypeEnum,
-    CaptchaStage,
-    CaptchaStageRequest,
-    CertAttributeEnum,
-    ConsentModeEnum,
-    ConsentStage,
-    ConsentStageRequest,
-    DenyStage,
-    DenyStageRequest,
-    DigitsEnum,
-    DummyStage,
-    DummyStageRequest,
-    DuoDeviceEnrollmentStatus,
-    EmailStage,
-    EmailStageRequest,
-    EndpointStage,
-    EndpointStageRequest,
-    GeoipBindingEnum,
-    IdentificationStage,
-    IdentificationStageRequest,
-    Invitation,
-    InvitationRequest,
-    InvitationSendEmailRequest,
-    InvitationStage,
-    InvitationStageRequest,
-    MutualTLSStage,
-    MutualTLSStageRequest,
-    NetworkBindingEnum,
-    NotConfiguredActionEnum,
-    PaginatedAccountLockdownStageList,
-    PaginatedAuthenticatorDuoStageList,
-    PaginatedAuthenticatorEmailStageList,
-    PaginatedAuthenticatorEndpointGDTCStageList,
-    PaginatedAuthenticatorSMSStageList,
-    PaginatedAuthenticatorStaticStageList,
-    PaginatedAuthenticatorTOTPStageList,
-    PaginatedAuthenticatorValidateStageList,
-    PaginatedAuthenticatorWebAuthnStageList,
-    PaginatedCaptchaStageList,
-    PaginatedConsentStageList,
-    PaginatedDenyStageList,
-    PaginatedDummyStageList,
-    PaginatedEmailStageList,
-    PaginatedEndpointStageList,
-    PaginatedIdentificationStageList,
-    PaginatedInvitationList,
-    PaginatedInvitationStageList,
-    PaginatedMutualTLSStageList,
-    PaginatedPasswordStageList,
-    PaginatedPromptList,
-    PaginatedPromptStageList,
-    PaginatedRedirectStageList,
-    PaginatedSourceStageList,
-    PaginatedStageList,
-    PaginatedUserDeleteStageList,
-    PaginatedUserLoginStageList,
-    PaginatedUserLogoutStageList,
-    PaginatedUserWriteStageList,
-    PaginatedWebAuthnDeviceTypeList,
-    PasswordStage,
-    PasswordStageRequest,
-    PatchedAccountLockdownStageRequest,
-    PatchedAuthenticatorDuoStageRequest,
-    PatchedAuthenticatorEmailStageRequest,
-    PatchedAuthenticatorEndpointGDTCStageRequest,
-    PatchedAuthenticatorSMSStageRequest,
-    PatchedAuthenticatorStaticStageRequest,
-    PatchedAuthenticatorTOTPStageRequest,
-    PatchedAuthenticatorValidateStageRequest,
-    PatchedAuthenticatorWebAuthnStageRequest,
-    PatchedCaptchaStageRequest,
-    PatchedConsentStageRequest,
-    PatchedDenyStageRequest,
-    PatchedDummyStageRequest,
-    PatchedEmailStageRequest,
-    PatchedEndpointStageRequest,
-    PatchedIdentificationStageRequest,
-    PatchedInvitationRequest,
-    PatchedInvitationStageRequest,
-    PatchedMutualTLSStageRequest,
-    PatchedPasswordStageRequest,
-    PatchedPromptRequest,
-    PatchedPromptStageRequest,
-    PatchedRedirectStageRequest,
-    PatchedSourceStageRequest,
-    PatchedUserDeleteStageRequest,
-    PatchedUserLoginStageRequest,
-    PatchedUserLogoutStageRequest,
-    PatchedUserWriteStageRequest,
-    Prompt,
-    PromptChallenge,
-    PromptRequest,
-    PromptStage,
-    PromptStageRequest,
-    PromptTypeEnum,
-    ProviderEnum,
-    RedirectStage,
-    RedirectStageRequest,
-    SourceStage,
-    SourceStageRequest,
-    Stage,
-    StageModeEnum,
-    TypeCreate,
-    UsedBy,
-    UserAttributeEnum,
-    UserCreationModeEnum,
-    UserDeleteStage,
-    UserDeleteStageRequest,
-    UserLoginStage,
-    UserLoginStageRequest,
-    UserLogoutStage,
-    UserLogoutStageRequest,
-    UserSetting,
-    UserTypeEnum,
-    UserVerificationEnum,
-    UserWriteStage,
-    UserWriteStageRequest,
-    WebAuthnDeviceType,
-} from "../models/index";
 import {
+    type AccountLockdownStage,
     AccountLockdownStageFromJSON,
+} from "../models/AccountLockdownStage";
+import {
+    type AccountLockdownStageRequest,
     AccountLockdownStageRequestToJSON,
-    AuthenticatorDuoStageDeviceImportResponseFromJSON,
+} from "../models/AccountLockdownStageRequest";
+import { type AuthenticatorAttachmentEnum } from "../models/AuthenticatorAttachmentEnum";
+import {
+    type AuthenticatorDuoStage,
     AuthenticatorDuoStageFromJSON,
+} from "../models/AuthenticatorDuoStage";
+import {
+    type AuthenticatorDuoStageDeviceImportResponse,
+    AuthenticatorDuoStageDeviceImportResponseFromJSON,
+} from "../models/AuthenticatorDuoStageDeviceImportResponse";
+import {
+    type AuthenticatorDuoStageManualDeviceImportRequest,
     AuthenticatorDuoStageManualDeviceImportRequestToJSON,
+} from "../models/AuthenticatorDuoStageManualDeviceImportRequest";
+import {
+    type AuthenticatorDuoStageRequest,
     AuthenticatorDuoStageRequestToJSON,
+} from "../models/AuthenticatorDuoStageRequest";
+import {
+    type AuthenticatorEmailStage,
     AuthenticatorEmailStageFromJSON,
+} from "../models/AuthenticatorEmailStage";
+import {
+    type AuthenticatorEmailStageRequest,
     AuthenticatorEmailStageRequestToJSON,
+} from "../models/AuthenticatorEmailStageRequest";
+import {
+    type AuthenticatorEndpointGDTCStage,
     AuthenticatorEndpointGDTCStageFromJSON,
+} from "../models/AuthenticatorEndpointGDTCStage";
+import {
+    type AuthenticatorEndpointGDTCStageRequest,
     AuthenticatorEndpointGDTCStageRequestToJSON,
+} from "../models/AuthenticatorEndpointGDTCStageRequest";
+import {
+    type AuthenticatorSMSStage,
     AuthenticatorSMSStageFromJSON,
+} from "../models/AuthenticatorSMSStage";
+import {
+    type AuthenticatorSMSStageRequest,
     AuthenticatorSMSStageRequestToJSON,
+} from "../models/AuthenticatorSMSStageRequest";
+import {
+    type AuthenticatorStaticStage,
     AuthenticatorStaticStageFromJSON,
+} from "../models/AuthenticatorStaticStage";
+import {
+    type AuthenticatorStaticStageRequest,
     AuthenticatorStaticStageRequestToJSON,
+} from "../models/AuthenticatorStaticStageRequest";
+import {
+    type AuthenticatorTOTPStage,
     AuthenticatorTOTPStageFromJSON,
+} from "../models/AuthenticatorTOTPStage";
+import {
+    type AuthenticatorTOTPStageRequest,
     AuthenticatorTOTPStageRequestToJSON,
+} from "../models/AuthenticatorTOTPStageRequest";
+import {
+    type AuthenticatorValidateStage,
     AuthenticatorValidateStageFromJSON,
+} from "../models/AuthenticatorValidateStage";
+import {
+    type AuthenticatorValidateStageRequest,
     AuthenticatorValidateStageRequestToJSON,
+} from "../models/AuthenticatorValidateStageRequest";
+import {
+    type AuthenticatorWebAuthnStage,
     AuthenticatorWebAuthnStageFromJSON,
+} from "../models/AuthenticatorWebAuthnStage";
+import {
+    type AuthenticatorWebAuthnStageRequest,
     AuthenticatorWebAuthnStageRequestToJSON,
-    CaptchaStageFromJSON,
-    CaptchaStageRequestToJSON,
-    ConsentStageFromJSON,
-    ConsentStageRequestToJSON,
-    DenyStageFromJSON,
-    DenyStageRequestToJSON,
-    DummyStageFromJSON,
-    DummyStageRequestToJSON,
+} from "../models/AuthenticatorWebAuthnStageRequest";
+import { type AuthTypeEnum } from "../models/AuthTypeEnum";
+import { type CaptchaStage, CaptchaStageFromJSON } from "../models/CaptchaStage";
+import { type CaptchaStageRequest, CaptchaStageRequestToJSON } from "../models/CaptchaStageRequest";
+import { type CertAttributeEnum } from "../models/CertAttributeEnum";
+import { type ConsentModeEnum } from "../models/ConsentModeEnum";
+import { type ConsentStage, ConsentStageFromJSON } from "../models/ConsentStage";
+import { type ConsentStageRequest, ConsentStageRequestToJSON } from "../models/ConsentStageRequest";
+import { type DenyStage, DenyStageFromJSON } from "../models/DenyStage";
+import { type DenyStageRequest, DenyStageRequestToJSON } from "../models/DenyStageRequest";
+import { type DigitsEnum } from "../models/DigitsEnum";
+import { type DummyStage, DummyStageFromJSON } from "../models/DummyStage";
+import { type DummyStageRequest, DummyStageRequestToJSON } from "../models/DummyStageRequest";
+import {
+    type DuoDeviceEnrollmentStatus,
     DuoDeviceEnrollmentStatusFromJSON,
-    EmailStageFromJSON,
-    EmailStageRequestToJSON,
-    EndpointStageFromJSON,
+} from "../models/DuoDeviceEnrollmentStatus";
+import { type EmailStage, EmailStageFromJSON } from "../models/EmailStage";
+import { type EmailStageRequest, EmailStageRequestToJSON } from "../models/EmailStageRequest";
+import { type EndpointStage, EndpointStageFromJSON } from "../models/EndpointStage";
+import {
+    type EndpointStageRequest,
     EndpointStageRequestToJSON,
+} from "../models/EndpointStageRequest";
+import { type GeoipBindingEnum } from "../models/GeoipBindingEnum";
+import {
+    type IdentificationStage,
     IdentificationStageFromJSON,
+} from "../models/IdentificationStage";
+import {
+    type IdentificationStageRequest,
     IdentificationStageRequestToJSON,
-    InvitationFromJSON,
-    InvitationRequestToJSON,
+} from "../models/IdentificationStageRequest";
+import { type Invitation, InvitationFromJSON } from "../models/Invitation";
+import { type InvitationRequest, InvitationRequestToJSON } from "../models/InvitationRequest";
+import {
+    type InvitationSendEmailRequest,
     InvitationSendEmailRequestToJSON,
-    InvitationStageFromJSON,
+} from "../models/InvitationSendEmailRequest";
+import { type InvitationStage, InvitationStageFromJSON } from "../models/InvitationStage";
+import {
+    type InvitationStageRequest,
     InvitationStageRequestToJSON,
-    MutualTLSStageFromJSON,
+} from "../models/InvitationStageRequest";
+import { type MutualTLSStage, MutualTLSStageFromJSON } from "../models/MutualTLSStage";
+import {
+    type MutualTLSStageRequest,
     MutualTLSStageRequestToJSON,
+} from "../models/MutualTLSStageRequest";
+import { type NetworkBindingEnum } from "../models/NetworkBindingEnum";
+import { type NotConfiguredActionEnum } from "../models/NotConfiguredActionEnum";
+import {
+    type PaginatedAccountLockdownStageList,
     PaginatedAccountLockdownStageListFromJSON,
+} from "../models/PaginatedAccountLockdownStageList";
+import {
+    type PaginatedAuthenticatorDuoStageList,
     PaginatedAuthenticatorDuoStageListFromJSON,
+} from "../models/PaginatedAuthenticatorDuoStageList";
+import {
+    type PaginatedAuthenticatorEmailStageList,
     PaginatedAuthenticatorEmailStageListFromJSON,
+} from "../models/PaginatedAuthenticatorEmailStageList";
+import {
+    type PaginatedAuthenticatorEndpointGDTCStageList,
     PaginatedAuthenticatorEndpointGDTCStageListFromJSON,
+} from "../models/PaginatedAuthenticatorEndpointGDTCStageList";
+import {
+    type PaginatedAuthenticatorSMSStageList,
     PaginatedAuthenticatorSMSStageListFromJSON,
+} from "../models/PaginatedAuthenticatorSMSStageList";
+import {
+    type PaginatedAuthenticatorStaticStageList,
     PaginatedAuthenticatorStaticStageListFromJSON,
+} from "../models/PaginatedAuthenticatorStaticStageList";
+import {
+    type PaginatedAuthenticatorTOTPStageList,
     PaginatedAuthenticatorTOTPStageListFromJSON,
+} from "../models/PaginatedAuthenticatorTOTPStageList";
+import {
+    type PaginatedAuthenticatorValidateStageList,
     PaginatedAuthenticatorValidateStageListFromJSON,
+} from "../models/PaginatedAuthenticatorValidateStageList";
+import {
+    type PaginatedAuthenticatorWebAuthnStageList,
     PaginatedAuthenticatorWebAuthnStageListFromJSON,
+} from "../models/PaginatedAuthenticatorWebAuthnStageList";
+import {
+    type PaginatedCaptchaStageList,
     PaginatedCaptchaStageListFromJSON,
+} from "../models/PaginatedCaptchaStageList";
+import {
+    type PaginatedConsentStageList,
     PaginatedConsentStageListFromJSON,
+} from "../models/PaginatedConsentStageList";
+import {
+    type PaginatedDenyStageList,
     PaginatedDenyStageListFromJSON,
+} from "../models/PaginatedDenyStageList";
+import {
+    type PaginatedDummyStageList,
     PaginatedDummyStageListFromJSON,
+} from "../models/PaginatedDummyStageList";
+import {
+    type PaginatedEmailStageList,
     PaginatedEmailStageListFromJSON,
+} from "../models/PaginatedEmailStageList";
+import {
+    type PaginatedEndpointStageList,
     PaginatedEndpointStageListFromJSON,
+} from "../models/PaginatedEndpointStageList";
+import {
+    type PaginatedIdentificationStageList,
     PaginatedIdentificationStageListFromJSON,
+} from "../models/PaginatedIdentificationStageList";
+import {
+    type PaginatedInvitationList,
     PaginatedInvitationListFromJSON,
+} from "../models/PaginatedInvitationList";
+import {
+    type PaginatedInvitationStageList,
     PaginatedInvitationStageListFromJSON,
+} from "../models/PaginatedInvitationStageList";
+import {
+    type PaginatedMutualTLSStageList,
     PaginatedMutualTLSStageListFromJSON,
+} from "../models/PaginatedMutualTLSStageList";
+import {
+    type PaginatedPasswordStageList,
     PaginatedPasswordStageListFromJSON,
+} from "../models/PaginatedPasswordStageList";
+import {
+    type PaginatedPromptList,
     PaginatedPromptListFromJSON,
+} from "../models/PaginatedPromptList";
+import {
+    type PaginatedPromptStageList,
     PaginatedPromptStageListFromJSON,
+} from "../models/PaginatedPromptStageList";
+import {
+    type PaginatedRedirectStageList,
     PaginatedRedirectStageListFromJSON,
+} from "../models/PaginatedRedirectStageList";
+import {
+    type PaginatedSourceStageList,
     PaginatedSourceStageListFromJSON,
-    PaginatedStageListFromJSON,
+} from "../models/PaginatedSourceStageList";
+import { type PaginatedStageList, PaginatedStageListFromJSON } from "../models/PaginatedStageList";
+import {
+    type PaginatedUserDeleteStageList,
     PaginatedUserDeleteStageListFromJSON,
+} from "../models/PaginatedUserDeleteStageList";
+import {
+    type PaginatedUserLoginStageList,
     PaginatedUserLoginStageListFromJSON,
+} from "../models/PaginatedUserLoginStageList";
+import {
+    type PaginatedUserLogoutStageList,
     PaginatedUserLogoutStageListFromJSON,
+} from "../models/PaginatedUserLogoutStageList";
+import {
+    type PaginatedUserWriteStageList,
     PaginatedUserWriteStageListFromJSON,
+} from "../models/PaginatedUserWriteStageList";
+import {
+    type PaginatedWebAuthnDeviceTypeList,
     PaginatedWebAuthnDeviceTypeListFromJSON,
-    PasswordStageFromJSON,
+} from "../models/PaginatedWebAuthnDeviceTypeList";
+import { type PasswordStage, PasswordStageFromJSON } from "../models/PasswordStage";
+import {
+    type PasswordStageRequest,
     PasswordStageRequestToJSON,
+} from "../models/PasswordStageRequest";
+import {
+    type PatchedAccountLockdownStageRequest,
     PatchedAccountLockdownStageRequestToJSON,
+} from "../models/PatchedAccountLockdownStageRequest";
+import {
+    type PatchedAuthenticatorDuoStageRequest,
     PatchedAuthenticatorDuoStageRequestToJSON,
+} from "../models/PatchedAuthenticatorDuoStageRequest";
+import {
+    type PatchedAuthenticatorEmailStageRequest,
     PatchedAuthenticatorEmailStageRequestToJSON,
+} from "../models/PatchedAuthenticatorEmailStageRequest";
+import {
+    type PatchedAuthenticatorEndpointGDTCStageRequest,
     PatchedAuthenticatorEndpointGDTCStageRequestToJSON,
+} from "../models/PatchedAuthenticatorEndpointGDTCStageRequest";
+import {
+    type PatchedAuthenticatorSMSStageRequest,
     PatchedAuthenticatorSMSStageRequestToJSON,
+} from "../models/PatchedAuthenticatorSMSStageRequest";
+import {
+    type PatchedAuthenticatorStaticStageRequest,
     PatchedAuthenticatorStaticStageRequestToJSON,
+} from "../models/PatchedAuthenticatorStaticStageRequest";
+import {
+    type PatchedAuthenticatorTOTPStageRequest,
     PatchedAuthenticatorTOTPStageRequestToJSON,
+} from "../models/PatchedAuthenticatorTOTPStageRequest";
+import {
+    type PatchedAuthenticatorValidateStageRequest,
     PatchedAuthenticatorValidateStageRequestToJSON,
+} from "../models/PatchedAuthenticatorValidateStageRequest";
+import {
+    type PatchedAuthenticatorWebAuthnStageRequest,
     PatchedAuthenticatorWebAuthnStageRequestToJSON,
+} from "../models/PatchedAuthenticatorWebAuthnStageRequest";
+import {
+    type PatchedCaptchaStageRequest,
     PatchedCaptchaStageRequestToJSON,
+} from "../models/PatchedCaptchaStageRequest";
+import {
+    type PatchedConsentStageRequest,
     PatchedConsentStageRequestToJSON,
+} from "../models/PatchedConsentStageRequest";
+import {
+    type PatchedDenyStageRequest,
     PatchedDenyStageRequestToJSON,
+} from "../models/PatchedDenyStageRequest";
+import {
+    type PatchedDummyStageRequest,
     PatchedDummyStageRequestToJSON,
+} from "../models/PatchedDummyStageRequest";
+import {
+    type PatchedEmailStageRequest,
     PatchedEmailStageRequestToJSON,
+} from "../models/PatchedEmailStageRequest";
+import {
+    type PatchedEndpointStageRequest,
     PatchedEndpointStageRequestToJSON,
+} from "../models/PatchedEndpointStageRequest";
+import {
+    type PatchedIdentificationStageRequest,
     PatchedIdentificationStageRequestToJSON,
+} from "../models/PatchedIdentificationStageRequest";
+import {
+    type PatchedInvitationRequest,
     PatchedInvitationRequestToJSON,
+} from "../models/PatchedInvitationRequest";
+import {
+    type PatchedInvitationStageRequest,
     PatchedInvitationStageRequestToJSON,
+} from "../models/PatchedInvitationStageRequest";
+import {
+    type PatchedMutualTLSStageRequest,
     PatchedMutualTLSStageRequestToJSON,
+} from "../models/PatchedMutualTLSStageRequest";
+import {
+    type PatchedPasswordStageRequest,
     PatchedPasswordStageRequestToJSON,
+} from "../models/PatchedPasswordStageRequest";
+import {
+    type PatchedPromptRequest,
     PatchedPromptRequestToJSON,
+} from "../models/PatchedPromptRequest";
+import {
+    type PatchedPromptStageRequest,
     PatchedPromptStageRequestToJSON,
+} from "../models/PatchedPromptStageRequest";
+import {
+    type PatchedRedirectStageRequest,
     PatchedRedirectStageRequestToJSON,
+} from "../models/PatchedRedirectStageRequest";
+import {
+    type PatchedSourceStageRequest,
     PatchedSourceStageRequestToJSON,
+} from "../models/PatchedSourceStageRequest";
+import {
+    type PatchedUserDeleteStageRequest,
     PatchedUserDeleteStageRequestToJSON,
+} from "../models/PatchedUserDeleteStageRequest";
+import {
+    type PatchedUserLoginStageRequest,
     PatchedUserLoginStageRequestToJSON,
+} from "../models/PatchedUserLoginStageRequest";
+import {
+    type PatchedUserLogoutStageRequest,
     PatchedUserLogoutStageRequestToJSON,
+} from "../models/PatchedUserLogoutStageRequest";
+import {
+    type PatchedUserWriteStageRequest,
     PatchedUserWriteStageRequestToJSON,
-    PromptChallengeFromJSON,
-    PromptFromJSON,
-    PromptRequestToJSON,
-    PromptStageFromJSON,
-    PromptStageRequestToJSON,
-    RedirectStageFromJSON,
+} from "../models/PatchedUserWriteStageRequest";
+import { type Prompt, PromptFromJSON } from "../models/Prompt";
+import { type PromptChallenge, PromptChallengeFromJSON } from "../models/PromptChallenge";
+import { type PromptRequest, PromptRequestToJSON } from "../models/PromptRequest";
+import { type PromptStage, PromptStageFromJSON } from "../models/PromptStage";
+import { type PromptStageRequest, PromptStageRequestToJSON } from "../models/PromptStageRequest";
+import { type PromptTypeEnum } from "../models/PromptTypeEnum";
+import { type ProviderEnum } from "../models/ProviderEnum";
+import { type RedirectStage, RedirectStageFromJSON } from "../models/RedirectStage";
+import {
+    type RedirectStageRequest,
     RedirectStageRequestToJSON,
-    SourceStageFromJSON,
-    SourceStageRequestToJSON,
-    StageFromJSON,
-    TypeCreateFromJSON,
-    UsedByFromJSON,
-    UserDeleteStageFromJSON,
+} from "../models/RedirectStageRequest";
+import { type SourceStage, SourceStageFromJSON } from "../models/SourceStage";
+import { type SourceStageRequest, SourceStageRequestToJSON } from "../models/SourceStageRequest";
+import { type Stage, StageFromJSON } from "../models/Stage";
+import { type StageModeEnum } from "../models/StageModeEnum";
+import { type TypeCreate, TypeCreateFromJSON } from "../models/TypeCreate";
+import { type UsedBy, UsedByFromJSON } from "../models/UsedBy";
+import { type UserAttributeEnum } from "../models/UserAttributeEnum";
+import { type UserCreationModeEnum } from "../models/UserCreationModeEnum";
+import { type UserDeleteStage, UserDeleteStageFromJSON } from "../models/UserDeleteStage";
+import {
+    type UserDeleteStageRequest,
     UserDeleteStageRequestToJSON,
-    UserLoginStageFromJSON,
+} from "../models/UserDeleteStageRequest";
+import { type UserLoginStage, UserLoginStageFromJSON } from "../models/UserLoginStage";
+import {
+    type UserLoginStageRequest,
     UserLoginStageRequestToJSON,
-    UserLogoutStageFromJSON,
+} from "../models/UserLoginStageRequest";
+import { type UserLogoutStage, UserLogoutStageFromJSON } from "../models/UserLogoutStage";
+import {
+    type UserLogoutStageRequest,
     UserLogoutStageRequestToJSON,
-    UserSettingFromJSON,
-    UserWriteStageFromJSON,
+} from "../models/UserLogoutStageRequest";
+import { type UserSetting, UserSettingFromJSON } from "../models/UserSetting";
+import { type UserTypeEnum } from "../models/UserTypeEnum";
+import { type UserVerificationEnum } from "../models/UserVerificationEnum";
+import { type UserWriteStage, UserWriteStageFromJSON } from "../models/UserWriteStage";
+import {
+    type UserWriteStageRequest,
     UserWriteStageRequestToJSON,
-    WebAuthnDeviceTypeFromJSON,
-} from "../models/index";
+} from "../models/UserWriteStageRequest";
+import { type WebAuthnDeviceType, WebAuthnDeviceTypeFromJSON } from "../models/WebAuthnDeviceType";
 import * as runtime from "../runtime";
 
 export interface StagesAccountLockdownCreateRequest {
@@ -1512,7 +1654,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/account_lockdown/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -1678,7 +1820,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/account_lockdown/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -1751,7 +1893,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/account_lockdown/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -1830,7 +1972,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/account_lockdown/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -1902,7 +2044,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/account_lockdown/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -1970,7 +2112,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/all/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2108,7 +2250,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/all/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2223,7 +2365,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/all/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2409,7 +2551,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2464,7 +2606,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/enrollment_status/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2543,7 +2685,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/import_device_manual/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2613,7 +2755,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/import_devices_automatic/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2774,7 +2916,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2847,7 +2989,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2926,7 +3068,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -2999,7 +3141,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/duo/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3138,7 +3280,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3343,7 +3485,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3416,7 +3558,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3495,7 +3637,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3568,7 +3710,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/email/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3707,7 +3849,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/endpoint_gdtc/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3856,7 +3998,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/endpoint_gdtc/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -3929,7 +4071,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/endpoint_gdtc/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4008,7 +4150,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/endpoint_gdtc/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4081,7 +4223,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/endpoint_gdtc/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4220,7 +4362,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/sms/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4405,7 +4547,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/sms/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4478,7 +4620,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/sms/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4557,7 +4699,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/sms/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4630,7 +4772,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/sms/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4769,7 +4911,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/static/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -4934,7 +5076,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/static/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5007,7 +5149,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/static/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5086,7 +5228,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/static/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5159,7 +5301,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/static/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5298,7 +5440,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/totp/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5458,7 +5600,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/totp/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5531,7 +5673,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/totp/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5610,7 +5752,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/totp/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5683,7 +5825,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/totp/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5822,7 +5964,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/validate/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -5975,7 +6117,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/validate/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6048,7 +6190,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/validate/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6127,7 +6269,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/validate/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6200,7 +6342,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/validate/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6339,7 +6481,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/webauthn/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6490,7 +6632,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/webauthn_device_types/{aaguid}/`;
         urlPath = urlPath.replace(
-            `{${"aaguid"}}`,
+            "{aaguid}",
             encodeURIComponent(String(requestParameters["aaguid"])),
         );
 
@@ -6668,7 +6810,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/webauthn/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6741,7 +6883,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/webauthn/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6820,7 +6962,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/webauthn/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -6893,7 +7035,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/authenticator/webauthn/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7026,7 +7168,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/captcha/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7170,7 +7312,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/captcha/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7237,7 +7379,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/captcha/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7312,7 +7454,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/captcha/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7379,7 +7521,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/captcha/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7508,7 +7650,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/consent/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7660,7 +7802,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/consent/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7727,7 +7869,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/consent/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7802,7 +7944,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/consent/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7869,7 +8011,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/consent/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -7996,7 +8138,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/deny/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8144,7 +8286,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/deny/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8209,7 +8351,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/deny/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8282,7 +8424,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/deny/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8347,7 +8489,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/deny/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8474,7 +8616,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/dummy/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8622,7 +8764,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/dummy/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8687,7 +8829,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/dummy/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8760,7 +8902,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/dummy/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8825,7 +8967,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/dummy/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -8952,7 +9094,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9141,7 +9283,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9206,7 +9348,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9330,7 +9472,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/email/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9395,7 +9537,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/email/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9524,7 +9666,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/endpoints/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9664,7 +9806,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/endpoints/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9737,7 +9879,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/endpoints/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9812,7 +9954,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/endpoints/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -9879,7 +10021,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/endpoints/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -10008,7 +10150,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/identification/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -10185,7 +10327,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/identification/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -10258,7 +10400,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/identification/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -10337,7 +10479,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/identification/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -10404,7 +10546,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/identification/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -10539,7 +10681,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/invitations/{invite_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"invite_uuid"}}`,
+            "{invite_uuid}",
             encodeURIComponent(String(requestParameters["inviteUuid"])),
         );
 
@@ -10696,7 +10838,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/invitations/{invite_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"invite_uuid"}}`,
+            "{invite_uuid}",
             encodeURIComponent(String(requestParameters["inviteUuid"])),
         );
 
@@ -10765,7 +10907,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/invitations/{invite_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"invite_uuid"}}`,
+            "{invite_uuid}",
             encodeURIComponent(String(requestParameters["inviteUuid"])),
         );
 
@@ -10842,7 +10984,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/invitations/{invite_uuid}/send_email/`;
         urlPath = urlPath.replace(
-            `{${"invite_uuid"}}`,
+            "{invite_uuid}",
             encodeURIComponent(String(requestParameters["inviteUuid"])),
         );
 
@@ -10916,7 +11058,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/invitations/{invite_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"invite_uuid"}}`,
+            "{invite_uuid}",
             encodeURIComponent(String(requestParameters["inviteUuid"])),
         );
 
@@ -10985,7 +11127,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/invitations/{invite_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"invite_uuid"}}`,
+            "{invite_uuid}",
             encodeURIComponent(String(requestParameters["inviteUuid"])),
         );
 
@@ -11122,7 +11264,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11276,7 +11418,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11349,7 +11491,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11428,7 +11570,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11499,7 +11641,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/invitation/stages/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11632,7 +11774,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/mtls/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11793,7 +11935,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/mtls/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11862,7 +12004,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/mtls/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -11937,7 +12079,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/mtls/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12004,7 +12146,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/mtls/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12133,7 +12275,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/password/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12286,7 +12428,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/password/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12358,7 +12500,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/password/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12433,7 +12575,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/password/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12500,7 +12642,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/password/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -12627,7 +12769,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/prompts/{prompt_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"prompt_uuid"}}`,
+            "{prompt_uuid}",
             encodeURIComponent(String(requestParameters["promptUuid"])),
         );
 
@@ -12783,7 +12925,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/prompts/{prompt_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"prompt_uuid"}}`,
+            "{prompt_uuid}",
             encodeURIComponent(String(requestParameters["promptUuid"])),
         );
 
@@ -12921,7 +13063,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/prompts/{prompt_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"prompt_uuid"}}`,
+            "{prompt_uuid}",
             encodeURIComponent(String(requestParameters["promptUuid"])),
         );
 
@@ -12997,7 +13139,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/prompts/{prompt_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"prompt_uuid"}}`,
+            "{prompt_uuid}",
             encodeURIComponent(String(requestParameters["promptUuid"])),
         );
 
@@ -13062,7 +13204,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/prompts/{prompt_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"prompt_uuid"}}`,
+            "{prompt_uuid}",
             encodeURIComponent(String(requestParameters["promptUuid"])),
         );
 
@@ -13193,7 +13335,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13345,7 +13487,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13414,7 +13556,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13487,7 +13629,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/stages/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13552,7 +13694,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/prompt/stages/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13685,7 +13827,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/redirect/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13825,7 +13967,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/redirect/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13897,7 +14039,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/redirect/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -13972,7 +14114,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/redirect/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14039,7 +14181,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/redirect/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14166,7 +14308,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/source/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14318,7 +14460,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/source/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14383,7 +14525,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/source/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14456,7 +14598,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/source/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14521,7 +14663,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/source/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14650,7 +14792,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_delete/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14794,7 +14936,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_delete/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14867,7 +15009,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_delete/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -14942,7 +15084,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_delete/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15009,7 +15151,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_delete/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15138,7 +15280,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_login/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15307,7 +15449,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_login/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15380,7 +15522,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_login/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15455,7 +15597,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_login/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15522,7 +15664,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_login/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15651,7 +15793,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_logout/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15795,7 +15937,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_logout/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15868,7 +16010,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_logout/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -15943,7 +16085,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_logout/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -16010,7 +16152,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_logout/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -16139,7 +16281,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_write/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -16304,7 +16446,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_write/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -16377,7 +16519,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_write/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -16452,7 +16594,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_write/{stage_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
@@ -16519,7 +16661,7 @@ export class StagesApi extends runtime.BaseAPI {
 
         let urlPath = `/stages/user_write/{stage_uuid}/used_by/`;
         urlPath = urlPath.replace(
-            `{${"stage_uuid"}}`,
+            "{stage_uuid}",
             encodeURIComponent(String(requestParameters["stageUuid"])),
         );
 
diff --git a/packages/client-ts/src/apis/TasksApi.ts b/packages/client-ts/src/apis/TasksApi.ts
index 0dc0bfaf0f..9da1dd0d61 100644
--- a/packages/client-ts/src/apis/TasksApi.ts
+++ b/packages/client-ts/src/apis/TasksApi.ts
@@ -12,28 +12,22 @@
  * Do not edit the class manually.
  */
 
-import type {
-    GlobalTaskStatus,
-    PaginatedScheduleList,
-    PaginatedTaskList,
-    PatchedScheduleRequest,
-    Schedule,
-    ScheduleRequest,
-    Task,
-    TaskAggregatedStatusEnum,
-    TaskStatusEnum,
-    Worker,
-} from "../models/index";
+import { type GlobalTaskStatus, GlobalTaskStatusFromJSON } from "../models/GlobalTaskStatus";
 import {
-    GlobalTaskStatusFromJSON,
+    type PaginatedScheduleList,
     PaginatedScheduleListFromJSON,
-    PaginatedTaskListFromJSON,
+} from "../models/PaginatedScheduleList";
+import { type PaginatedTaskList, PaginatedTaskListFromJSON } from "../models/PaginatedTaskList";
+import {
+    type PatchedScheduleRequest,
     PatchedScheduleRequestToJSON,
-    ScheduleFromJSON,
-    ScheduleRequestToJSON,
-    TaskFromJSON,
-    WorkerFromJSON,
-} from "../models/index";
+} from "../models/PatchedScheduleRequest";
+import { type Schedule, ScheduleFromJSON } from "../models/Schedule";
+import { type ScheduleRequest, ScheduleRequestToJSON } from "../models/ScheduleRequest";
+import { type Task, TaskFromJSON } from "../models/Task";
+import { type TaskAggregatedStatusEnum } from "../models/TaskAggregatedStatusEnum";
+import { type TaskStatusEnum } from "../models/TaskStatusEnum";
+import { type Worker, WorkerFromJSON } from "../models/Worker";
 import * as runtime from "../runtime";
 
 export interface TasksSchedulesListRequest {
@@ -218,7 +212,7 @@ export class TasksApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/tasks/schedules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -281,7 +275,7 @@ export class TasksApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/tasks/schedules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -340,7 +334,7 @@ export class TasksApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/tasks/schedules/{id}/send/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -409,7 +403,7 @@ export class TasksApi extends runtime.BaseAPI {
         }
 
         let urlPath = `/tasks/schedules/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -573,7 +567,7 @@ export class TasksApi extends runtime.BaseAPI {
 
         let urlPath = `/tasks/tasks/{message_id}/`;
         urlPath = urlPath.replace(
-            `{${"message_id"}}`,
+            "{message_id}",
             encodeURIComponent(String(requestParameters["messageId"])),
         );
 
@@ -635,7 +629,7 @@ export class TasksApi extends runtime.BaseAPI {
 
         let urlPath = `/tasks/tasks/{message_id}/retry/`;
         urlPath = urlPath.replace(
-            `{${"message_id"}}`,
+            "{message_id}",
             encodeURIComponent(String(requestParameters["messageId"])),
         );
 
diff --git a/packages/client-ts/src/apis/TenantsApi.ts b/packages/client-ts/src/apis/TenantsApi.ts
index d897b558c5..3c5cde016d 100644
--- a/packages/client-ts/src/apis/TenantsApi.ts
+++ b/packages/client-ts/src/apis/TenantsApi.ts
@@ -12,32 +12,38 @@
  * Do not edit the class manually.
  */
 
-import type {
-    Domain,
-    DomainRequest,
-    PaginatedDomainList,
-    PaginatedTenantList,
-    PatchedDomainRequest,
-    PatchedTenantRequest,
-    Tenant,
-    TenantAdminGroupRequestRequest,
-    TenantRecoveryKeyRequestRequest,
-    TenantRecoveryKeyResponse,
-    TenantRequest,
-} from "../models/index";
+import { type Domain, DomainFromJSON } from "../models/Domain";
+import { type DomainRequest, DomainRequestToJSON } from "../models/DomainRequest";
 import {
-    DomainFromJSON,
-    DomainRequestToJSON,
+    type PaginatedDomainList,
     PaginatedDomainListFromJSON,
+} from "../models/PaginatedDomainList";
+import {
+    type PaginatedTenantList,
     PaginatedTenantListFromJSON,
+} from "../models/PaginatedTenantList";
+import {
+    type PatchedDomainRequest,
     PatchedDomainRequestToJSON,
+} from "../models/PatchedDomainRequest";
+import {
+    type PatchedTenantRequest,
     PatchedTenantRequestToJSON,
+} from "../models/PatchedTenantRequest";
+import { type Tenant, TenantFromJSON } from "../models/Tenant";
+import {
+    type TenantAdminGroupRequestRequest,
     TenantAdminGroupRequestRequestToJSON,
-    TenantFromJSON,
+} from "../models/TenantAdminGroupRequestRequest";
+import {
+    type TenantRecoveryKeyRequestRequest,
     TenantRecoveryKeyRequestRequestToJSON,
+} from "../models/TenantRecoveryKeyRequestRequest";
+import {
+    type TenantRecoveryKeyResponse,
     TenantRecoveryKeyResponseFromJSON,
-    TenantRequestToJSON,
-} from "../models/index";
+} from "../models/TenantRecoveryKeyResponse";
+import { type TenantRequest, TenantRequestToJSON } from "../models/TenantRequest";
 import * as runtime from "../runtime";
 
 export interface TenantsDomainsCreateRequest {
@@ -184,7 +190,7 @@ export class TenantsApi extends runtime.BaseAPI {
         const headerParameters: runtime.HTTPHeaders = {};
 
         let urlPath = `/tenants/domains/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -299,7 +305,7 @@ export class TenantsApi extends runtime.BaseAPI {
         headerParameters["Content-Type"] = "application/json";
 
         let urlPath = `/tenants/domains/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -355,7 +361,7 @@ export class TenantsApi extends runtime.BaseAPI {
         const headerParameters: runtime.HTTPHeaders = {};
 
         let urlPath = `/tenants/domains/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -416,7 +422,7 @@ export class TenantsApi extends runtime.BaseAPI {
         headerParameters["Content-Type"] = "application/json";
 
         let urlPath = `/tenants/domains/{id}/`;
-        urlPath = urlPath.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters["id"])));
+        urlPath = urlPath.replace("{id}", encodeURIComponent(String(requestParameters["id"])));
 
         return {
             path: urlPath,
@@ -533,7 +539,7 @@ export class TenantsApi extends runtime.BaseAPI {
 
         let urlPath = `/tenants/tenants/{tenant_uuid}/create_admin_group/`;
         urlPath = urlPath.replace(
-            `{${"tenant_uuid"}}`,
+            "{tenant_uuid}",
             encodeURIComponent(String(requestParameters["tenantUuid"])),
         );
 
@@ -600,7 +606,7 @@ export class TenantsApi extends runtime.BaseAPI {
 
         let urlPath = `/tenants/tenants/{tenant_uuid}/create_recovery_key/`;
         urlPath = urlPath.replace(
-            `{${"tenant_uuid"}}`,
+            "{tenant_uuid}",
             encodeURIComponent(String(requestParameters["tenantUuid"])),
         );
 
@@ -664,7 +670,7 @@ export class TenantsApi extends runtime.BaseAPI {
 
         let urlPath = `/tenants/tenants/{tenant_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"tenant_uuid"}}`,
+            "{tenant_uuid}",
             encodeURIComponent(String(requestParameters["tenantUuid"])),
         );
 
@@ -782,7 +788,7 @@ export class TenantsApi extends runtime.BaseAPI {
 
         let urlPath = `/tenants/tenants/{tenant_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"tenant_uuid"}}`,
+            "{tenant_uuid}",
             encodeURIComponent(String(requestParameters["tenantUuid"])),
         );
 
@@ -841,7 +847,7 @@ export class TenantsApi extends runtime.BaseAPI {
 
         let urlPath = `/tenants/tenants/{tenant_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"tenant_uuid"}}`,
+            "{tenant_uuid}",
             encodeURIComponent(String(requestParameters["tenantUuid"])),
         );
 
@@ -905,7 +911,7 @@ export class TenantsApi extends runtime.BaseAPI {
 
         let urlPath = `/tenants/tenants/{tenant_uuid}/`;
         urlPath = urlPath.replace(
-            `{${"tenant_uuid"}}`,
+            "{tenant_uuid}",
             encodeURIComponent(String(requestParameters["tenantUuid"])),
         );
 
diff --git a/packages/client-ts/src/runtime.ts b/packages/client-ts/src/runtime.ts
index 3d93396a91..67d60d12ac 100644
--- a/packages/client-ts/src/runtime.ts
+++ b/packages/client-ts/src/runtime.ts
@@ -94,10 +94,8 @@ export const DefaultConfig = new Configuration();
  * This is the base class for all generated API classes.
  */
 export class BaseAPI {
-    private static readonly jsonRegex = new RegExp(
-        "^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$",
-        "i",
-    );
+    private static readonly jsonRegex =
+        /^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$/i;
     private middleware: Middleware[];
 
     constructor(protected configuration = DefaultConfig) {