diff --git a/schema.yml b/schema.yml
index 436453b63..97dfea93f 100644
--- a/schema.yml
+++ b/schema.yml
@@ -86,13 +86,7 @@ paths:
                 $ref: '#/components/schemas/Task'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Task not found
   /api/v2beta/admin/system_tasks/{id}/retry/:
     post:
       operationId: admin_system_tasks_retry_create
@@ -122,29 +116,11 @@ paths:
       - cookieAuth: []
       responses:
         '204':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Task retried successfully
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Task not found
         '500':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Failed to retry task
   /api/v2beta/admin/version/:
     get:
       operationId: admin_version_list
@@ -1142,21 +1118,9 @@ paths:
       - cookieAuth: []
       responses:
         '204':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Access granted
         '403':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Access denied
   /api/v2beta/core/applications/{slug}/metrics/:
     get:
       operationId: core_applications_metrics_list
@@ -1206,21 +1170,9 @@ paths:
       - cookieAuth: []
       responses:
         '200':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Success
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/core/groups/:
     get:
       operationId: core_groups_list
@@ -1624,13 +1576,7 @@ paths:
                 $ref: '#/components/schemas/TokenView'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Token not found or expired
   /api/v2beta/core/user_consent/:
     get:
       operationId: core_user_consent_list
@@ -1970,13 +1916,7 @@ paths:
                 $ref: '#/components/schemas/Link'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: No recovery flow found.
   /api/v2beta/core/users/me/:
     get:
       operationId: core_users_me_retrieve
@@ -2267,13 +2207,7 @@ paths:
                 $ref: '#/components/schemas/CertificateKeyPair'
           description: ''
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/events/events/:
     get:
       operationId: events_events_list
@@ -3032,14 +2966,8 @@ paths:
               schema:
                 $ref: '#/components/schemas/NotificationTransportTest'
           description: ''
-        '503':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+        '500':
+          description: Failed to test transport
   /api/v2beta/flows/bindings/:
     get:
       operationId: flows_bindings_list
@@ -3298,13 +3226,7 @@ paths:
                 $ref: '#/components/schemas/Challenge'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: No Token found
     post:
       operationId: flows_executor_solve
       description: Solve the previously retrieved challenge and advanced to the next
@@ -3585,13 +3507,7 @@ paths:
                 $ref: '#/components/schemas/Link'
           description: ''
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Flow not applicable
   /api/v2beta/flows/instances/{slug}/export/:
     get:
       operationId: flows_instances_export_retrieve
@@ -3613,9 +3529,8 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
+                type: string
+                format: binary
           description: null
   /api/v2beta/flows/instances/{slug}/set_background/:
     post:
@@ -3641,21 +3556,9 @@ paths:
       - cookieAuth: []
       responses:
         '200':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Success
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/flows/instances/cache_clear/:
     post:
       operationId: flows_instances_cache_clear_create
@@ -3667,21 +3570,9 @@ paths:
       - cookieAuth: []
       responses:
         '204':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Successfully cleared cache
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/flows/instances/cache_info/:
     get:
       operationId: flows_instances_cache_info_retrieve
@@ -3716,21 +3607,9 @@ paths:
       - cookieAuth: []
       responses:
         '204':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Successfully imported flow
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/oauth2/authorization_codes/:
     get:
       operationId: oauth2_authorization_codes_list
@@ -5162,13 +5041,7 @@ paths:
                 $ref: '#/components/schemas/PolicyTestResult'
           description: ''
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Invalid parameters
   /api/v2beta/policies/all/cache_clear/:
     post:
       operationId: policies_all_cache_clear_create
@@ -5180,21 +5053,9 @@ paths:
       - cookieAuth: []
       responses:
         '204':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Successfully cleared cache
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/policies/all/cache_info/:
     get:
       operationId: policies_all_cache_info_retrieve
@@ -7164,13 +7025,7 @@ paths:
                 $ref: '#/components/schemas/PropertyMappingTestResult'
           description: ''
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Invalid parameters
   /api/v2beta/propertymappings/all/types/:
     get:
       operationId: propertymappings_all_types_list
@@ -8209,13 +8064,7 @@ paths:
                 $ref: '#/components/schemas/OAuth2ProviderSetupURLs'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Provider has no application assigned
   /api/v2beta/providers/proxy/:
     get:
       operationId: providers_proxy_list
@@ -8597,13 +8446,7 @@ paths:
                 $ref: '#/components/schemas/SAMLMetadata'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Provider has no application assigned
   /api/v2beta/providers/saml/import_metadata/:
     post:
       operationId: providers_saml_import_metadata_create
@@ -8621,21 +8464,9 @@ paths:
       - cookieAuth: []
       responses:
         '204':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Successfully imported provider
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Bad request
   /api/v2beta/root/config/:
     get:
       operationId: root_config_list
@@ -9116,13 +8947,7 @@ paths:
                 $ref: '#/components/schemas/Task'
           description: ''
         '404':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Task not found
   /api/v2beta/sources/oauth/:
     get:
       operationId: sources_oauth_list
@@ -9710,21 +9535,9 @@ paths:
                 $ref: '#/components/schemas/RedirectChallenge'
           description: ''
         '400':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Token not found
         '403':
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties: {}
-                description: Unspecified response body
-          description: ''
+          description: Access denied
   /api/v2beta/sources/saml/:
     get:
       operationId: sources_saml_list
@@ -13946,9 +13759,6 @@ components:
       - POST
       - POST_AUTO
       type: string
-    BlankEnum:
-      enum:
-      - ''
     Cache:
       type: object
       description: Generic cache stats for an object
@@ -14091,7 +13901,7 @@ components:
         is currently active
       properties:
         type:
-          $ref: '#/components/schemas/Type4f1Enum'
+          $ref: '#/components/schemas/ChallengeChoices'
         component:
           type: string
         title:
@@ -14106,6 +13916,12 @@ components:
               $ref: '#/components/schemas/ErrorDetail'
       required:
       - type
+    ChallengeChoices:
+      enum:
+      - native
+      - shell
+      - redirect
+      type: string
     ClientTypeEnum:
       enum:
       - confidential
@@ -14655,21 +14471,19 @@ components:
           type: integer
           readOnly: true
         action:
