diff --git a/authentik/events/api/event.py b/authentik/events/api/event.py
index 5cf5e7992..d0c4e396d 100644
--- a/authentik/events/api/event.py
+++ b/authentik/events/api/event.py
@@ -118,7 +118,7 @@ class EventViewSet(ReadOnlyModelViewSet):
             )
         ],
     )
-    @action(detail=False, methods=["GET"])
+    @action(detail=False, methods=["GET"], pagination_class=None)
     def top_per_user(self, request: Request):
         """Get the top_n events grouped by user count"""
         filtered_action = request.query_params.get("action", EventAction.LOGIN)
diff --git a/schema.yml b/schema.yml
index 0d4e44d62..749e05217 100644
--- a/schema.yml
+++ b/schema.yml
@@ -2338,18 +2338,6 @@ paths:
         description: Which field to use when ordering the results.
         schema:
           type: string
-      - name: page
-        required: false
-        in: query
-        description: A page number within the paginated result set.
-        schema:
-          type: integer
-      - name: page_size
-        required: false
-        in: query
-        description: Number of results to return per page.
-        schema:
-          type: integer
       - name: search
         required: false
         in: query
@@ -2375,7 +2363,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/PaginatedEventTopPerUserList'
+                type: array
+                items:
+                  $ref: '#/components/schemas/EventTopPerUser'
           description: ''
   /api/v2beta/events/notifications/:
     get:
@@ -16760,41 +16750,6 @@ components:
       required:
       - pagination
       - results
-    PaginatedEventTopPerUserList:
-      type: object
-      properties:
-        pagination:
-          type: object
-          properties:
-            next:
-              type: number
-            previous:
-              type: number
-            count:
-              type: number
-            current:
-              type: number
-            total_pages:
-              type: number
-            start_index:
-              type: number
-            end_index:
-              type: number
-          required:
-          - next
-          - previous
-          - count
-          - current
-          - total_pages
-          - start_index
-          - end_index
-        results:
-          type: array
-          items:
-            $ref: '#/components/schemas/EventTopPerUser'
-      required:
-      - pagination
-      - results
     PaginatedExpiringBaseGrantModelList:
       type: object
       properties:
