diff --git a/web/src/elements/oauth/UserCodeList.ts b/web/src/elements/oauth/UserCodeList.ts
index a7a5b1aa9..ad75e690a 100644
--- a/web/src/elements/oauth/UserCodeList.ts
+++ b/web/src/elements/oauth/UserCodeList.ts
@@ -45,7 +45,7 @@ export class UserOAuthCodeList extends Table<ExpiringBaseGrantModel> {
                 .obj=${item}
                 objectLabel=${t`Authorization Code`}
                 .delete=${() => {
-                    return new Oauth2Api(DEFAULT_CONFIG).oauth2AuthorizationCodesDelete({
+                    return new Oauth2Api(DEFAULT_CONFIG).oauth2AuthorizationCodesDestroy({
                         id: item.pk || 0,
                     });
                 }}>
diff --git a/web/src/elements/oauth/UserRefreshList.ts b/web/src/elements/oauth/UserRefreshList.ts
index 5cb6ef1f7..413db9219 100644
--- a/web/src/elements/oauth/UserRefreshList.ts
+++ b/web/src/elements/oauth/UserRefreshList.ts
@@ -45,7 +45,7 @@ export class UserOAuthRefreshList extends Table<ExpiringBaseGrantModel> {
                 .obj=${item}
                 objectLabel=${t`Refresh Code`}
                 .delete=${() => {
-                    return new Oauth2Api(DEFAULT_CONFIG).oauth2RefreshTokensDelete({
+                    return new Oauth2Api(DEFAULT_CONFIG).oauth2RefreshTokensDestroy({
                         id: item.pk || 0,
                     });
                 }}>
diff --git a/web/src/elements/user/UserConsentList.ts b/web/src/elements/user/UserConsentList.ts
index 7067adda5..15be03cfe 100644
--- a/web/src/elements/user/UserConsentList.ts
+++ b/web/src/elements/user/UserConsentList.ts
@@ -41,7 +41,7 @@ export class UserConsentList extends Table<UserConsent> {
                 .obj=${item}
                 objectLabel=${t`Consent`}
                 .delete=${() => {
-                    return new CoreApi(DEFAULT_CONFIG).coreUserConsentDelete({
+                    return new CoreApi(DEFAULT_CONFIG).coreUserConsentDestroy({
                         id: item.pk || 0,
                     });
                 }}>
diff --git a/web/src/pages/applications/ApplicationListPage.ts b/web/src/pages/applications/ApplicationListPage.ts
index 3bdebecc8..e1dc6a4b2 100644
--- a/web/src/pages/applications/ApplicationListPage.ts
+++ b/web/src/pages/applications/ApplicationListPage.ts
@@ -104,7 +104,7 @@ export class ApplicationListPage extends TablePage<Application> {
                 .obj=${item}
                 objectLabel=${t`Application`}
                 .delete=${() => {
-                    return new CoreApi(DEFAULT_CONFIG).coreApplicationsDelete({
+                    return new CoreApi(DEFAULT_CONFIG).coreApplicationsDestroy({
                         slug: item.slug || ""
                     });
                 }}>
diff --git a/web/src/pages/crypto/CertificateKeyPairListPage.ts b/web/src/pages/crypto/CertificateKeyPairListPage.ts
index 8a9c81665..41a3c5446 100644
--- a/web/src/pages/crypto/CertificateKeyPairListPage.ts
+++ b/web/src/pages/crypto/CertificateKeyPairListPage.ts
@@ -80,7 +80,7 @@ export class CertificateKeyPairListPage extends TablePage<CertificateKeyPair> {
                 .obj=${item}
                 objectLabel=${t`Certificate-Key Pair`}
                 .delete=${() => {
-                    return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsDelete({
+                    return new CryptoApi(DEFAULT_CONFIG).cryptoCertificatekeypairsDestroy({
                         kpUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/events/RuleListPage.ts b/web/src/pages/events/RuleListPage.ts
index 3852fd293..e4ac3f123 100644
--- a/web/src/pages/events/RuleListPage.ts
+++ b/web/src/pages/events/RuleListPage.ts
@@ -74,7 +74,7 @@ export class RuleListPage extends TablePage<NotificationRule> {
                 .obj=${item}
                 objectLabel=${t`Notification rule`}
                 .delete=${() => {
-                    return new EventsApi(DEFAULT_CONFIG).eventsRulesDelete({
+                    return new EventsApi(DEFAULT_CONFIG).eventsRulesDestroy({
                         pbmUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/events/TransportListPage.ts b/web/src/pages/events/TransportListPage.ts
index cf3ab4a16..870149347 100644
--- a/web/src/pages/events/TransportListPage.ts
+++ b/web/src/pages/events/TransportListPage.ts
@@ -78,7 +78,7 @@ export class TransportListPage extends TablePage<NotificationTransport> {
                 .obj=${item}
                 objectLabel=${t`Notifications Transport`}
                 .delete=${() => {
-                    return new EventsApi(DEFAULT_CONFIG).eventsTransportsDelete({
+                    return new EventsApi(DEFAULT_CONFIG).eventsTransportsDestroy({
                         uuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/pages/flows/BoundStagesList.ts
index cc602929a..4af81f8c2 100644
--- a/web/src/pages/flows/BoundStagesList.ts
+++ b/web/src/pages/flows/BoundStagesList.ts
@@ -83,7 +83,7 @@ export class BoundStagesList extends Table<FlowStageBinding> {
                 .obj=${item}
                 objectLabel=${t`Stage binding`}
                 .delete=${() => {
-                    return new FlowsApi(DEFAULT_CONFIG).flowsBindingsDelete({
+                    return new FlowsApi(DEFAULT_CONFIG).flowsBindingsDestroy({
                         fsbUuid: item.pk || "",
                     });
                 }}>
diff --git a/web/src/pages/flows/FlowListPage.ts b/web/src/pages/flows/FlowListPage.ts
index 89e9d041d..741097e25 100644
--- a/web/src/pages/flows/FlowListPage.ts
+++ b/web/src/pages/flows/FlowListPage.ts
@@ -78,7 +78,7 @@ export class FlowListPage extends TablePage<Flow> {
                 .obj=${item}
                 objectLabel=${t`Flow`}
                 .delete=${() => {
-                    return new FlowsApi(DEFAULT_CONFIG).flowsInstancesDelete({
+                    return new FlowsApi(DEFAULT_CONFIG).flowsInstancesDestroy({
                         slug: item.slug
                     });
                 }}>
diff --git a/web/src/pages/groups/GroupListPage.ts b/web/src/pages/groups/GroupListPage.ts
index 9c2d71bec..69ef0eda1 100644
--- a/web/src/pages/groups/GroupListPage.ts
+++ b/web/src/pages/groups/GroupListPage.ts
@@ -73,7 +73,7 @@ export class GroupListPage extends TablePage<Group> {
                 .obj=${item}
                 objectLabel=${t`Group`}
                 .delete=${() => {
-                    return new CoreApi(DEFAULT_CONFIG).coreGroupsDelete({
+                    return new CoreApi(DEFAULT_CONFIG).coreGroupsDestroy({
                         groupUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/outposts/OutpostListPage.ts b/web/src/pages/outposts/OutpostListPage.ts
index 02118d1f5..83e0260ec 100644
--- a/web/src/pages/outposts/OutpostListPage.ts
+++ b/web/src/pages/outposts/OutpostListPage.ts
@@ -76,7 +76,7 @@ export class OutpostListPage extends TablePage<Outpost> {
                 .obj=${item}
                 objectLabel=${t`Outpost`}
                 .delete=${() => {
-                    return new OutpostsApi(DEFAULT_CONFIG).outpostsOutpostsDelete({
+                    return new OutpostsApi(DEFAULT_CONFIG).outpostsOutpostsDestroy({
                         uuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/outposts/ServiceConnectionListPage.ts b/web/src/pages/outposts/ServiceConnectionListPage.ts
index 14232fb61..e5844acee 100644
--- a/web/src/pages/outposts/ServiceConnectionListPage.ts
+++ b/web/src/pages/outposts/ServiceConnectionListPage.ts
@@ -94,7 +94,7 @@ export class OutpostServiceConnectionListPage extends TablePage<ServiceConnectio
                 .obj=${item}
                 objectLabel=${t`Outpost Service-connection`}
                 .delete=${() => {
-                    return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsAllDelete({
+                    return new OutpostsApi(DEFAULT_CONFIG).outpostsServiceConnectionsAllDestroy({
                         uuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/pages/policies/BoundPoliciesList.ts
index a7a9bf21a..2d4eaf0b7 100644
--- a/web/src/pages/policies/BoundPoliciesList.ts
+++ b/web/src/pages/policies/BoundPoliciesList.ts
@@ -138,7 +138,7 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
                 .obj=${item}
                 objectLabel=${t`Policy binding`}
                 .delete=${() => {
-                    return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsDelete({
+                    return new PoliciesApi(DEFAULT_CONFIG).policiesBindingsDestroy({
                         policyBindingUuid: item.pk || "",
                     });
                 }}>
diff --git a/web/src/pages/policies/PolicyListPage.ts b/web/src/pages/policies/PolicyListPage.ts
index 3acf2f101..c8eb49c7c 100644
--- a/web/src/pages/policies/PolicyListPage.ts
+++ b/web/src/pages/policies/PolicyListPage.ts
@@ -107,7 +107,7 @@ export class PolicyListPage extends TablePage<Policy> {
                 .obj=${item}
                 objectLabel=${t`Policy`}
                 .delete=${() => {
-                    return new PoliciesApi(DEFAULT_CONFIG).policiesAllDelete({
+                    return new PoliciesApi(DEFAULT_CONFIG).policiesAllDestroy({
                         policyUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/property-mappings/PropertyMappingListPage.ts b/web/src/pages/property-mappings/PropertyMappingListPage.ts
index 743f2bf84..af904fdfb 100644
--- a/web/src/pages/property-mappings/PropertyMappingListPage.ts
+++ b/web/src/pages/property-mappings/PropertyMappingListPage.ts
@@ -98,7 +98,7 @@ export class PropertyMappingListPage extends TablePage<PropertyMapping> {
                 .obj=${item}
                 objectLabel=${t`Property Mapping`}
                 .delete=${() => {
-                    return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllDelete({
+                    return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsAllDestroy({
                         pmUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/providers/ProviderListPage.ts b/web/src/pages/providers/ProviderListPage.ts
index 233ede457..951f4368a 100644
--- a/web/src/pages/providers/ProviderListPage.ts
+++ b/web/src/pages/providers/ProviderListPage.ts
@@ -91,7 +91,7 @@ export class ProviderListPage extends TablePage<Provider> {
                 .obj=${item}
                 objectLabel=${t`Provider`}
                 .delete=${() => {
-                    return new ProvidersApi(DEFAULT_CONFIG).providersAllDelete({
+                    return new ProvidersApi(DEFAULT_CONFIG).providersAllDestroy({
                         id: item.pk || 0
                     });
                 }}>
diff --git a/web/src/pages/sources/SourcesListPage.ts b/web/src/pages/sources/SourcesListPage.ts
index a2c4d6121..decbf2baa 100644
--- a/web/src/pages/sources/SourcesListPage.ts
+++ b/web/src/pages/sources/SourcesListPage.ts
@@ -87,7 +87,7 @@ export class SourceListPage extends TablePage<Source> {
                 .obj=${item}
                 objectLabel=${t`Source`}
                 .delete=${() => {
-                    return new SourcesApi(DEFAULT_CONFIG).sourcesAllDelete({
+                    return new SourcesApi(DEFAULT_CONFIG).sourcesAllDestroy({
                         slug: item.slug || ""
                     });
                 }}>
diff --git a/web/src/pages/stages/StageListPage.ts b/web/src/pages/stages/StageListPage.ts
index 17f62e267..59ce49b37 100644
--- a/web/src/pages/stages/StageListPage.ts
+++ b/web/src/pages/stages/StageListPage.ts
@@ -102,7 +102,7 @@ export class StageListPage extends TablePage<Stage> {
                 .obj=${item}
                 objectLabel=${item.verboseName || ""}
                 .delete=${() => {
-                    return new StagesApi(DEFAULT_CONFIG).stagesAllDelete({
+                    return new StagesApi(DEFAULT_CONFIG).stagesAllDestroy({
                         stageUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/stages/invitation/InvitationListPage.ts b/web/src/pages/stages/invitation/InvitationListPage.ts
index c6c30ea31..788f03474 100644
--- a/web/src/pages/stages/invitation/InvitationListPage.ts
+++ b/web/src/pages/stages/invitation/InvitationListPage.ts
@@ -59,7 +59,7 @@ export class InvitationListPage extends TablePage<Invitation> {
                 .obj=${item}
                 objectLabel=${t`Prompt`}
                 .delete=${() => {
-                    return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsDelete({
+                    return new StagesApi(DEFAULT_CONFIG).stagesInvitationInvitationsDestroy({
                         inviteUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/stages/prompt/PromptListPage.ts b/web/src/pages/stages/prompt/PromptListPage.ts
index 5cdf6af94..cc2ef4210 100644
--- a/web/src/pages/stages/prompt/PromptListPage.ts
+++ b/web/src/pages/stages/prompt/PromptListPage.ts
@@ -78,7 +78,7 @@ export class PromptListPage extends TablePage<Prompt> {
                 .obj=${item}
                 objectLabel=${t`Prompt`}
                 .delete=${() => {
-                    return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsDelete({
+                    return new StagesApi(DEFAULT_CONFIG).stagesPromptPromptsDestroy({
                         promptUuid: item.pk || ""
                     });
                 }}>
diff --git a/web/src/pages/tokens/TokenListPage.ts b/web/src/pages/tokens/TokenListPage.ts
index b34bc5a52..a3fd39b45 100644
--- a/web/src/pages/tokens/TokenListPage.ts
+++ b/web/src/pages/tokens/TokenListPage.ts
@@ -59,7 +59,7 @@ export class TokenListPage extends TablePage<Token> {
                 .obj=${item}
                 objectLabel=${t`Token`}
                 .delete=${() => {
-                    return new CoreApi(DEFAULT_CONFIG).coreTokensDelete({
+                    return new CoreApi(DEFAULT_CONFIG).coreTokensDestroy({
                         identifier: item.identifier
                     });
                 }}>
diff --git a/web/src/pages/user-settings/settings/SourceSettingsOAuth.ts b/web/src/pages/user-settings/settings/SourceSettingsOAuth.ts
index a3d1eeeff..fa94b7f7e 100644
--- a/web/src/pages/user-settings/settings/SourceSettingsOAuth.ts
+++ b/web/src/pages/user-settings/settings/SourceSettingsOAuth.ts
@@ -31,7 +31,7 @@ export class SourceSettingsOAuth extends BaseUserSettings {
                 return html`<p>${t`Connected.`}</p>
                 <button class="pf-c-button pf-m-danger"
                     @click=${() => {
-                        return new SourcesApi(DEFAULT_CONFIG).sourcesOauthUserConnectionsDelete({
+                        return new SourcesApi(DEFAULT_CONFIG).sourcesOauthUserConnectionsDestroy({
                             id: connection.results[0].pk || 0
                         });
                     }}>
diff --git a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorStatic.ts b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorStatic.ts
index c76480661..399f9363e 100644
--- a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorStatic.ts
+++ b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorStatic.ts
@@ -28,7 +28,7 @@ export class UserSettingsAuthenticatorStatic extends BaseUserSettings {
                                 return;
                             }
                             // TODO: Handle multiple devices, currently we assume only one TOTP Device
-                            return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsTotpDelete({
+                            return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsTotpDestroy({
                                 id: devices.results[0].pk || 0
                             });
                         });
diff --git a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorTOTP.ts b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorTOTP.ts
index 2ce65527f..0d593e195 100644
--- a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorTOTP.ts
+++ b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorTOTP.ts
@@ -43,7 +43,7 @@ export class UserSettingsAuthenticatorTOTP extends BaseUserSettings {
                                 return;
                             }
                             // TODO: Handle multiple devices, currently we assume only one TOTP Device
-                            return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsStaticDelete({
+                            return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsStaticDestroy({
                                 id: devices.results[0].pk || 0
                             });
                         });
diff --git a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts
index fc40933e7..7eed8210d 100644
--- a/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts
+++ b/web/src/pages/user-settings/settings/UserSettingsAuthenticatorWebAuthn.ts
@@ -29,7 +29,7 @@ export class UserSettingsAuthenticatorWebAuthn extends BaseUserSettings {
             .obj=${device}
             objectLabel=${t`Authenticator`}
             .delete=${() => {
-                return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnDelete({
+                return new AuthenticatorsApi(DEFAULT_CONFIG).authenticatorsWebauthnDestroy({
                     id: device.pk || 0
                 });
             }}>
diff --git a/web/src/pages/user-settings/tokens/UserTokenList.ts b/web/src/pages/user-settings/tokens/UserTokenList.ts
index 9cd0ad58a..de6b5124e 100644
--- a/web/src/pages/user-settings/tokens/UserTokenList.ts
+++ b/web/src/pages/user-settings/tokens/UserTokenList.ts
@@ -120,7 +120,7 @@ export class UserTokenList extends Table<Token> {
                 .obj=${item}
                 objectLabel=${t`Token`}
                 .delete=${() => {
-                    return new CoreApi(DEFAULT_CONFIG).coreTokensDelete({
+                    return new CoreApi(DEFAULT_CONFIG).coreTokensDestroy({
                         identifier: item.identifier
                     });
                 }}>
diff --git a/web/src/pages/users/UserForm.ts b/web/src/pages/users/UserForm.ts
index 6a9c2a011..9cec630ed 100644
--- a/web/src/pages/users/UserForm.ts
+++ b/web/src/pages/users/UserForm.ts
@@ -31,11 +31,11 @@ export class UserForm extends ModelForm<User, number> {
         if (this.instance) {
             return new CoreApi(DEFAULT_CONFIG).coreUsersUpdate({
                 id: this.instance.pk || 0,
-                data: data
+                userRequest: data
             });
         } else {
             return new CoreApi(DEFAULT_CONFIG).coreUsersCreate({
-                data: data
+                userRequest: data
             });
         }
     };
diff --git a/web/src/pages/users/UserListPage.ts b/web/src/pages/users/UserListPage.ts
index cbf999fc9..f919b6e90 100644
--- a/web/src/pages/users/UserListPage.ts
+++ b/web/src/pages/users/UserListPage.ts
@@ -94,7 +94,7 @@ export class UserListPage extends TablePage<User> {
                             .delete=${() => {
                                 return new CoreApi(DEFAULT_CONFIG).coreUsersPartialUpdate({
                                     id: item.pk || 0,
-                                    data: {
+                                    patchedUserRequest: {
                                         username: item.username,
                                         name: item.name,
                                         isActive: !item.isActive,
@@ -112,7 +112,7 @@ export class UserListPage extends TablePage<User> {
                             .obj=${item}
                             objectLabel=${t`User`}
                             .delete=${() => {
-                                return new CoreApi(DEFAULT_CONFIG).coreUsersDelete({
+                                return new CoreApi(DEFAULT_CONFIG).coreUsersDestroy({
                                     id: item.pk || 0
                                 });
                             }}>
@@ -125,7 +125,7 @@ export class UserListPage extends TablePage<User> {
             </ak-dropdown>
             <ak-action-button
                 .apiRequest=${() => {
-                    return new CoreApi(DEFAULT_CONFIG).coreUsersRecovery({
+                    return new CoreApi(DEFAULT_CONFIG).coreUsersRecoveryRetrieve({
                         id: item.pk || 0,
                     }).then(rec => {
                         showMessage({
diff --git a/web/src/pages/users/UserViewPage.ts b/web/src/pages/users/UserViewPage.ts
index 3ed03e90d..a2efca172 100644
--- a/web/src/pages/users/UserViewPage.ts
+++ b/web/src/pages/users/UserViewPage.ts
@@ -154,7 +154,7 @@ export class UserViewPage extends LitElement {
                             <div class="pf-c-card__footer">
                                 <ak-action-button
                                     .apiRequest=${() => {
-                                        return new CoreApi(DEFAULT_CONFIG).coreUsersRecovery({
+                                        return new CoreApi(DEFAULT_CONFIG).coreUsersRecoveryRetrieve({
                                             id: this.user?.pk || 0,
                                         }).then(rec => {
                                             showMessage({