+          allOf:
+          - $ref: '#/components/schemas/ActionEnum'
           description: Match created events with this action type. When left empty,
             all action types will be matched.
-          oneOf:
-          - $ref: '#/components/schemas/ActionEnum'
-          - $ref: '#/components/schemas/BlankEnum'
         client_ip:
           type: string
           description: Matches Event's Client IP (strict matching, for network matching
             use an Expression Policy)
         app:
+          allOf:
+          - $ref: '#/components/schemas/AppEnum'
           description: Match events created by selected application. When left empty,
             all applications are matched.
-          oneOf:
-          - $ref: '#/components/schemas/AppEnum'
-          - $ref: '#/components/schemas/BlankEnum'
       required:
       - bound_to
       - component
@@ -14688,21 +14502,19 @@ components:
           description: When this option is enabled, all executions of this policy
             will be logged. By default, only execution errors are logged.
         action:
+          allOf:
+          - $ref: '#/components/schemas/ActionEnum'
           description: Match created events with this action type. When left empty,
             all action types will be matched.
-          oneOf:
-          - $ref: '#/components/schemas/ActionEnum'
-          - $ref: '#/components/schemas/BlankEnum'
         client_ip:
           type: string
           description: Matches Event's Client IP (strict matching, for network matching
             use an Expression Policy)
         app:
+          allOf:
+          - $ref: '#/components/schemas/AppEnum'
           description: Match events created by selected application. When left empty,
             all applications are matched.
-          oneOf:
-          - $ref: '#/components/schemas/AppEnum'
-          - $ref: '#/components/schemas/BlankEnum'
     EventRequest:
       type: object
       description: Event Serializer
@@ -14866,7 +14678,7 @@ components:
             format: uuid
           readOnly: true
         cache_count:
-          type: string
+          type: integer
           readOnly: true
         policy_engine_mode:
           $ref: '#/components/schemas/PolicyEngineModeEnum'
@@ -15813,31 +15625,6 @@ components:
       - urn:oasis:names:tc:SAML:2.0:nameid-format:WindowsDomainQualifiedName
       - urn:oasis:names:tc:SAML:2.0:nameid-format:transient
       type: string
-    Nested:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        token:
-          type: string
-          maxLength: 16
-        device:
-          allOf:
-          - $ref: '#/components/schemas/Nested'
-          readOnly: true
-      required:
-      - device
-      - id
-      - token
-    NestedRequest:
-      type: object
-      properties:
-        token:
-          type: string
-          maxLength: 16
-      required:
-      - token
     NotConfiguredActionEnum:
       enum:
       - skip
@@ -18417,21 +18204,19 @@ components:
           description: When this option is enabled, all executions of this policy
             will be logged. By default, only execution errors are logged.
         action:
+          allOf:
+          - $ref: '#/components/schemas/ActionEnum'
           description: Match created events with this action type. When left empty,
             all action types will be matched.
-          oneOf:
-          - $ref: '#/components/schemas/ActionEnum'
-          - $ref: '#/components/schemas/BlankEnum'
         client_ip:
           type: string
           description: Matches Event's Client IP (strict matching, for network matching
             use an Expression Policy)
         app:
+          allOf:
+          - $ref: '#/components/schemas/AppEnum'
           description: Match events created by selected application. When left empty,
             all applications are matched.
-          oneOf:
-          - $ref: '#/components/schemas/AppEnum'
-          - $ref: '#/components/schemas/BlankEnum'
     PatchedExpressionPolicyRequest:
       type: object
       description: Group Membership Policy Serializer
@@ -19409,6 +19194,10 @@ components:
           type: string
           description: The human-readable name of this device.
           maxLength: 64
+        token_set:
+          type: array
+          items:
+            type: integer
     PatchedTOTPDeviceRequest:
       type: object
       description: Serializer for totp authenticator devices
@@ -20295,7 +20084,7 @@ components:
       description: Challenge type to redirect the client
       properties:
         type:
-          $ref: '#/components/schemas/Type4f1Enum'
+          $ref: '#/components/schemas/ChallengeChoices'
         component:
           type: string
         title:
@@ -21122,8 +20911,7 @@ components:
         token_set:
           type: array
           items:
-            $ref: '#/components/schemas/Nested'
-          readOnly: true
+            type: integer
         pk:
           type: integer
           readOnly: true
@@ -21140,8 +20928,13 @@ components:
           type: string
           description: The human-readable name of this device.
           maxLength: 64
+        token_set:
+          type: array
+          items:
+            type: integer
       required:
       - name
+      - token_set
     StatusEnum:
       enum:
       - SUCCESSFUL
@@ -21297,12 +21090,6 @@ components:
           readOnly: true
       required:
       - key
-    Type4f1Enum:
-      enum:
-      - native
-      - shell
-      - redirect
-      type: string
     TypeCreate:
       type: object
       description: Types of an object that can be created
diff --git a/web/src/pages/admin-overview/cards/BackupStatusCard.ts b/web/src/pages/admin-overview/cards/BackupStatusCard.ts
index 707cd1e90..18ff32088 100644
--- a/web/src/pages/admin-overview/cards/BackupStatusCard.ts
+++ b/web/src/pages/admin-overview/cards/BackupStatusCard.ts
@@ -1,20 +1,20 @@
 import { t } from "@lingui/macro";
 import { customElement, html, TemplateResult } from "lit-element";
 import { AdminStatus, AdminStatusCard } from "./AdminStatusCard";
-import { AdminApi, TaskStatusEnum } from "authentik-api";
+import { AdminApi, StatusEnum } from "authentik-api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import { convertToTitle } from "../../../utils";
 
 @customElement("ak-admin-status-card-backup")