diff --git a/web/src/pages/admin-overview/TopApplicationsTable.ts b/web/src/pages/admin-overview/TopApplicationsTable.ts
index 9c42c8f9b..12e052ee6 100644
--- a/web/src/pages/admin-overview/TopApplicationsTable.ts
+++ b/web/src/pages/admin-overview/TopApplicationsTable.ts
@@ -18,7 +18,7 @@ export class TopApplicationsTable extends LitElement {
     }
 
     firstUpdated(): void {
-        new EventsApi(DEFAULT_CONFIG).eventsEventsTopPerUser({
+        new EventsApi(DEFAULT_CONFIG).eventsEventsTopPerUserList({
             action: "authorize_application",
             topN: 11,
         }).then((events) => {
diff --git a/web/src/pages/applications/ApplicationForm.ts b/web/src/pages/applications/ApplicationForm.ts
index 15dee4e2f..9070d20fd 100644
--- a/web/src/pages/applications/ApplicationForm.ts
+++ b/web/src/pages/applications/ApplicationForm.ts
@@ -115,7 +115,7 @@ export class ApplicationForm extends ModelForm<Application, string> {
                         <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
                     </button>
                     <ul class="pf-c-dropdown__menu" hidden>
-                        ${until(new ProvidersApi(DEFAULT_CONFIG).providersAllTypes().then((types) => {
+                        ${until(new ProvidersApi(DEFAULT_CONFIG).providersAllTypesList().then((types) => {
                             return types.map((type) => {
                                 return html`<li>
                                     <ak-forms-modal>
diff --git a/web/src/pages/crypto/CertificateGenerateForm.ts b/web/src/pages/crypto/CertificateGenerateForm.ts
index 5e6d86b87..4c479348e 100644
--- a/web/src/pages/crypto/CertificateGenerateForm.ts
+++ b/web/src/pages/crypto/CertificateGenerateForm.ts
@@ -1,4 +1,4 @@
-import { CertificateGeneration, CryptoApi } from "authentik-api";
+import { CertificateGenerationRequest, CryptoApi } from "authentik-api";
 import { CertificateKeyPair } from "authentik-api/src";
 import { t } from "@lingui/macro";
 import { customElement } from "lit-element";
@@ -8,15 +8,15 @@ import { Form } from "../../elements/forms/Form";
 import "../../elements/forms/HorizontalFormElement";
 
 @customElement("ak-crypto-certificate-generate-form")
-export class CertificateKeyPairForm extends Form<CertificateGeneration> {
+export class CertificateKeyPairForm extends Form<CertificateGenerationRequest> {
 
     getSuccessMessage(): string {
         return t`Successfully generated certificate-key pair.`;
     }
 
-    send = (data: CertificateGeneration): Promise<CertificateKeyPair> => {
-        return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsGenerate({
-            data: data
+    send = (data: CertificateGenerationRequest): Promise<CertificateKeyPair> => {
+        return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsGenerateCreate({
+            certificateGenerationRequest: data
         });
     };
 
diff --git a/web/src/pages/crypto/CertificateKeyPairForm.ts b/web/src/pages/crypto/CertificateKeyPairForm.ts
index 4f003d3ff..8eb6e1672 100644
--- a/web/src/pages/crypto/CertificateKeyPairForm.ts
+++ b/web/src/pages/crypto/CertificateKeyPairForm.ts
@@ -1,4 +1,4 @@
-import { CertificateKeyPair, CryptoApi } from "authentik-api";
+import { CertificateKeyPair, CertificateKeyPairRequest, CryptoApi } from "authentik-api";
 import { t } from "@lingui/macro";
 import { customElement } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -29,11 +29,11 @@ export class CertificateKeyPairForm extends ModelForm<CertificateKeyPair, string
         if (this.instance) {
             return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsPartialUpdate({
                 kpUuid: this.instance.pk || "",
-                data: data
+                patchedCertificateKeyPairRequest: data
             });
         } else {
             return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsCreate({
-                data: data
+                certificateKeyPairRequest: data as unknown as CertificateKeyPairRequest
             });
         }
     };
@@ -51,14 +51,14 @@ export class CertificateKeyPairForm extends ModelForm<CertificateKeyPair, string
                 name="certificateData"
                 ?writeOnly=${this.instance !== undefined}
                 ?required=${true}>
-                <textarea class="pf-c-form-control" required>${ifDefined(this.instance?.certificateData)}</textarea>
+                <textarea class="pf-c-form-control" required></textarea>
                 <p class="pf-c-form__helper-text">${t`PEM-encoded Certificate data.`}</p>
             </ak-form-element-horizontal>
             <ak-form-element-horizontal
                 name="keyData"
                 ?writeOnly=${this.instance !== undefined}
                 label=${t`Private Key`}>
-                <textarea class="pf-c-form-control" >${ifDefined(this.instance?.keyData)}</textarea>
+                <textarea class="pf-c-form-control" ></textarea>
                 <p class="pf-c-form__helper-text">${t`Optional Private Key. If this is set, you can use this keypair for encryption.`}</p>
             </ak-form-element-horizontal>
         </form>`;
diff --git a/web/src/pages/events/RuleForm.ts b/web/src/pages/events/RuleForm.ts
index 45bfe83ee..d8eac1583 100644
--- a/web/src/pages/events/RuleForm.ts
+++ b/web/src/pages/events/RuleForm.ts
@@ -29,11 +29,11 @@ export class RuleForm extends ModelForm<NotificationRule, string> {
         if (this.instance) {
             return new EventsApi(DEFAULT_CONFIG).eventsRulesUpdate({
                 pbmUuid: this.instance.pk || "",
-                data: data
+                notificationRuleRequest: data
             });
         } else {
             return new EventsApi(DEFAULT_CONFIG).eventsRulesCreate({
-                data: data
+                notificationRuleRequest: data
             });
         }
     };
diff --git a/web/src/pages/events/TransportForm.ts b/web/src/pages/events/TransportForm.ts
index bf0be2c17..37e02ee53 100644
--- a/web/src/pages/events/TransportForm.ts
+++ b/web/src/pages/events/TransportForm.ts
@@ -32,11 +32,11 @@ export class TransportForm extends ModelForm<NotificationTransport, string> {
         if (this.instance) {
             return new EventsApi(DEFAULT_CONFIG).eventsTransportsUpdate({
                 uuid: this.instance.pk || "",
-                data: data
+                notificationTransportRequest: data
             });
         } else {
             return new EventsApi(DEFAULT_CONFIG).eventsTransportsCreate({
-                data: data
+                notificationTransportRequest: data
             });
         }
     };
diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/pages/flows/BoundStagesList.ts
index 4af81f8c2..551af9ad7 100644
--- a/web/src/pages/flows/BoundStagesList.ts
+++ b/web/src/pages/flows/BoundStagesList.ts
@@ -141,7 +141,7 @@ export class BoundStagesList extends Table<FlowStageBinding> {
                 <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
             </button>
             <ul class="pf-c-dropdown__menu" hidden>
-                ${until(new StagesApi(DEFAULT_CONFIG).stagesAllTypes().then((types) => {
+                ${until(new StagesApi(DEFAULT_CONFIG).stagesAllTypesList().then((types) => {
                     return types.map((type) => {
                         return html`<li>
                             <ak-forms-modal>
diff --git a/web/src/pages/flows/FlowForm.ts b/web/src/pages/flows/FlowForm.ts
index e9658feeb..86cd345a8 100644
--- a/web/src/pages/flows/FlowForm.ts
+++ b/web/src/pages/flows/FlowForm.ts
@@ -29,17 +29,17 @@ export class FlowForm extends ModelForm<Flow, string> {
         if (this.instance) {
             writeOp = new FlowsApi(DEFAULT_CONFIG).flowsInstancesUpdate({
                 slug: this.instance.slug,
-                data: data
+                flowRequest: data
             });
         } else {
             writeOp = new FlowsApi(DEFAULT_CONFIG).flowsInstancesCreate({
-                data: data
+                flowRequest: data
             });
         }
         const background = this.getFormFile();
         if (background) {
             return writeOp.then(flow => {
-                return new FlowsApi(DEFAULT_CONFIG).flowsInstancesSetBackground({
+                return new FlowsApi(DEFAULT_CONFIG).flowsInstancesSetBackgroundCreate({
                     slug: flow.slug,
                     file: background
                 });
diff --git a/web/src/pages/flows/StageBindingForm.ts b/web/src/pages/flows/StageBindingForm.ts
index eca17d382..ecce2cd6d 100644
--- a/web/src/pages/flows/StageBindingForm.ts
+++ b/web/src/pages/flows/StageBindingForm.ts
@@ -33,11 +33,11 @@ export class StageBindingForm extends ModelForm<FlowStageBinding, string> {
         if (this.instance) {
             return new FlowsApi(DEFAULT_CONFIG).flowsBindingsUpdate({
                 fsbUuid: this.instance.pk || "",
-                data: data
+                flowStageBindingRequest: data
             });
         } else {
             return new FlowsApi(DEFAULT_CONFIG).flowsBindingsCreate({
-                data: data
+                flowStageBindingRequest: data
             });
         }
     };
diff --git a/web/src/pages/groups/GroupForm.ts b/web/src/pages/groups/GroupForm.ts
index 703c137bb..2592e6116 100644
--- a/web/src/pages/groups/GroupForm.ts
+++ b/web/src/pages/groups/GroupForm.ts
@@ -35,12 +35,12 @@ export class GroupForm extends ModelForm<Group, string> {
         if (this.instance?.pk) {
             return new CoreApi(DEFAULT_CONFIG).coreGroupsUpdate({
                 groupUuid: this.instance.pk || "",
-                data: data
+                groupRequest: data
             });
         } else {
             data.users = Array.from(this.instance?.users || []) as unknown as Set<number>;
             return new CoreApi(DEFAULT_CONFIG).coreGroupsCreate({
-                data: data
+                groupRequest: data
             });
         }
     };
diff --git a/web/src/pages/outposts/OutpostForm.ts b/web/src/pages/outposts/OutpostForm.ts
index a3656ed20..3271c1196 100644
--- a/web/src/pages/outposts/OutpostForm.ts
+++ b/web/src/pages/outposts/OutpostForm.ts
@@ -31,11 +31,11 @@ export class OutpostForm extends ModelForm<Outpost, string> {
         if (this.instance) {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsOutpostsUpdate({
                 uuid: this.instance.pk || "",
-                data: data
+                outpostRequest: data
             });
         } else {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsOutpostsCreate({
-                data: data
+                outpostRequest: data
             });
         }
     };
diff --git a/web/src/pages/outposts/ServiceConnectionDockerForm.ts b/web/src/pages/outposts/ServiceConnectionDockerForm.ts
index 516c881f6..de2284c28 100644
--- a/web/src/pages/outposts/ServiceConnectionDockerForm.ts
+++ b/web/src/pages/outposts/ServiceConnectionDockerForm.ts
@@ -30,11 +30,11 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
         if (this.instance) {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerUpdate({
                 uuid: this.instance.pk || "",
-                data: data
+                dockerServiceConnectionRequest: data
             });
         } else {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsDockerCreate({
-                data: data
+                dockerServiceConnectionRequest: data
             });
         }
     };
diff --git a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
index 800055d5d..b540a195d 100644
--- a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
+++ b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
@@ -31,11 +31,11 @@ export class ServiceConnectionKubernetesForm extends ModelForm<KubernetesService
         if (this.instance) {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesUpdate({
                 uuid: this.instance.pk || "",
-                data: data
+                kubernetesServiceConnectionRequest: data
             });
         } else {
             return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsKubernetesCreate({
-                data: data
+                kubernetesServiceConnectionRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/pages/policies/BoundPoliciesList.ts
index 2d4eaf0b7..61b4be6af 100644
--- a/web/src/pages/policies/BoundPoliciesList.ts
+++ b/web/src/pages/policies/BoundPoliciesList.ts
@@ -180,7 +180,7 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
                 <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
             </button>
             <ul class="pf-c-dropdown__menu" hidden>
-                ${until(new PoliciesApi(DEFAULT_CONFIG).policiesAllTypes().then((types) => {
+                ${until(new PoliciesApi(DEFAULT_CONFIG).policiesAllTypesList().then((types) => {
                     return types.map((type) => {
                         return html`<li>
                             <ak-forms-modal>
diff --git a/web/src/pages/policies/PolicyBindingForm.ts b/web/src/pages/policies/PolicyBindingForm.ts
index 3cfa3bcd7..7fc95eb87 100644
--- a/web/src/pages/policies/PolicyBindingForm.ts
+++ b/web/src/pages/policies/PolicyBindingForm.ts
@@ -64,11 +64,11 @@ export class PolicyBindingForm extends ModelForm<PolicyBinding, string> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsUpdate({
                 policyBindingUuid: this.instance.pk || "",
-                data: data
+                policyBindingRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsCreate({
-                data: data
+                policyBindingRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/PolicyListPage.ts b/web/src/pages/policies/PolicyListPage.ts
index c8eb49c7c..93c7a15f9 100644
--- a/web/src/pages/policies/PolicyListPage.ts
+++ b/web/src/pages/policies/PolicyListPage.ts
@@ -126,7 +126,7 @@ export class PolicyListPage extends TablePage<Policy> {
                     <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
                 </button>
                 <ul class="pf-c-dropdown__menu" hidden>
-                    ${until(new PoliciesApi(DEFAULT_CONFIG).policiesAllTypes().then((types) => {
+                    ${until(new PoliciesApi(DEFAULT_CONFIG).policiesAllTypesList().then((types) => {
                         return types.map((type) => {
                             return html`<li>
                                 <ak-forms-modal>
diff --git a/web/src/pages/policies/PolicyTestForm.ts b/web/src/pages/policies/PolicyTestForm.ts
index 89366c8ea..2ca9a6747 100644
--- a/web/src/pages/policies/PolicyTestForm.ts
+++ b/web/src/pages/policies/PolicyTestForm.ts
@@ -1,4 +1,4 @@
-import { CoreApi, PoliciesApi, Policy, PolicyTestResult } from "authentik-api";
+import { CoreApi, PoliciesApi, Policy, PolicyTestRequest, PolicyTestResult } from "authentik-api";
 import { t } from "@lingui/macro";
 import { customElement, property } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -8,11 +8,10 @@ import { until } from "lit-html/directives/until";
 import { ifDefined } from "lit-html/directives/if-defined";
 import "../../elements/forms/HorizontalFormElement";
 import "../../elements/CodeMirror";
-import { PolicyTest } from "authentik-api/src";
 import YAML from "yaml";
 
 @customElement("ak-policy-test-form")
-export class PolicyTestForm extends Form<PolicyTest> {
+export class PolicyTestForm extends Form<PolicyTestRequest> {
 
     @property({attribute: false})
     policy?: Policy;
@@ -24,10 +23,10 @@ export class PolicyTestForm extends Form<PolicyTest> {
         return t`Successfully sent test-request.`;
     }
 
-    send = (data: PolicyTest): Promise<PolicyTestResult> => {
-        return new PoliciesApi(DEFAULT_CONFIG).policiesAllTest({
+    send = (data: PolicyTestRequest): Promise<PolicyTestResult> => {
+        return new PoliciesApi(DEFAULT_CONFIG).policiesAllTestCreate({
             policyUuid: this.policy?.pk || "",
-            data: data
+            policyTestRequest: data
         }).then(result => this.result = result);
     };
 
diff --git a/web/src/pages/policies/dummy/DummyPolicyForm.ts b/web/src/pages/policies/dummy/DummyPolicyForm.ts
index 7a4f681e2..65ade8c03 100644
--- a/web/src/pages/policies/dummy/DummyPolicyForm.ts
+++ b/web/src/pages/policies/dummy/DummyPolicyForm.ts
@@ -30,11 +30,11 @@ export class DummyPolicyForm extends ModelForm<DummyPolicy, string> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesDummyUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                dummyPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesDummyCreate({
-                data: data
+                dummyPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts b/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
index b67eaa7be..1c19c4c14 100644
--- a/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
+++ b/web/src/pages/policies/event_matcher/EventMatcherPolicyForm.ts
@@ -31,11 +31,11 @@ export class EventMatcherPolicyForm extends ModelForm<EventMatcherPolicy, string
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                eventMatcherPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesEventMatcherCreate({
-                data: data
+                eventMatcherPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts b/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
index 348fb8ee2..600e2a875 100644
--- a/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
+++ b/web/src/pages/policies/expiry/ExpiryPolicyForm.ts
@@ -30,11 +30,11 @@ export class PasswordExpiryPolicyForm extends ModelForm<PasswordExpiryPolicy, st
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                passwordExpiryPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordExpiryCreate({
-                data: data
+                passwordExpiryPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/expression/ExpressionPolicyForm.ts b/web/src/pages/policies/expression/ExpressionPolicyForm.ts
index 9c9d89f21..28a42f831 100644
--- a/web/src/pages/policies/expression/ExpressionPolicyForm.ts
+++ b/web/src/pages/policies/expression/ExpressionPolicyForm.ts
@@ -31,11 +31,11 @@ export class ExpressionPolicyForm extends ModelForm<ExpressionPolicy, string> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                expressionPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesExpressionCreate({
-                data: data
+                expressionPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts b/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
index aa1316991..99c6a7410 100644
--- a/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
+++ b/web/src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts
@@ -30,11 +30,11 @@ export class HaveIBeenPwnedPolicyForm extends ModelForm<HaveIBeenPwendPolicy, st
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesHaveibeenpwnedUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                haveIBeenPwendPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesHaveibeenpwnedCreate({
-                data: data
+                haveIBeenPwendPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/password/PasswordPolicyForm.ts b/web/src/pages/policies/password/PasswordPolicyForm.ts
index 38a2e8318..1a8714ce1 100644
--- a/web/src/pages/policies/password/PasswordPolicyForm.ts
+++ b/web/src/pages/policies/password/PasswordPolicyForm.ts
@@ -30,11 +30,11 @@ export class PasswordPolicyForm extends ModelForm<PasswordPolicy, string> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                passwordPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesPasswordCreate({
-                data: data
+                passwordPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/policies/reputation/ReputationPolicyForm.ts b/web/src/pages/policies/reputation/ReputationPolicyForm.ts
index 2557fa93d..045308c06 100644
--- a/web/src/pages/policies/reputation/ReputationPolicyForm.ts
+++ b/web/src/pages/policies/reputation/ReputationPolicyForm.ts
@@ -30,11 +30,11 @@ export class ReputationPolicyForm extends ModelForm<ReputationPolicy, string> {
         if (this.instance) {
             return new PoliciesApi(DEFAULT_CONFIG).policiesReputationUpdate({
                 policyUuid: this.instance.pk || "",
-                data: data
+                reputationPolicyRequest: data
             });
         } else {
             return new PoliciesApi(DEFAULT_CONFIG).policiesReputationCreate({
-                data: data
+                reputationPolicyRequest: data
             });
         }
     };
diff --git a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts b/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
index 8e750bea4..22bd28651 100644
--- a/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingLDAPForm.ts
@@ -29,11 +29,11 @@ export class PropertyMappingLDAPForm extends ModelForm<LDAPPropertyMapping, stri
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsLdapUpdate({
                 pmUuid: this.instance.pk || "",
-                data: data
+                lDAPPropertyMappingRequest: data
             });
         } else {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsLdapCreate({
-                data: data
+                lDAPPropertyMappingRequest: data
             });
         }
     };
diff --git a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts b/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
index 81198df19..cf37e5c10 100644
--- a/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingSAMLForm.ts
@@ -28,11 +28,11 @@ export class PropertyMappingLDAPForm extends ModelForm<SAMLPropertyMapping, stri
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlUpdate({
                 pmUuid: this.instance.pk || "",
-                data: data
+                sAMLPropertyMappingRequest: data
             });
         } else {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlCreate({
-                data: data
+                sAMLPropertyMappingRequest: data
             });
         }
     };
diff --git a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
index c77aa284b..fb9056a47 100644
--- a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
@@ -29,11 +29,11 @@ export class PropertyMappingScopeForm extends ModelForm<ScopeMapping, string> {
         if (this.instance) {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeUpdate({
                 pmUuid: this.instance.pk || "",
-                data: data
+                scopeMappingRequest: data
             });
         } else {
             return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeCreate({
-                data: data
+                scopeMappingRequest: data
             });
         }
     };
diff --git a/web/src/pages/property-mappings/PropertyMappingTestForm.ts b/web/src/pages/property-mappings/PropertyMappingTestForm.ts
index b2b4df264..d66a32b13 100644
--- a/web/src/pages/property-mappings/PropertyMappingTestForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingTestForm.ts
@@ -1,4 +1,4 @@
-import { CoreApi, PropertyMapping, PropertymappingsApi, PropertyMappingTestResult } from "authentik-api";
+import { CoreApi, PolicyTestRequest, PropertyMapping, PropertymappingsApi, PropertyMappingTestResult } from "authentik-api";
 import { t } from "@lingui/macro";
 import { customElement, property } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -8,11 +8,10 @@ import { until } from "lit-html/directives/until";
 import { ifDefined } from "lit-html/directives/if-defined";
 import "../../elements/forms/HorizontalFormElement";
 import "../../elements/CodeMirror";
-import { PolicyTest } from "authentik-api/src";
 import YAML from "yaml";
 
 @customElement("ak-property-mapping-test-form")
-export class PolicyTestForm extends Form<PolicyTest> {
+export class PolicyTestForm extends Form<PolicyTestRequest> {
 
     @property({attribute: false})
     mapping?: PropertyMapping;
@@ -24,10 +23,10 @@ export class PolicyTestForm extends Form<PolicyTest> {
         return t`Successfully sent test-request.`;
     }
 
-    send = (data: PolicyTest): Promise<PropertyMappingTestResult> => {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllTest({
+    send = (data: PolicyTestRequest): Promise<PropertyMappingTestResult> => {
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllTestCreate({
             pmUuid: this.mapping?.pk || "",
-            data: data,
+            policyTestRequest: data,
             formatResult: true,
         }).then(result => this.result = result);
     };
diff --git a/web/src/pages/providers/ProviderListPage.ts b/web/src/pages/providers/ProviderListPage.ts
index 951f4368a..76c2865aa 100644
--- a/web/src/pages/providers/ProviderListPage.ts
+++ b/web/src/pages/providers/ProviderListPage.ts
@@ -110,7 +110,7 @@ export class ProviderListPage extends TablePage<Provider> {
                 <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
             </button>
             <ul class="pf-c-dropdown__menu" hidden>
-                ${until(new ProvidersApi(DEFAULT_CONFIG).providersAllTypes().then((types) => {
+                ${until(new ProvidersApi(DEFAULT_CONFIG).providersAllTypesList().then((types) => {
                     return types.map((type) => {
                         return html`<li>
                             <ak-forms-modal>
diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/pages/providers/ldap/LDAPProviderForm.ts
index 3cfb46420..304c8ffe7 100644
--- a/web/src/pages/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/pages/providers/ldap/LDAPProviderForm.ts
@@ -31,11 +31,11 @@ export class LDAPProviderFormPage extends ModelForm<LDAPProvider, number> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersLdapUpdate({
                 id: this.instance.pk || 0,
-                data: data
+                lDAPProviderRequest: data
             });
         } else {
             return new ProvidersApi(DEFAULT_CONFIG).providersLdapCreate({
-                data: data
+                lDAPProviderRequest: data
             });
         }
     };
diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
index 270cb37e2..0a07a505e 100644
--- a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
+++ b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
@@ -37,11 +37,11 @@ export class OAuth2ProviderFormPage extends ModelForm<OAuth2Provider, number> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Update({
                 id: this.instance.pk || 0,
-                data: data
+                oAuth2ProviderRequest: data
             });
         } else {
             return new ProvidersApi(DEFAULT_CONFIG).providersOauth2Create({
-                data: data
+                oAuth2ProviderRequest: data
             });
         }
     };
diff --git a/web/src/pages/providers/proxy/ProxyProviderForm.ts b/web/src/pages/providers/proxy/ProxyProviderForm.ts
index 4e592e995..9d9c85929 100644
--- a/web/src/pages/providers/proxy/ProxyProviderForm.ts
+++ b/web/src/pages/providers/proxy/ProxyProviderForm.ts
@@ -41,11 +41,11 @@ export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersProxyUpdate({
                 id: this.instance.pk || 0,
-                data: data
+                proxyProviderRequest: data
             });
         } else {
             return new ProvidersApi(DEFAULT_CONFIG).providersProxyCreate({
-                data: data
+                proxyProviderRequest: data
             });
         }
     };
diff --git a/web/src/pages/providers/saml/SAMLProviderForm.ts b/web/src/pages/providers/saml/SAMLProviderForm.ts
index cb2ebadb3..1554d3712 100644
--- a/web/src/pages/providers/saml/SAMLProviderForm.ts
+++ b/web/src/pages/providers/saml/SAMLProviderForm.ts
@@ -31,11 +31,11 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
         if (this.instance) {
             return new ProvidersApi(DEFAULT_CONFIG).providersSamlUpdate({
                 id: this.instance.pk || 0,
-                data: data
+                sAMLProviderRequest: data
             });
         } else {
             return new ProvidersApi(DEFAULT_CONFIG).providersSamlCreate({
-                data: data
+                sAMLProviderRequest: data
             });
         }
     };
diff --git a/web/src/pages/sources/ldap/LDAPSourceForm.ts b/web/src/pages/sources/ldap/LDAPSourceForm.ts
index 5473d0f06..84abd282c 100644
--- a/web/src/pages/sources/ldap/LDAPSourceForm.ts
+++ b/web/src/pages/sources/ldap/LDAPSourceForm.ts
@@ -1,4 +1,4 @@
-import { LDAPSource, SourcesApi, PropertymappingsApi } from "authentik-api";
+import { LDAPSource, SourcesApi, PropertymappingsApi, LDAPSourceRequest } from "authentik-api";
 import { t } from "@lingui/macro";
 import { customElement } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -31,11 +31,11 @@ export class LDAPSourceForm extends ModelForm<LDAPSource, string> {
         if (this.instance) {
             return new SourcesApi(DEFAULT_CONFIG).sourcesLdapPartialUpdate({
                 slug: this.instance.slug,
-                data: data
+                patchedLDAPSourceRequest: data
             });
         } else {
             return new SourcesApi(DEFAULT_CONFIG).sourcesLdapCreate({
-                data: data
+                lDAPSourceRequest: data as unknown as LDAPSourceRequest
             });
         }
     };
@@ -117,7 +117,7 @@ export class LDAPSourceForm extends ModelForm<LDAPSource, string> {
                         ?required=${true}
                         ?writeOnly=${this.instance !== undefined}
                         name="bindPassword">
-                        <input type="text" value="${ifDefined(this.instance?.bindPassword)}" class="pf-c-form-control" required>
+                        <input type="text" value="" class="pf-c-form-control" required>
                     </ak-form-element-horizontal>
                     <ak-form-element-horizontal
                         label=${t`Base DN`}
diff --git a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
index 9e207b523..94fc23c48 100644
--- a/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
+++ b/web/src/pages/sources/ldap/LDAPSourceViewPage.ts
@@ -161,7 +161,7 @@ export class LDAPSourceViewPage extends LitElement {
                                         .apiRequest=${() => {
                                             return new SourcesApi(DEFAULT_CONFIG).sourcesLdapPartialUpdate({
                                                 slug: this.source?.slug || "",
-                                                data: this.source,
+                                                patchedLDAPSourceRequest: this.source,
                                             });
                                         }}>
                                         ${t`Retry Task`}
diff --git a/web/src/pages/sources/oauth/OAuthSourceForm.ts b/web/src/pages/sources/oauth/OAuthSourceForm.ts
index e629dad28..ba6c03ccd 100644
--- a/web/src/pages/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/pages/sources/oauth/OAuthSourceForm.ts
@@ -1,4 +1,4 @@
-import { OAuthSource, SourcesApi, FlowsApi, FlowDesignationEnum, UserMatchingModeEnum } from "authentik-api";
+import { OAuthSource, SourcesApi, FlowsApi, FlowDesignationEnum, UserMatchingModeEnum, OAuthSourceRequest } from "authentik-api";
 import { t } from "@lingui/macro";
 import { customElement, property } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -44,11 +44,11 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
         if (this.instance) {
             return new SourcesApi(DEFAULT_CONFIG).sourcesOauthPartialUpdate({
                 slug: this.instance.slug,
-                data: data
+                patchedOAuthSourceRequest: data
             });
         } else {
             return new SourcesApi(DEFAULT_CONFIG).sourcesOauthCreate({
-                data: data
+                oAuthSourceRequest: data as unknown as OAuthSourceRequest
             });
         }
     };
@@ -173,7 +173,7 @@ export class OAuthSourceForm extends ModelForm<OAuthSource, string> {
                         ?required=${true}
                         ?writeOnly=${this.instance !== undefined}
                         name="consumerSecret">
-                        <input type="text" value="${ifDefined(this.instance?.consumerSecret)}" class="pf-c-form-control" required>
+                        <input type="text" value="" class="pf-c-form-control" required>
                     </ak-form-element-horizontal>
                     <ak-form-element-horizontal
                         label=${t`Provider type`}
diff --git a/web/src/pages/sources/plex/PlexSourceForm.ts b/web/src/pages/sources/plex/PlexSourceForm.ts
index 194fac2e8..566bf76da 100644
--- a/web/src/pages/sources/plex/PlexSourceForm.ts
+++ b/web/src/pages/sources/plex/PlexSourceForm.ts
@@ -50,11 +50,11 @@ export class PlexSourceForm extends ModelForm<PlexSource, string> {
         if (this.instance?.slug) {
             return new SourcesApi(DEFAULT_CONFIG).sourcesPlexUpdate({
                 slug: this.instance.slug,
-                data: data
+                plexSourceRequest: data
             });
         } else {
             return new SourcesApi(DEFAULT_CONFIG).sourcesPlexCreate({
-                data: data
+                plexSourceRequest: data
             });
         }
     };
diff --git a/web/src/pages/sources/saml/SAMLSourceForm.ts b/web/src/pages/sources/saml/SAMLSourceForm.ts
index 2eaff07ed..ef9832453 100644
--- a/web/src/pages/sources/saml/SAMLSourceForm.ts
+++ b/web/src/pages/sources/saml/SAMLSourceForm.ts
@@ -31,11 +31,11 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
         if (this.instance) {
             return new SourcesApi(DEFAULT_CONFIG).sourcesSamlUpdate({
                 slug: this.instance.slug,
-                data: data
+                sAMLSourceRequest: data
             });
         } else {
             return new SourcesApi(DEFAULT_CONFIG).sourcesSamlCreate({
-                data: data
+                sAMLSourceRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/StageListPage.ts b/web/src/pages/stages/StageListPage.ts
index 59ce49b37..47d3314b5 100644
--- a/web/src/pages/stages/StageListPage.ts
+++ b/web/src/pages/stages/StageListPage.ts
@@ -121,7 +121,7 @@ export class StageListPage extends TablePage<Stage> {
                 <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
             </button>
             <ul class="pf-c-dropdown__menu" hidden>
-                ${until(new StagesApi(DEFAULT_CONFIG).stagesAllTypes().then((types) => {
+                ${until(new StagesApi(DEFAULT_CONFIG).stagesAllTypesList().then((types) => {
                     return types.map((type) => {
                         return html`<li>
                             <ak-forms-modal>
diff --git a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts b/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
index 5a88db784..8aee2b761 100644
--- a/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
+++ b/web/src/pages/stages/authenticator_static/AuthenticatorStaticStageForm.ts
@@ -31,11 +31,11 @@ export class AuthenticatorStaticStageForm extends ModelForm<AuthenticatorStaticS
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorStaticUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                authenticatorStaticStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesUserWriteCreate({
-                data: data
+                authenticatorStaticStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts b/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
index 6be5c63b9..9ea2ad4f1 100644
--- a/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
+++ b/web/src/pages/stages/authenticator_totp/AuthenticatorTOTPStageForm.ts
@@ -30,11 +30,11 @@ export class AuthenticatorTOTPStageForm extends ModelForm<AuthenticatorTOTPStage
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                authenticatorTOTPStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorTotpCreate({
-                data: data
+                authenticatorTOTPStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts b/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
index 294611768..f21fb01be 100644
--- a/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
+++ b/web/src/pages/stages/authenticator_validate/AuthenticatorValidateStageForm.ts
@@ -36,11 +36,11 @@ export class AuthenticatorValidateStageForm extends ModelForm<AuthenticatorValid
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                authenticatorValidateStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorValidateCreate({
-                data: data
+                authenticatorValidateStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts b/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
index 3469d4b37..4577ccbb4 100644
--- a/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
+++ b/web/src/pages/stages/authenticator_webauthn/AuthenticateWebAuthnStageForm.ts
@@ -28,11 +28,11 @@ export class AuthenticateWebAuthnStageForm extends ModelForm<AuthenticateWebAuth
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                authenticateWebAuthnStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesAuthenticatorWebauthnCreate({
-                data: data
+                authenticateWebAuthnStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/captcha/CaptchaStageForm.ts b/web/src/pages/stages/captcha/CaptchaStageForm.ts
index 934c5bbd7..5ed32c15c 100644
--- a/web/src/pages/stages/captcha/CaptchaStageForm.ts
+++ b/web/src/pages/stages/captcha/CaptchaStageForm.ts
@@ -1,4 +1,4 @@
-import { CaptchaStage, StagesApi } from "authentik-api";
+import { CaptchaStage, CaptchaStageRequest, StagesApi } from "authentik-api";
 import { t } from "@lingui/macro";
 import { customElement } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -29,11 +29,11 @@ export class CaptchaStageForm extends ModelForm<CaptchaStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesCaptchaPartialUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                patchedCaptchaStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesCaptchaCreate({
-                data: data
+                captchaStageRequest: data as unknown as CaptchaStageRequest
             });
         }
     };
diff --git a/web/src/pages/stages/consent/ConsentStageForm.ts b/web/src/pages/stages/consent/ConsentStageForm.ts
index 033655787..31e968d7d 100644
--- a/web/src/pages/stages/consent/ConsentStageForm.ts
+++ b/web/src/pages/stages/consent/ConsentStageForm.ts
@@ -35,11 +35,11 @@ export class ConsentStageForm extends ModelForm<ConsentStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesConsentUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                consentStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesConsentCreate({
-                data: data
+                consentStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/deny/DenyStageForm.ts b/web/src/pages/stages/deny/DenyStageForm.ts
index c3b0a2f7d..f6bab8a8f 100644
--- a/web/src/pages/stages/deny/DenyStageForm.ts
+++ b/web/src/pages/stages/deny/DenyStageForm.ts
@@ -28,11 +28,11 @@ export class DenyStageForm extends ModelForm<DenyStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesDenyUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                denyStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesDenyCreate({
-                data: data
+                denyStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/dummy/DummyStageForm.ts b/web/src/pages/stages/dummy/DummyStageForm.ts
index 7793883bf..837da5a9d 100644
--- a/web/src/pages/stages/dummy/DummyStageForm.ts
+++ b/web/src/pages/stages/dummy/DummyStageForm.ts
@@ -28,11 +28,11 @@ export class DummyStageForm extends ModelForm<DummyStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesDummyUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                dummyStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesDummyCreate({
-                data: data
+                dummyStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/email/EmailStageForm.ts b/web/src/pages/stages/email/EmailStageForm.ts
index 1f5c44fe2..3af67acc0 100644
--- a/web/src/pages/stages/email/EmailStageForm.ts
+++ b/web/src/pages/stages/email/EmailStageForm.ts
@@ -37,11 +37,11 @@ export class EmailStageForm extends ModelForm<EmailStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesEmailPartialUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                patchedEmailStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesEmailCreate({
-                data: data
+                emailStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/identification/IdentificationStageForm.ts b/web/src/pages/stages/identification/IdentificationStageForm.ts
index 7abf9a67d..e87675ee1 100644
--- a/web/src/pages/stages/identification/IdentificationStageForm.ts
+++ b/web/src/pages/stages/identification/IdentificationStageForm.ts
@@ -31,11 +31,11 @@ export class IdentificationStageForm extends ModelForm<IdentificationStage, stri
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesIdentificationUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                identificationStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesIdentificationCreate({
-                data: data
+                identificationStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/invitation/InvitationForm.ts b/web/src/pages/stages/invitation/InvitationForm.ts
index d9487c1fa..83e827d35 100644
--- a/web/src/pages/stages/invitation/InvitationForm.ts
+++ b/web/src/pages/stages/invitation/InvitationForm.ts
@@ -30,11 +30,11 @@ export class InvitationForm extends ModelForm<Invitation, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsUpdate({
                 inviteUuid: this.instance.pk || "",
-                data: data
+                invitationRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsCreate({
-                data: data
+                invitationRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/invitation/InvitationStageForm.ts b/web/src/pages/stages/invitation/InvitationStageForm.ts
index a4b86b1ff..ed5e1542f 100644
--- a/web/src/pages/stages/invitation/InvitationStageForm.ts
+++ b/web/src/pages/stages/invitation/InvitationStageForm.ts
@@ -30,11 +30,11 @@ export class InvitationStageForm extends ModelForm<InvitationStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                invitationStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesInvitationStagesCreate({
-                data: data
+                invitationStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/password/PasswordStageForm.ts b/web/src/pages/stages/password/PasswordStageForm.ts
index 98aa7529e..2a0b68d31 100644
--- a/web/src/pages/stages/password/PasswordStageForm.ts
+++ b/web/src/pages/stages/password/PasswordStageForm.ts
@@ -31,11 +31,11 @@ export class PasswordStageForm extends ModelForm<PasswordStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesPasswordUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                passwordStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesPasswordCreate({
-                data: data
+                passwordStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/prompt/PromptForm.ts b/web/src/pages/stages/prompt/PromptForm.ts
index 75a478c4d..d8269dee9 100644
--- a/web/src/pages/stages/prompt/PromptForm.ts
+++ b/web/src/pages/stages/prompt/PromptForm.ts
@@ -29,11 +29,11 @@ export class PromptForm extends ModelForm<Prompt, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsUpdate({
                 promptUuid: this.instance.pk || "",
-                data: data
+                promptRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsCreate({
-                data: data
+                promptRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/prompt/PromptStageForm.ts b/web/src/pages/stages/prompt/PromptStageForm.ts
index 4ae078d9f..ef3b3c403 100644
--- a/web/src/pages/stages/prompt/PromptStageForm.ts
+++ b/web/src/pages/stages/prompt/PromptStageForm.ts
@@ -32,11 +32,11 @@ export class PromptStageForm extends ModelForm<PromptStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                promptStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesPromptStagesCreate({
-                data: data
+                promptStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts b/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
index a483bd767..000200f94 100644
--- a/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
+++ b/web/src/pages/stages/user_delete/UserDeleteStageForm.ts
@@ -28,11 +28,11 @@ export class UserDeleteStageForm extends ModelForm<UserDeleteStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                userDeleteStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesUserDeleteCreate({
-                data: data
+                userDeleteStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/user_login/UserLoginStageForm.ts b/web/src/pages/stages/user_login/UserLoginStageForm.ts
index 52df581c2..32adda594 100644
--- a/web/src/pages/stages/user_login/UserLoginStageForm.ts
+++ b/web/src/pages/stages/user_login/UserLoginStageForm.ts
@@ -29,11 +29,11 @@ export class UserLoginStageForm extends ModelForm<UserLoginStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserLoginUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                userLoginStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesUserLoginCreate({
-                data: data
+                userLoginStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts b/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
index 64693214e..af9a249d3 100644
--- a/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
+++ b/web/src/pages/stages/user_logout/UserLogoutStageForm.ts
@@ -28,11 +28,11 @@ export class UserLogoutStageForm extends ModelForm<UserLogoutStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                userLogoutStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesUserLogoutCreate({
-                data: data
+                userLogoutStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/stages/user_write/UserWriteStageForm.ts b/web/src/pages/stages/user_write/UserWriteStageForm.ts
index 502ccd6fa..aebd2143c 100644
--- a/web/src/pages/stages/user_write/UserWriteStageForm.ts
+++ b/web/src/pages/stages/user_write/UserWriteStageForm.ts
@@ -28,11 +28,11 @@ export class UserWriteStageForm extends ModelForm<UserWriteStage, string> {
         if (this.instance) {
             return new StagesApi(DEFAULT_CONFIG).stagesUserWriteUpdate({
                 stageUuid: this.instance.pk || "",
-                data: data
+                userWriteStageRequest: data
             });
         } else {
             return new StagesApi(DEFAULT_CONFIG).stagesUserWriteCreate({
-                data: data
+                userWriteStageRequest: data
             });
         }
     };
diff --git a/web/src/pages/user-settings/UserDetailsPage.ts b/web/src/pages/user-settings/UserDetailsPage.ts
index b66ef926e..b9c876a5f 100644
--- a/web/src/pages/user-settings/UserDetailsPage.ts
+++ b/web/src/pages/user-settings/UserDetailsPage.ts
@@ -49,7 +49,7 @@ export class UserDetailsPage extends LitElement {
                     .send=${(data: unknown) => {
                         return new CoreApi(DEFAULT_CONFIG).coreUsersUpdate({
                             id: this.user?.pk || 0,
-                            data: data as User
+                            userRequest: data as User
                         });
                     }}>
                     <form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/pages/user-settings/UserSettingsPage.ts b/web/src/pages/user-settings/UserSettingsPage.ts
index 8f474ff03..ee1bc1e12 100644
--- a/web/src/pages/user-settings/UserSettingsPage.ts
+++ b/web/src/pages/user-settings/UserSettingsPage.ts
@@ -78,14 +78,14 @@ export class UserSettingsPage extends LitElement {
                     <section slot="page-tokens" data-tab-title="${t`Tokens`}" class="pf-c-page__main-section pf-m-no-padding-mobile">
                         <ak-user-token-list></ak-user-token-list>
                     </section>
-                    ${until(new StagesApi(DEFAULT_CONFIG).stagesAllUserSettings().then((stages) => {
+                    ${until(new StagesApi(DEFAULT_CONFIG).stagesAllUserSettingsList().then((stages) => {
                         return stages.map((stage) => {
                             return html`<section slot="page-${stage.objectUid}" data-tab-title="${ifDefined(stage.title)}" class="pf-c-page__main-section pf-m-no-padding-mobile">
                                 ${this.renderStageSettings(stage)}
                             </section>`;
                         });
                     }))}
-                    ${until(new SourcesApi(DEFAULT_CONFIG).sourcesAllUserSettings().then((source) => {
+                    ${until(new SourcesApi(DEFAULT_CONFIG).sourcesAllUserSettingsList().then((source) => {
                         return source.map((stage) => {
                             return html`<section slot="page-${stage.objectUid}" data-tab-title="${ifDefined(stage.title)}" class="pf-c-page__main-section pf-m-no-padding-mobile">
                                 ${this.renderSourceSettings(stage)}
diff --git a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts
index 7eed8210d..2aa19db3b 100644
--- a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts
+++ b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts
@@ -53,7 +53,7 @@ export class UserSettingsAuthenticatorWebAuthn extends BaseUserSettings {
                 .send=${(data: unknown) => {
                     return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnUpdate({
                         id: device.pk || 0,
-                        data: data as WebAuthnDevice
+                        webAuthnDeviceRequest: data as WebAuthnDevice
                     });
                 }}>
                 <form class="pf-c-form pf-m-horizontal">
diff --git a/web/src/pages/user-settings/tokens/UserTokenForm.ts b/web/src/pages/user-settings/tokens/UserTokenForm.ts
index 299cecfda..3ca274635 100644
--- a/web/src/pages/user-settings/tokens/UserTokenForm.ts
+++ b/web/src/pages/user-settings/tokens/UserTokenForm.ts
@@ -28,11 +28,11 @@ export class UserTokenForm extends ModelForm<Token, string> {
         if (this.instance) {
             return new CoreApi(DEFAULT_CONFIG).coreTokensUpdate({
                 identifier: this.instance.identifier,
-                data: data
+                tokenRequest: data
             });
         } else {
             return new CoreApi(DEFAULT_CONFIG).coreTokensCreate({
-                data: data
+                tokenRequest: data
             });
         }
     };