-export class BackupStatusCard extends AdminStatusCard<TaskStatusEnum> {
+export class BackupStatusCard extends AdminStatusCard<StatusEnum> {
 
-    getPrimaryValue(): Promise<TaskStatusEnum> {
-        return new AdminApi(DEFAULT_CONFIG).adminSystemTasksRead({
+    getPrimaryValue(): Promise<StatusEnum> {
+        return new AdminApi(DEFAULT_CONFIG).adminSystemTasksRetrieve({
             id: "backup_database"
         }).then((value) => {
             return value.status;
         }).catch(() => {
-            return TaskStatusEnum.Error;
+            return StatusEnum.Error;
         });
     }
 
@@ -22,14 +22,14 @@ export class BackupStatusCard extends AdminStatusCard<TaskStatusEnum> {
         return html`${convertToTitle(this.value?.toString() || "")}`;
     }
 
-    getStatus(value: TaskStatusEnum): Promise<AdminStatus> {
+    getStatus(value: StatusEnum): Promise<AdminStatus> {
         switch (value) {
-            case TaskStatusEnum.Warning:
+            case StatusEnum.Warning:
                 return Promise.resolve<AdminStatus>({
                     icon: "fa fa-exclamation-triangle pf-m-warning",
                     message: t`Backup finished with warnings.`,
                 });
-            case TaskStatusEnum.Error:
+            case StatusEnum.Error:
                 return Promise.resolve<AdminStatus>({
                     icon: "fa fa-times-circle pf-m-danger",
                     message: t`Backup finished with errors.`,
diff --git a/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts b/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
index 934f937ef..fac4532db 100644
--- a/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
+++ b/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
@@ -1,6 +1,6 @@
 import { t } from "@lingui/macro";
 import { customElement } from "lit-element";
-import { SourcesApi, TaskStatusEnum } from "authentik-api";
+import { SourcesApi, StatusEnum } from "authentik-api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
 import "../../../elements/forms/ConfirmationForm";
 import { AKChart } from "../../../elements/charts/Chart";
@@ -38,10 +38,10 @@ export class LDAPSyncStatusChart extends AKChart<LDAPSyncStats> {
         let unsynced = 0;
         await Promise.all(sources.results.map(async (element) => {
             try {
-                const health = await api.sourcesLdapSyncStatus({
+                const health = await api.sourcesLdapSyncStatusRetrieve({
                     slug: element.slug,
                 });
-                if (health.status !== TaskStatusEnum.Successful) {
+                if (health.status !== StatusEnum.Successful) {
                     failed += 1;
                 }
                 const now = new Date().getTime();
diff --git a/web/src/pages/applications/ApplicationForm.ts b/web/src/pages/applications/ApplicationForm.ts
index 2e027a1bf..4f451d5a9 100644
--- a/web/src/pages/applications/ApplicationForm.ts
+++ b/web/src/pages/applications/ApplicationForm.ts
@@ -18,7 +18,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class ApplicationForm extends ModelForm<Application, string> {
 
     loadInstance(pk: string): Promise<Application> {
-        return new CoreApi(DEFAULT_CONFIG).coreApplicationsRead({
+        return new CoreApi(DEFAULT_CONFIG).coreApplicationsRetrieve({
             slug: pk
         });
     }
diff --git a/web/src/pages/applications/ApplicationViewPage.ts b/web/src/pages/applications/ApplicationViewPage.ts
index 44fd12555..56099ebbb 100644
--- a/web/src/pages/applications/ApplicationViewPage.ts
+++ b/web/src/pages/applications/ApplicationViewPage.ts
@@ -26,7 +26,7 @@ export class ApplicationViewPage extends LitElement {
 
     @property()
     set applicationSlug(value: string) {
-        new CoreApi(DEFAULT_CONFIG).coreApplicationsRead({
+        new CoreApi(DEFAULT_CONFIG).coreApplicationsRetrieve({
             slug: value
         }).then((app) => {
             this.application = app;
diff --git a/web/src/pages/crypto/CertificateKeyPairForm.ts b/web/src/pages/crypto/CertificateKeyPairForm.ts
index d44a7ac79..4f003d3ff 100644
--- a/web/src/pages/crypto/CertificateKeyPairForm.ts
+++ b/web/src/pages/crypto/CertificateKeyPairForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class CertificateKeyPairForm extends ModelForm<CertificateKeyPair, string> {
 
     loadInstance(pk: string): Promise<CertificateKeyPair> {
-        return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsRead({
+        return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsRetrieve({
             kpUuid: pk,
         });
     }
diff --git a/web/src/pages/events/EventInfoPage.ts b/web/src/pages/events/EventInfoPage.ts
index 7a9aa17aa..069e5ef3f 100644
--- a/web/src/pages/events/EventInfoPage.ts
+++ b/web/src/pages/events/EventInfoPage.ts
@@ -16,7 +16,7 @@ export class EventInfoPage extends LitElement {
 
     @property()
     set eventID(value: string) {
-        new EventsApi(DEFAULT_CONFIG).eventsEventsRead({
+        new EventsApi(DEFAULT_CONFIG).eventsEventsRetrieve({
             eventUuid: value
         }).then((ev) => {
             this.event = ev as EventWithContext;
diff --git a/web/src/pages/events/RuleForm.ts b/web/src/pages/events/RuleForm.ts
index d931d4bdc..7d988b9e4 100644
--- a/web/src/pages/events/RuleForm.ts
+++ b/web/src/pages/events/RuleForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class RuleForm extends ModelForm<NotificationRule, string> {
 
     loadInstance(pk: string): Promise<NotificationRule> {
-        return new EventsApi(DEFAULT_CONFIG).eventsRulesRead({
+        return new EventsApi(DEFAULT_CONFIG).eventsRulesRetrieve({
             pbmUuid: pk,
         });
     }
diff --git a/web/src/pages/events/TransportForm.ts b/web/src/pages/events/TransportForm.ts
index 5daaf7cd3..bf0be2c17 100644
--- a/web/src/pages/events/TransportForm.ts
+++ b/web/src/pages/events/TransportForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class TransportForm extends ModelForm<NotificationTransport, string> {
 
     loadInstance(pk: string): Promise<NotificationTransport> {
-        return new EventsApi(DEFAULT_CONFIG).eventsTransportsRead({
+        return new EventsApi(DEFAULT_CONFIG).eventsTransportsRetrieve({
             uuid: pk,
         });
     }
diff --git a/web/src/pages/flows/FlowForm.ts b/web/src/pages/flows/FlowForm.ts
index 077c5063a..0fe02d0bb 100644
--- a/web/src/pages/flows/FlowForm.ts
+++ b/web/src/pages/flows/FlowForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class FlowForm extends ModelForm<Flow, string> {
 
     loadInstance(pk: string): Promise<Flow> {
-        return new FlowsApi(DEFAULT_CONFIG).flowsInstancesRead({
+        return new FlowsApi(DEFAULT_CONFIG).flowsInstancesRetrieve({
             slug: pk,
         });
     }
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts
index 1d4a68327..2361c943d 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/pages/flows/FlowViewPage.ts
@@ -23,7 +23,7 @@ import PFGallery from "@patternfly/patternfly/layouts/Gallery/gallery.css";
 export class FlowViewPage extends LitElement {
     @property()
     set flowSlug(value: string) {
-        new FlowsApi(DEFAULT_CONFIG).flowsInstancesRead({
+        new FlowsApi(DEFAULT_CONFIG).flowsInstancesRetrieve({
             slug: value
         }).then((flow) => {
             this.flow = flow;
diff --git a/web/src/pages/flows/StageBindingForm.ts b/web/src/pages/flows/StageBindingForm.ts
index b206a11ff..89e966e41 100644
--- a/web/src/pages/flows/StageBindingForm.ts
+++ b/web/src/pages/flows/StageBindingForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class StageBindingForm extends ModelForm<FlowStageBinding, string> {
 
     loadInstance(pk: string): Promise<FlowStageBinding> {
-        return new FlowsApi(DEFAULT_CONFIG).flowsBindingsRead({
+        return new FlowsApi(DEFAULT_CONFIG).flowsBindingsRetrieve({
             fsbUuid: pk,
         });
     }
diff --git a/web/src/pages/groups/GroupForm.ts b/web/src/pages/groups/GroupForm.ts
index 1a11548ff..703c137bb 100644
--- a/web/src/pages/groups/GroupForm.ts
+++ b/web/src/pages/groups/GroupForm.ts
@@ -18,7 +18,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class GroupForm extends ModelForm<Group, string> {
 
     loadInstance(pk: string): Promise<Group> {
-        return new CoreApi(DEFAULT_CONFIG).coreGroupsRead({
+        return new CoreApi(DEFAULT_CONFIG).coreGroupsRetrieve({
             groupUuid: pk
         });
     }
diff --git a/web/src/pages/outposts/OutpostForm.ts b/web/src/pages/outposts/OutpostForm.ts
index cdafde68a..a3656ed20 100644
--- a/web/src/pages/outposts/OutpostForm.ts
+++ b/web/src/pages/outposts/OutpostForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class OutpostForm extends ModelForm<Outpost, string> {
 
     loadInstance(pk: string): Promise<Outpost> {
-        return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesRead({
+        return new OutpostsApi(DEFAULT_CONFIG).outpostsInstancesRetrieve({
             uuid: pk
         });
     }
diff --git a/web/src/pages/outposts/ServiceConnectionDockerForm.ts b/web/src/pages/outposts/ServiceConnectionDockerForm.ts
index 0c55ee0d3..516c881f6 100644
--- a/web/src/pages/outposts/ServiceConnectionDockerForm.ts
+++ b/web/src/pages/outposts/ServiceConnectionDockerForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnection, string> {
 
     loadInstance(pk: string): Promise<DockerServiceConnection> {
-        return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerRead({
+        return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerRetrieve({
             uuid: pk,
         });
     }
diff --git a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
index db68af807..800055d5d 100644
--- a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
+++ b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class ServiceConnectionKubernetesForm extends ModelForm<KubernetesServiceConnection, string> {
 
     loadInstance(pk: string): Promise<KubernetesServiceConnection> {
-        return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesRead({
+        return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesRetrieve({
             uuid: pk,
         });
     }
diff --git a/web/src/pages/policies/PolicyBindingForm.ts b/web/src/pages/policies/PolicyBindingForm.ts
index 67fd9a702..3cfa3bcd7 100644
--- a/web/src/pages/policies/PolicyBindingForm.ts
+++ b/web/src/pages/policies/PolicyBindingForm.ts
@@ -19,7 +19,7 @@ enum target {
 export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
 
     loadInstance(pk: string): Promise<PolicyBinding> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsRetrieve({
             policyBindingUuid: pk
         }).then(binding => {
             if (binding?.policyObj) {
diff --git a/web/src/pages/policies/dummy/DummyPolicyForm.ts b/web/src/pages/policies/dummy/DummyPolicyForm.ts
index cef3bf67e..7a4f681e2 100644
--- a/web/src/pages/policies/dummy/DummyPolicyForm.ts
+++ b/web/src/pages/policies/dummy/DummyPolicyForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class DummyPolicyForm extends ModelForm<DummyPolicy, string> {
 
     loadInstance(pk: string): Promise<DummyPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesDummyRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesDummyRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
index 2c1279205..b67eaa7be 100644
--- a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
+++ b/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class EventMatcherPolicyForm extends ModelForm<EventMatcherPolicy, string> {
 
     loadInstance(pk: string): Promise<EventMatcherPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts b/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
index cfb404bb3..348fb8ee2 100644
--- a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
+++ b/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class PasswordExpiryPolicyForm extends ModelForm<PasswordExpiryPolicy, string> {
 
     loadInstance(pk: string): Promise<PasswordExpiryPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/policies/expression/ExpressionPolicyForm.ts b/web/src/pages/policies/expression/ExpressionPolicyForm.ts
index bb44eb97d..9c9d89f21 100644
--- a/web/src/pages/policies/expression/ExpressionPolicyForm.ts
+++ b/web/src/pages/policies/expression/ExpressionPolicyForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class ExpressionPolicyForm extends ModelForm<ExpressionPolicy, string> {
 
     loadInstance(pk: string): Promise<ExpressionPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts b/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
index 813ee70dc..aa1316991 100644
--- a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
+++ b/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class HaveIBeenPwnedPolicyForm extends ModelForm<HaveIBeenPwendPolicy, string> {
 
     loadInstance(pk: string): Promise<HaveIBeenPwendPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesHaveibeenpwnedRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesHaveibeenpwnedRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/policies/password/PasswordPolicyForm.ts b/web/src/pages/policies/password/PasswordPolicyForm.ts
index 15ace51c0..38a2e8318 100644
--- a/web/src/pages/policies/password/PasswordPolicyForm.ts
+++ b/web/src/pages/policies/password/PasswordPolicyForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class PasswordPolicyForm extends ModelForm<PasswordPolicy, string> {
 
     loadInstance(pk: string): Promise<PasswordPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/policies/reputation/ReputationPolicyForm.ts b/web/src/pages/policies/reputation/ReputationPolicyForm.ts
index 1b606ba09..2557fa93d 100644
--- a/web/src/pages/policies/reputation/ReputationPolicyForm.ts
+++ b/web/src/pages/policies/reputation/ReputationPolicyForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class ReputationPolicyForm extends ModelForm<ReputationPolicy, string> {
 
     loadInstance(pk: string): Promise<ReputationPolicy> {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesReputationRead({
+        return new PoliciesApi(DEFAULT_CONFIG).policiesReputationRetrieve({
             policyUuid: pk,
         });
     }
diff --git a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts b/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
index 66a865263..8e750bea4 100644
--- a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class PropertyMappingLDAPForm extends ModelForm<LDAPPropertyMapping, string> {
 
     loadInstance(pk: string): Promise<LDAPPropertyMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsLdapRead({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsLdapRetrieve({
             pmUuid: pk,
         });
     }
diff --git a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts b/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
index 2c87a523b..81198df19 100644
--- a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 @customElement("ak-property-mapping-saml-form")
 export class PropertyMappingLDAPForm extends ModelForm<SAMLPropertyMapping, string> {
     loadInstance(pk: string): Promise<SAMLPropertyMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlRead({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlRetrieve({
             pmUuid: pk,
         });
     }
diff --git a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
index 56c2d9262..c77aa284b 100644
--- a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
@@ -12,7 +12,7 @@ import "../../elements/CodeMirror";
 export class PropertyMappingScopeForm extends ModelForm<ScopeMapping, string> {
 
     loadInstance(pk: string): Promise<ScopeMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeRead({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeRetrieve({
             pmUuid: pk,
         });
     }
diff --git a/web/src/pages/providers/ProviderViewPage.ts b/web/src/pages/providers/ProviderViewPage.ts
index 20c27aa23..521a86538 100644
--- a/web/src/pages/providers/ProviderViewPage.ts
+++ b/web/src/pages/providers/ProviderViewPage.ts
@@ -17,7 +17,7 @@ export class ProviderViewPage extends LitElement {
 
     @property({type: Number})
     set providerID(value: number) {
-        new ProvidersApi(DEFAULT_CONFIG).providersAllRead({
+        new ProvidersApi(DEFAULT_CONFIG).providersAllRetrieve({
             id: value,
         }).then((prov) => (this.provider = prov));
     }
diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/pages/providers/ldap/LDAPProviderForm.ts
index 9f1e8b6e3..3cfb46420 100644
--- a/web/src/pages/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/pages/providers/ldap/LDAPProviderForm.ts
@@ -14,7 +14,7 @@ import { first } from "../../../utils";
 export class LDAPProviderFormPage extends ModelForm<LDAPProvider, number> {
 
     loadInstance(pk: number): Promise<LDAPProvider> {
-        return new ProvidersApi(DEFAULT_CONFIG).providersLdapRead({
+        return new ProvidersApi(DEFAULT_CONFIG).providersLdapRetrieve({
             id: pk,
         });
     }
diff --git a/web/src/pages/providers/ldap/LDAPProviderViewPage.ts b/web/src/pages/providers/ldap/LDAPProviderViewPage.ts
index 0f7a05768..548ba82bd 100644
--- a/web/src/pages/providers/ldap/LDAPProviderViewPage.ts
+++ b/web/src/pages/providers/ldap/LDAPProviderViewPage.ts
@@ -33,7 +33,7 @@ export class LDAPProviderViewPage extends LitElement {
 
     @property({type: Number})
     set providerID(value: number) {
-        new ProvidersApi(DEFAULT_CONFIG).providersLdapRead({
+        new ProvidersApi(DEFAULT_CONFIG).providersLdapRetrieve({
             id: value,
         }).then((prov) => (this.provider = prov));
     }
diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
index eb720b3e4..9ce3d4fe7 100644
--- a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
+++ b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
@@ -14,7 +14,7 @@ import { first, randomString } from "../../../utils";
 export class OAuth2ProviderFormPage extends ModelForm<OAuth2Provider, number> {
 
     loadInstance(pk: number): Promise<OAuth2Provider> {
-        return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Read({
+        return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Retrieve({
             id: pk,
         }).then(provider => {
             this.showClientSecret = provider.clientType === OAuth2ProviderClientTypeEnum.Confidential;
diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts b/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
index 8fdb63ba5..f2fcdf68e 100644
--- a/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
+++ b/web/src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
@@ -32,7 +32,7 @@ export class OAuth2ProviderViewPage extends LitElement {
     @property({type: Number})
     set providerID(value: number) {
         const api = new ProvidersApi(DEFAULT_CONFIG);
-        api.providersOauth2Read({
+        api.providersOauth2Retrieve({
             id: value
         }).then((prov) => {
             this.provider = prov;
diff --git a/web/src/pages/providers/proxy/ProxyProviderForm.ts b/web/src/pages/providers/proxy/ProxyProviderForm.ts
index adb3412bb..4e592e995 100644
--- a/web/src/pages/providers/proxy/ProxyProviderForm.ts
+++ b/web/src/pages/providers/proxy/ProxyProviderForm.ts
@@ -14,7 +14,7 @@ import { first } from "../../../utils";
 export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
 
     loadInstance(pk: number): Promise<ProxyProvider> {
-        return new ProvidersApi(DEFAULT_CONFIG).providersProxyRead({
+        return new ProvidersApi(DEFAULT_CONFIG).providersProxyRetrieve({
             id: pk,
         }).then(provider => {
             this.showHttpBasic = first(provider.basicAuthEnabled, true);
diff --git a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts b/web/src/pages/providers/proxy/ProxyProviderViewPage.ts
index c0d0c0365..77260fb51 100644
--- a/web/src/pages/providers/proxy/ProxyProviderViewPage.ts
+++ b/web/src/pages/providers/proxy/ProxyProviderViewPage.ts
@@ -31,7 +31,7 @@ export class ProxyProviderViewPage extends LitElement {
 
     @property({type: Number})
     set providerID(value: number) {
-        new ProvidersApi(DEFAULT_CONFIG).providersProxyRead({
+        new ProvidersApi(DEFAULT_CONFIG).providersProxyRetrieve({
             id: value,
         }).then((prov) => (this.provider = prov));
     }
diff --git a/web/src/pages/providers/saml/SAMLProviderForm.ts b/web/src/pages/providers/saml/SAMLProviderForm.ts
index 3adedebea..99e35f4a1 100644
--- a/web/src/pages/providers/saml/SAMLProviderForm.ts
+++ b/web/src/pages/providers/saml/SAMLProviderForm.ts
@@ -14,7 +14,7 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
 
     loadInstance(pk: number): Promise<SAMLProvider> {
         console.log("reading saml provider");
-        return new ProvidersApi(DEFAULT_CONFIG).providersSamlRead({
+        return new ProvidersApi(DEFAULT_CONFIG).providersSamlRetrieve({
             id: pk,
         });
     }
diff --git a/web/src/pages/providers/saml/SAMLProviderViewPage.ts b/web/src/pages/providers/saml/SAMLProviderViewPage.ts
index 014e9feea..1ecb3cc8e 100644
--- a/web/src/pages/providers/saml/SAMLProviderViewPage.ts
+++ b/web/src/pages/providers/saml/SAMLProviderViewPage.ts
@@ -36,7 +36,7 @@ export class SAMLProviderViewPage extends LitElement {
 
     @property({type: Number})
     set providerID(value: number) {
-        new ProvidersApi(DEFAULT_CONFIG).providersSamlRead({
+        new ProvidersApi(DEFAULT_CONFIG).providersSamlRetrieve({
             id: value,
         }).then((prov) => (this.provider = prov));
     }
diff --git a/web/src/pages/sources/SourceViewPage.ts b/web/src/pages/sources/SourceViewPage.ts
index 7041d54d2..b802548b5 100644
--- a/web/src/pages/sources/SourceViewPage.ts
+++ b/web/src/pages/sources/SourceViewPage.ts
@@ -17,7 +17,7 @@ export class SourceViewPage extends LitElement {
 
     @property({ type: String })
     set sourceSlug(slug: string) {
-        new SourcesApi(DEFAULT_CONFIG).sourcesAllRead({
+        new SourcesApi(DEFAULT_CONFIG).sourcesAllRetrieve({
             slug: slug
         }).then((source) => {
             this.source = source;
diff --git a/web/src/pages/sources/ldap/LDAPSourceForm.ts b/web/src/pages/sources/ldap/LDAPSourceForm.ts
index 8d1da3d3a..5473d0f06 100644
--- a/web/src/pages/sources/ldap/LDAPSourceForm.ts
+++ b/web/src/pages/sources/ldap/LDAPSourceForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class LDAPSourceForm extends ModelForm<LDAPSource, string> {
 
     loadInstance(pk: string): Promise<LDAPSource> {
-        return new SourcesApi(DEFAULT_CONFIG).sourcesLdapRead({
+        return new SourcesApi(DEFAULT_CONFIG).sourcesLdapRetrieve({
             slug: pk,
         });
     }
diff --git a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
index 11db0d025..10d4f5a21 100644
--- a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
+++ b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
@@ -30,7 +30,7 @@ export class LDAPSourceViewPage extends LitElement {
 
     @property({ type: String })
     set sourceSlug(slug: string) {
-        new SourcesApi(DEFAULT_CONFIG).sourcesLdapRead({
+        new SourcesApi(DEFAULT_CONFIG).sourcesLdapRetrieve({
             slug: slug
         }).then((source) => {
             this.source = source;
diff --git a/web/src/pages/sources/oauth/OAuthSourceForm.ts b/web/src/pages/sources/oauth/OAuthSourceForm.ts
index de7d66630..63b40aaf9 100644
--- a/web/src/pages/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/pages/sources/oauth/OAuthSourceForm.ts
@@ -15,7 +15,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
 
     loadInstance(pk: string): Promise<OAuthSource> {
-        return new SourcesApi(DEFAULT_CONFIG).sourcesOauthRead({
+        return new SourcesApi(DEFAULT_CONFIG).sourcesOauthRetrieve({
             slug: pk,
         }).then(source => {
             this.showUrlOptions = first(source.type?.urlsCustomizable, false);
diff --git a/web/src/pages/sources/oauth/OAuthSourceViewPage.ts b/web/src/pages/sources/oauth/OAuthSourceViewPage.ts
index b4f9bb498..f2176bd51 100644
--- a/web/src/pages/sources/oauth/OAuthSourceViewPage.ts
+++ b/web/src/pages/sources/oauth/OAuthSourceViewPage.ts
@@ -29,7 +29,7 @@ export class OAuthSourceViewPage extends LitElement {
 
     @property({ type: String })
     set sourceSlug(value: string) {
-        new SourcesApi(DEFAULT_CONFIG).sourcesOauthRead({
+        new SourcesApi(DEFAULT_CONFIG).sourcesOauthRetrieve({
             slug: value
         }).then((source) => {
             this.source = source;
diff --git a/web/src/pages/sources/plex/PlexSourceForm.ts b/web/src/pages/sources/plex/PlexSourceForm.ts
index 404f83d44..c0ad21155 100644
--- a/web/src/pages/sources/plex/PlexSourceForm.ts
+++ b/web/src/pages/sources/plex/PlexSourceForm.ts
@@ -16,7 +16,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class PlexSourceForm extends ModelForm<PlexSource, string> {
 
     loadInstance(pk: string): Promise<PlexSource> {
-        return new SourcesApi(DEFAULT_CONFIG).sourcesPlexRead({
+        return new SourcesApi(DEFAULT_CONFIG).sourcesPlexRetrieve({
             slug: pk,
         }).then(source => {
             this.plexToken = source.plexToken;
diff --git a/web/src/pages/sources/plex/PlexSourceViewPage.ts b/web/src/pages/sources/plex/PlexSourceViewPage.ts
index 556c610e3..6593595c8 100644
--- a/web/src/pages/sources/plex/PlexSourceViewPage.ts
+++ b/web/src/pages/sources/plex/PlexSourceViewPage.ts
@@ -29,7 +29,7 @@ export class PlexSourceViewPage extends LitElement {
 
     @property({ type: String })
     set sourceSlug(value: string) {
-        new SourcesApi(DEFAULT_CONFIG).sourcesPlexRead({
+        new SourcesApi(DEFAULT_CONFIG).sourcesPlexRetrieve({
             slug: value
         }).then((source) => {
             this.source = source;
diff --git a/web/src/pages/sources/saml/SAMLSourceForm.ts b/web/src/pages/sources/saml/SAMLSourceForm.ts
index a20695c4b..777c4a940 100644
--- a/web/src/pages/sources/saml/SAMLSourceForm.ts
+++ b/web/src/pages/sources/saml/SAMLSourceForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
 
     loadInstance(pk: string): Promise<SAMLSource> {
-        return new SourcesApi(DEFAULT_CONFIG).sourcesSamlRead({
+        return new SourcesApi(DEFAULT_CONFIG).sourcesSamlRetrieve({
             slug: pk,
         });
     }
diff --git a/web/src/pages/sources/saml/SAMLSourceViewPage.ts b/web/src/pages/sources/saml/SAMLSourceViewPage.ts
index 2449f2c65..15f5b7c71 100644
--- a/web/src/pages/sources/saml/SAMLSourceViewPage.ts
+++ b/web/src/pages/sources/saml/SAMLSourceViewPage.ts
@@ -32,7 +32,7 @@ export class SAMLSourceViewPage extends LitElement {
 
     @property({ type: String })
     set sourceSlug(slug: string) {
-        new SourcesApi(DEFAULT_CONFIG).sourcesSamlRead({
+        new SourcesApi(DEFAULT_CONFIG).sourcesSamlRetrieve({
             slug: slug
         }).then((source) => {
             this.source = source;
diff --git a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
index 243583d59..5a88db784 100644
--- a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
+++ b/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class AuthenticatorStaticStageForm extends ModelForm<AuthenticatorStaticStage, string> {
 
     loadInstance(pk: string): Promise<AuthenticatorStaticStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
index b92164768..6be5c63b9 100644
--- a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
+++ b/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class AuthenticatorTOTPStageForm extends ModelForm<AuthenticatorTOTPStage, string> {
 
     loadInstance(pk: string): Promise<AuthenticatorTOTPStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
index 8314a5f08..fc5c3ae07 100644
--- a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
+++ b/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class AuthenticatorValidateStageForm extends ModelForm<AuthenticatorValidateStage, string> {
 
     loadInstance(pk: string): Promise<AuthenticatorValidateStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateRetrieve({
             stageUuid: pk,
         }).then(stage => {
             this.showConfigureFlow = stage.notConfiguredAction === AuthenticatorValidateStageNotConfiguredActionEnum.Configure;
diff --git a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts b/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
index 0b449b019..3469d4b37 100644
--- a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
+++ b/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class AuthenticateWebAuthnStageForm extends ModelForm<AuthenticateWebAuthnStage, string> {
 
     loadInstance(pk: string): Promise<AuthenticateWebAuthnStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/captcha/CaptchaStageForm.ts b/web/src/pages/stages/captcha/CaptchaStageForm.ts
index 8d84252c2..b6ab2c591 100644
--- a/web/src/pages/stages/captcha/CaptchaStageForm.ts
+++ b/web/src/pages/stages/captcha/CaptchaStageForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class CaptchaStageForm extends ModelForm<CaptchaStage, string> {
 
     loadInstance(pk: string): Promise<CaptchaStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesCaptchaRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesCaptchaRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/consent/ConsentStageForm.ts b/web/src/pages/stages/consent/ConsentStageForm.ts
index c1776f77b..033655787 100644
--- a/web/src/pages/stages/consent/ConsentStageForm.ts
+++ b/web/src/pages/stages/consent/ConsentStageForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class ConsentStageForm extends ModelForm<ConsentStage, string> {
 
     loadInstance(pk: string): Promise<ConsentStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesConsentRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesConsentRetrieve({
             stageUuid: pk,
         }).then(stage => {
             this.showExpiresIn = stage.name === ConsentStageModeEnum.Expiring;
diff --git a/web/src/pages/stages/deny/DenyStageForm.ts b/web/src/pages/stages/deny/DenyStageForm.ts
index 9b261a25c..c3b0a2f7d 100644
--- a/web/src/pages/stages/deny/DenyStageForm.ts
+++ b/web/src/pages/stages/deny/DenyStageForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class DenyStageForm extends ModelForm<DenyStage, string> {
 
     loadInstance(pk: string): Promise<DenyStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesDenyRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesDenyRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/dummy/DummyStageForm.ts b/web/src/pages/stages/dummy/DummyStageForm.ts
index b753efec5..7793883bf 100644
--- a/web/src/pages/stages/dummy/DummyStageForm.ts
+++ b/web/src/pages/stages/dummy/DummyStageForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class DummyStageForm extends ModelForm<DummyStage, string> {
 
     loadInstance(pk: string): Promise<DummyStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesDummyRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesDummyRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/email/EmailStageForm.ts b/web/src/pages/stages/email/EmailStageForm.ts
index d7d82a424..1f5c44fe2 100644
--- a/web/src/pages/stages/email/EmailStageForm.ts
+++ b/web/src/pages/stages/email/EmailStageForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class EmailStageForm extends ModelForm<EmailStage, string> {
 
     loadInstance(pk: string): Promise<EmailStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesEmailRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesEmailRetrieve({
             stageUuid: pk,
         }).then(stage => {
             this.showConnectionSettings = !stage.useGlobalSettings;
diff --git a/web/src/pages/stages/identification/IdentificationStageForm.ts b/web/src/pages/stages/identification/IdentificationStageForm.ts
index 5ced5259c..590033e6e 100644
--- a/web/src/pages/stages/identification/IdentificationStageForm.ts
+++ b/web/src/pages/stages/identification/IdentificationStageForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class IdentificationStageForm extends ModelForm<IdentificationStage, string> {
 
     loadInstance(pk: string): Promise<IdentificationStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesIdentificationRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesIdentificationRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/invitation/InvitationForm.ts b/web/src/pages/stages/invitation/InvitationForm.ts
index 76b3065ce..d9487c1fa 100644
--- a/web/src/pages/stages/invitation/InvitationForm.ts
+++ b/web/src/pages/stages/invitation/InvitationForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class InvitationForm extends ModelForm<Invitation, string> {
 
     loadInstance(pk: string): Promise<Invitation> {
-        return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsRetrieve({
             inviteUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/invitation/InvitationStageForm.ts b/web/src/pages/stages/invitation/InvitationStageForm.ts
index 659758134..a4b86b1ff 100644
--- a/web/src/pages/stages/invitation/InvitationStageForm.ts
+++ b/web/src/pages/stages/invitation/InvitationStageForm.ts
@@ -13,7 +13,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class InvitationStageForm extends ModelForm<InvitationStage, string> {
 
     loadInstance(pk: string): Promise<InvitationStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/password/PasswordStageForm.ts b/web/src/pages/stages/password/PasswordStageForm.ts
index 4b8981eba..19b826144 100644
--- a/web/src/pages/stages/password/PasswordStageForm.ts
+++ b/web/src/pages/stages/password/PasswordStageForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class PasswordStageForm extends ModelForm<PasswordStage, string> {
 
     loadInstance(pk: string): Promise<PasswordStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesPasswordRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesPasswordRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/prompt/PromptForm.ts b/web/src/pages/stages/prompt/PromptForm.ts
index fab889bee..75a478c4d 100644
--- a/web/src/pages/stages/prompt/PromptForm.ts
+++ b/web/src/pages/stages/prompt/PromptForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class PromptForm extends ModelForm<Prompt, string> {
 
     loadInstance(pk: string): Promise<Prompt> {
-        return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsRetrieve({
             promptUuid: pk
         });
     }
diff --git a/web/src/pages/stages/prompt/PromptStageForm.ts b/web/src/pages/stages/prompt/PromptStageForm.ts
index 89711f639..4ae078d9f 100644
--- a/web/src/pages/stages/prompt/PromptStageForm.ts
+++ b/web/src/pages/stages/prompt/PromptStageForm.ts
@@ -15,7 +15,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class PromptStageForm extends ModelForm<PromptStage, string> {
 
     loadInstance(pk: string): Promise<PromptStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts b/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
index 2e03e7aca..a483bd767 100644
--- a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
+++ b/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class UserDeleteStageForm extends ModelForm<UserDeleteStage, string> {
 
     loadInstance(pk: string): Promise<UserDeleteStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/user_login/UserLoginStageForm.ts b/web/src/pages/stages/user_login/UserLoginStageForm.ts
index aacf23666..52df581c2 100644
--- a/web/src/pages/stages/user_login/UserLoginStageForm.ts
+++ b/web/src/pages/stages/user_login/UserLoginStageForm.ts
@@ -12,7 +12,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class UserLoginStageForm extends ModelForm<UserLoginStage, string> {
 
     loadInstance(pk: string): Promise<UserLoginStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesUserLoginRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesUserLoginRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts b/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
index 2bf3da413..64693214e 100644
--- a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
+++ b/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class UserLogoutStageForm extends ModelForm<UserLogoutStage, string> {
 
     loadInstance(pk: string): Promise<UserLogoutStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/stages/user_write/UserWriteStageForm.ts b/web/src/pages/stages/user_write/UserWriteStageForm.ts
index cb8c7b31d..502ccd6fa 100644
--- a/web/src/pages/stages/user_write/UserWriteStageForm.ts
+++ b/web/src/pages/stages/user_write/UserWriteStageForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class UserWriteStageForm extends ModelForm<UserWriteStage, string> {
 
     loadInstance(pk: string): Promise<UserWriteStage> {
-        return new StagesApi(DEFAULT_CONFIG).stagesUserWriteRead({
+        return new StagesApi(DEFAULT_CONFIG).stagesUserWriteRetrieve({
             stageUuid: pk,
         });
     }
diff --git a/web/src/pages/user-settings/tokens/UserTokenForm.ts b/web/src/pages/user-settings/tokens/UserTokenForm.ts
index 8fad96109..299cecfda 100644
--- a/web/src/pages/user-settings/tokens/UserTokenForm.ts
+++ b/web/src/pages/user-settings/tokens/UserTokenForm.ts
@@ -11,7 +11,7 @@ import { ModelForm } from "../../../elements/forms/ModelForm";
 export class UserTokenForm extends ModelForm<Token, string> {
 
     loadInstance(pk: string): Promise<Token> {
-        return new CoreApi(DEFAULT_CONFIG).coreTokensRead({
+        return new CoreApi(DEFAULT_CONFIG).coreTokensRetrieve({
             identifier: pk
         });
     }
diff --git a/web/src/pages/users/UserForm.ts b/web/src/pages/users/UserForm.ts
index 2f5c72761..6a9c2a011 100644
--- a/web/src/pages/users/UserForm.ts
+++ b/web/src/pages/users/UserForm.ts
@@ -14,7 +14,7 @@ import { ModelForm } from "../../elements/forms/ModelForm";
 export class UserForm extends ModelForm<User, number> {
 
     loadInstance(pk: number): Promise<User> {
-        return new CoreApi(DEFAULT_CONFIG).coreUsersRead({
+        return new CoreApi(DEFAULT_CONFIG).coreUsersRetrieve({
             id: pk
         });
     }
diff --git a/web/src/pages/users/UserViewPage.ts b/web/src/pages/users/UserViewPage.ts
index 4f8d64051..3ed03e90d 100644
--- a/web/src/pages/users/UserViewPage.ts
+++ b/web/src/pages/users/UserViewPage.ts
@@ -38,7 +38,7 @@ export class UserViewPage extends LitElement {
 
     @property({ type: Number })
     set userId(id: number) {
-        new CoreApi(DEFAULT_CONFIG).coreUsersRead({
+        new CoreApi(DEFAULT_CONFIG).coreUsersRetrieve({
             id: id,
         }).then((user) => {
             this.user = user;