From 6b86f31c9e81bb9e9d9606cf5230173d19739c96 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 16 Mar 2023 16:18:16 +1000
Subject: [PATCH 1/2] regenerate

---
 .../backend-api/src/core/CancelablePromise.ts | 197 +++++++------
 .../libs/backend-api/src/index.ts             | 274 ++++++++++--------
 .../src/models/AuditLogBaseModel.ts           |   1 -
 .../src/models/AuditLogResponseModel.ts       |   1 -
 .../AuditLogWithUsernameResponseModel.ts      |   5 +-
 ...el.ts => ConsentLevelPresentationModel.ts} |   3 +-
 ...ValueModelDocumentVariantResponseModel.ts} |   9 +-
 .../src/models/ContentTreeItemModel.ts        |  12 -
 .../models/ContentTreeItemResponseModel.ts    |  11 +
 .../src/models/ContentTypeCleanupModel.ts     |   1 -
 .../src/models/ContentTypeCompositionModel.ts |   1 -
 ...TypePropertyTypeContainerResponseModel.ts} |  13 +-
 ...aTypePropertyTypeContainerResponseModel.ts |  24 ++
 .../src/models/ContentTypeSortModel.ts        |   1 -
 .../src/models/ContentUrlInfoModel.ts         |   1 -
 ...veModel.ts => CopyDataTypeRequestModel.ts} |   3 +-
 ...ntValueModelDocumentVariantRequestModel.ts |  12 +
 ...MediaValueModelMediaVariantRequestModel.ts |  12 +
 ...Model.ts => CreateDataTypeRequestModel.ts} |   5 +-
 ...ts => CreateDictionaryItemRequestModel.ts} |   5 +-
 .../src/models/CreateDocumentRequestModel.ts  |  10 +
 ...teModel.ts => CreateFolderRequestModel.ts} |   5 +-
 ...Model.ts => CreateLanguageRequestModel.ts} |   5 +-
 .../src/models/CreateMediaRequestModel.ts     |   9 +
 ...eModel.ts => CreatePackageRequestModel.ts} |   3 +-
 .../models/CreateRelationTypeRequestModel.ts  |   9 +
 ...Model.ts => CreateTemplateRequestModel.ts} |   3 +-
 ...CultureModel.ts => CultureReponseModel.ts} |   3 +-
 .../src/models/DataTypeModelBaseModel.ts      |   5 +-
 ...s => DataTypePropertyPresentationModel.ts} |   3 +-
 .../models/DataTypePropertyReferenceModel.ts  |   1 -
 ...l.ts => DataTypeReferenceResponseModel.ts} |   3 +-
 ...aTypeModel.ts => DataTypeResponseModel.ts} |   9 +-
 ...del.ts => DatabaseInstallResponseModel.ts} |   3 +-
 ...s => DatabaseSettingsPresentationModel.ts} |   3 +-
 .../models/DictionaryItemModelBaseModel.ts    |   1 -
 ...odel.ts => DictionaryItemResponseModel.ts} |   7 +-
 .../models/DictionaryItemTranslationModel.ts  |   1 -
 ....ts => DictionaryOverviewResponseModel.ts} |   3 +-
 .../src/models/DictionaryUploadModel.ts       |  11 -
 .../models/DocumentBlueprintTreeItemModel.ts  |  13 -
 .../DocumentBlueprintTreeItemResponseModel.ts |  12 +
 .../backend-api/src/models/DocumentModel.ts   |  12 -
 .../src/models/DocumentResponseModel.ts       |  11 +
 .../src/models/DocumentTreeItemModel.ts       |  13 -
 .../models/DocumentTreeItemResponseModel.ts   |  12 +
 .../src/models/DocumentTypeModel.ts           |  11 -
 .../DocumentTypePropertyTypeContainerModel.ts |   8 -
 ...tTypePropertyTypeContainerResponseModel.ts |   7 +
 .../models/DocumentTypePropertyTypeModel.ts   |   8 -
 .../DocumentTypePropertyTypeResponseModel.ts  |   7 +
 .../src/models/DocumentTypeResponseModel.ts   |  12 +
 .../src/models/DocumentTypeTreeItemModel.ts   |  11 -
 .../DocumentTypeTreeItemResponseModel.ts      |  10 +
 .../src/models/DocumentValueModel.ts          |   7 +-
 .../src/models/DocumentVariantModel.ts        |  12 -
 .../src/models/DocumentVariantRequestModel.ts |   9 +
 .../models/DocumentVariantResponseModel.ts    |  12 +
 .../src/models/DomainPresentationModel.ts     |   8 +
 .../DomainsPresentationModelBaseModel.ts      |  10 +
 .../src/models/DomainsResponseModel.ts        |   7 +
 .../src/models/EntityTreeItemModel.ts         |  13 -
 .../src/models/EntityTreeItemResponseModel.ts |  12 +
 ...ieldModel.ts => FieldPresentationModel.ts} |   3 +-
 .../src/models/FileSystemTreeItemModel.ts     |  11 -
 .../FileSystemTreeItemPresentationModel.ts    |  10 +
 .../src/models/FolderModelBaseModel.ts        |   1 -
 .../{FolderModel.ts => FolderReponseModel.ts} |   9 +-
 .../src/models/FolderTreeItemModel.ts         |  11 -
 .../src/models/FolderTreeItemResponseModel.ts |  10 +
 ...el.ts => HealthCheckActionRequestModel.ts} |   3 +-
 .../src/models/HealthCheckGroupModel.ts       |  11 -
 ... HealthCheckGroupPresentationBaseModel.ts} |   3 +-
 .../HealthCheckGroupPresentationModel.ts      |  10 +
 .../models/HealthCheckGroupResponseModel.ts   |   7 +
 .../models/HealthCheckGroupWithResultModel.ts |  10 -
 ...HealthCheckGroupWithResultResponseModel.ts |   9 +
 .../src/models/HealthCheckModel.ts            |   5 +-
 .../src/models/HealthCheckModelBaseModel.ts   |   1 -
 ...l.ts => HealthCheckResultResponseModel.ts} |   7 +-
 .../src/models/HealthCheckWithResultModel.ts  |  11 -
 .../HealthCheckWithResultPresentationModel.ts |  10 +
 ...pPageModel.ts => HelpPageResponseModel.ts} |   3 +-
 ...ImportDictionaryItemsPresentationModel.ts} |   3 +-
 ...del.ts => ImportDictionaryRequestModel.ts} |   3 +-
 .../{IndexModel.ts => IndexResponseModel.ts}  |   3 +-
 .../backend-api/src/models/InstallModel.ts    |  14 -
 .../src/models/InstallSettingsModel.ts        |  12 -
 .../models/InstallSettingsResponseModel.ts    |  11 +
 .../src/models/InstallVResponseModel.ts       |  13 +
 .../src/models/LanguageModelBaseModel.ts      |   1 -
 ...guageModel.ts => LanguageResponseModel.ts} |   5 +-
 ...Model.ts => LogLevelCountsReponseModel.ts} |   3 +-
 ...=> LogMessagePropertyPresentationModel.ts} |   3 +-
 ...ageModel.ts => LogMessageResponseModel.ts} |   7 +-
 ...teModel.ts => LogTemplateResponseModel.ts} |   3 +-
 ...{LoggerModel.ts => LoggerResponseModel.ts} |   3 +-
 ...aTypePropertyTypeContainerResponseModel.ts |   7 +
 .../MediaTypePropertyTypeResponseModel.ts     |   7 +
 .../src/models/MediaTypeResponseModel.ts      |   7 +
 .../backend-api/src/models/MediaValueModel.ts |   9 +
 .../src/models/MediaVariantRequestModel.ts    |   9 +
 .../src/models/MediaVariantResponseModel.ts   |   9 +
 ...Model.ts => ModelsBuilderResponseModel.ts} |   3 +-
 ...veModel.ts => MoveDataTypeRequestModel.ts} |   3 +-
 ...Model.ts => MoveDictionaryRequestModel.ts} |   3 +-
 .../src/models/ObjectTypeResponseModel.ts     |   8 +
 .../backend-api/src/models/OkResultModel.ts   |   1 -
 ...del.ts => OutOfDateStatusResponseModel.ts} |   3 +-
 ...l.ts => PackageDefinitionResponseModel.ts} |   7 +-
 ...del.ts => PackageManifestResponseModel.ts} |   3 +-
 ...=> PackageMigrationStatusResponseModel.ts} |   3 +-
 .../src/models/PackageModelBaseModel.ts       |   1 -
 .../src/models/PagedAuditLogResponseModel.ts  |   1 -
 .../PagedAuditLogWithUsernameResponseModel.ts |   1 -
 .../src/models/PagedContentTreeItemModel.ts   |  12 -
 .../PagedContentTreeItemResponseModel.ts      |  11 +
 .../src/models/PagedCultureModel.ts           |  11 -
 .../src/models/PagedCultureReponseModel.ts    |  10 +
 .../models/PagedDictionaryOverviewModel.ts    |  11 -
 .../PagedDictionaryOverviewResponseModel.ts   |  10 +
 .../PagedDocumentBlueprintTreeItemModel.ts    |  11 -
 ...dDocumentBlueprintTreeItemResponseModel.ts |  10 +
 .../src/models/PagedDocumentTreeItemModel.ts  |  11 -
 .../PagedDocumentTreeItemResponseModel.ts     |  10 +
 .../models/PagedDocumentTypeTreeItemModel.ts  |  11 -
 .../PagedDocumentTypeTreeItemResponseModel.ts |  10 +
 .../src/models/PagedEntityTreeItemModel.ts    |  16 -
 .../PagedEntityTreeItemResponseModel.ts       |  15 +
 .../models/PagedFileSystemTreeItemModel.ts    |  11 -
 ...agedFileSystemTreeItemPresentationModel.ts |  10 +
 .../src/models/PagedFolderTreeItemModel.ts    |  12 -
 .../PagedFolderTreeItemResponseModel.ts       |  11 +
 .../PagedHealthCheckGroupModelBaseModel.ts    |  12 -
 .../PagedHealthCheckGroupResponseModel.ts     |  10 +
 .../src/models/PagedHelpPageModel.ts          |  11 -
 .../src/models/PagedHelpPageResponseModel.ts  |  10 +
 .../backend-api/src/models/PagedIndexModel.ts |  11 -
 .../src/models/PagedIndexResponseModel.ts     |  10 +
 .../src/models/PagedLanguageModel.ts          |  11 -
 .../src/models/PagedLanguageResponseModel.ts  |  10 +
 .../src/models/PagedLogMessageModel.ts        |  11 -
 .../models/PagedLogMessageResponseModel.ts    |  10 +
 .../src/models/PagedLogTemplateModel.ts       |  11 -
 .../models/PagedLogTemplateResponseModel.ts   |  10 +
 .../src/models/PagedLoggerModel.ts            |  11 -
 .../src/models/PagedLoggerResponseModel.ts    |  10 +
 .../models/PagedObjectTypeResponseModel.ts    |  10 +
 .../src/models/PagedPackageDefinitionModel.ts |  11 -
 .../PagedPackageDefinitionResponseModel.ts    |  10 +
 .../PagedPackageMigrationStatusModel.ts       |  11 -
 ...agedPackageMigrationStatusResponseModel.ts |  10 +
 .../src/models/PagedRecycleBinItemModel.ts    |  11 -
 .../PagedRecycleBinItemResponseModel.ts       |  10 +
 .../src/models/PagedRedirectUrlModel.ts       |  11 -
 .../models/PagedRedirectUrlResponseModel.ts   |  10 +
 .../src/models/PagedRelationItemModel.ts      |  11 -
 .../models/PagedRelationItemResponseModel.ts  |  10 +
 .../src/models/PagedRelationModel.ts          |  11 -
 .../src/models/PagedRelationResponseModel.ts  |  10 +
 .../src/models/PagedSavedLogSearchModel.ts    |  11 -
 .../PagedSavedLogSearchResponseModel.ts       |  10 +
 .../src/models/PagedSearchResultModel.ts      |  11 -
 .../models/PagedSearchResultResponseModel.ts  |  10 +
 .../src/models/PagedSearcherModel.ts          |  11 -
 .../src/models/PagedSearcherResponseModel.ts  |  10 +
 .../src/models/PagedTelemetryModel.ts         |  11 -
 .../src/models/PagedTelemetryResponseModel.ts |  10 +
 .../src/models/PagedUserGroupModel.ts         |  11 -
 .../models/PagedUserGroupPresentationModel.ts |  10 +
 ...odel.ts => ProfilingStatusRequestModel.ts} |   3 +-
 .../models/ProfilingStatusResponseModel.ts    |   7 +
 .../src/models/PropertyTypeAppearanceModel.ts |   1 -
 ...rtyTypeContainerResponseModelBaseModel.ts} |   3 +-
 ... => PropertyTypeResponseModelBaseModel.ts} |   3 +-
 .../src/models/PropertyTypeValidationModel.ts |   1 -
 ...odel.ts => RecycleBinItemResponseModel.ts} |   3 +-
 ...rlModel.ts => RedirectUrlResponseModel.ts} |   3 +-
 ...l.ts => RedirectUrlStatusResponseModel.ts} |   3 +-
 ...mModel.ts => RelationItemResponseModel.ts} |   3 +-
 ...ationModel.ts => RelationResponseModel.ts} |   3 +-
 .../src/models/RelationTypeBaseModel.ts       |  11 +
 .../src/models/RelationTypeResponseModel.ts   |  14 +
 ...eModel.ts => SaveUserGroupRequestModel.ts} |   3 +-
 ... => SavedLogSearchPresenationBaseModel.ts} |   3 +-
 .../src/models/SavedLogSearchRequestModel.ts  |   7 +
 .../src/models/SavedLogSearchResponseModel.ts |   7 +
 .../src/models/SearchResultModel.ts           |  13 -
 .../src/models/SearchResultResponseModel.ts   |  12 +
 ...rcherModel.ts => SearcherResponseModel.ts} |   3 +-
 ...sModel.ts => ServerStatusResponseModel.ts} |   3 +-
 ...ts => TelemetryRepresentationBaseModel.ts} |   3 +-
 .../src/models/TelemetryRequestModel.ts       |   7 +
 .../src/models/TelemetryResponseModel.ts      |   7 +
 .../src/models/TemplateModelBaseModel.ts      |   1 -
 ...ateQueryExecuteFilterPresentationModel.ts} |   3 +-
 .../src/models/TemplateQueryExecuteModel.ts   |   5 +-
 .../models/TemplateQueryExecuteSortModel.ts   |   1 -
 .../src/models/TemplateQueryOperatorModel.ts  |   1 -
 ...TemplateQueryPropertyPresentationModel.ts} |   3 +-
 ...mplateQueryResultItemPresentationModel.ts} |   3 +-
 .../src/models/TemplateQueryResultModel.ts    |  13 -
 .../TemplateQueryResultResponseModel.ts       |  12 +
 ... => TemplateQuerySettingsResponseModel.ts} |   7 +-
 ...plateModel.ts => TemplateResponseModel.ts} |   7 +-
 ...el.ts => TemplateScaffoldResponseModel.ts} |   3 +-
 ...mModel.ts => TreeItemPresentationModel.ts} |   3 +-
 ...ntValueModelDocumentVariantRequestModel.ts |  11 +
 ...MediaValueModelMediaVariantRequestModel.ts |  11 +
 ...Model.ts => UpdateDataTypeRequestModel.ts} |   3 +-
 ...ts => UpdateDictionaryItemRequestModel.ts} |   3 +-
 .../src/models/UpdateDocumentRequestModel.ts  |   9 +
 .../src/models/UpdateDomainsRequestModel.ts   |   7 +
 ...teModel.ts => UpdateFolderReponseModel.ts} |   3 +-
 ...Model.ts => UpdateLanguageRequestModel.ts} |   3 +-
 .../src/models/UpdateMediaRequestModel.ts     |   7 +
 ...eModel.ts => UpdatePackageRequestModel.ts} |   5 +-
 .../models/UpdateRelationTypeRequestModel.ts  |   7 +
 ...Model.ts => UpdateTemplateRequestModel.ts} |   3 +-
 ...odel.ts => UpdateUserGroupRequestModel.ts} |   3 +-
 ...del.ts => UpgradeSettingsResponseModel.ts} |   3 +-
 .../models/UploadDictionaryResponseModel.ts   |  10 +
 .../src/models/UserGroupBaseModel.ts          |   1 -
 ...Model.ts => UserGroupPresentationModel.ts} |   7 +-
 ...llModel.ts => UserInstallResponseModel.ts} |   3 +-
 .../src/models/UserSettingsModel.ts           |   5 +-
 ...delBaseModel.ts => ValueModelBaseModel.ts} |   4 +-
 .../src/models/VariantModelBaseModel.ts       |  10 +
 ...el.ts => VariantResponseModelBaseModel.ts} |   4 +-
 ...ersionModel.ts => VersionResponseModel.ts} |   3 +-
 .../src/services/AuditLogResource.ts          |  64 ++--
 .../src/services/CultureResource.ts           |  16 +-
 .../src/services/DataTypeResource.ts          | 176 +++++------
 .../src/services/DictionaryResource.ts        | 150 +++++-----
 .../src/services/DocumentBlueprintResource.ts |  26 +-
 .../src/services/DocumentResource.ts          | 225 ++++++++++----
 .../src/services/DocumentTypeResource.ts      |  62 ++--
 .../src/services/HealthCheckResource.ts       |  48 +--
 .../backend-api/src/services/HelpResource.ts  |  28 +-
 .../src/services/IndexerResource.ts           |  34 +--
 .../src/services/InstallResource.ts           |  24 +-
 .../src/services/LanguageResource.ts          |  58 ++--
 .../src/services/LogViewerResource.ts         | 145 ++++-----
 .../backend-api/src/services/MediaResource.ts | 186 +++++++++---
 .../src/services/MediaTypeResource.ts         |  76 +++--
 .../src/services/MemberGroupResource.ts       |  36 +--
 .../src/services/MemberTypeResource.ts        |  36 +--
 .../src/services/ModelsBuilderResource.ts     |   8 +-
 .../src/services/ObjectTypesResource.ts       |  33 +++
 .../src/services/PackageResource.ts           |  94 +++---
 .../src/services/PartialViewResource.ts       |  44 +--
 .../src/services/ProfilingResource.ts         |  13 +-
 .../services/RedirectManagementResource.ts    |  58 ++--
 .../src/services/RelationResource.ts          |  60 ++--
 .../src/services/RelationTypeResource.ts      | 120 +++++++-
 .../src/services/ScriptResource.ts            |  44 +--
 .../src/services/SearcherResource.ts          |  40 +--
 .../src/services/ServerResource.ts            |   8 +-
 .../src/services/StaticFileResource.ts        |  44 +--
 .../src/services/StylesheetResource.ts        |  44 +--
 .../src/services/TelemetryResource.ts         |  29 +-
 .../src/services/TemplateResource.ts          | 114 ++++----
 .../src/services/TrackedReferenceResource.ts  |  68 ++---
 .../src/services/UpgradeResource.ts           |   4 +-
 .../src/services/UserGroupsResource.ts        |  58 ++--
 .../workspace-variant.context.ts              |   8 +-
 ...roperty-editor-ui-checkbox-list.element.ts |   4 +-
 ...property-editor-ui-color-picker.element.ts |   4 +-
 .../property-editor-ui-eye-dropper.element.ts |   4 +-
 ...property-editor-ui-media-picker.element.ts |   4 +-
 ...erty-editor-ui-multi-url-picker.element.ts |   4 +-
 ...rty-editor-ui-radio-button-list.element.ts |   4 +-
 .../property-editor-ui-slider.element.ts      |   4 +-
 .../property-editor-ui-toggle.element.ts      |   4 +-
 .../core/mocks/domains/template.handlers.ts   |   6 +-
 275 files changed, 2523 insertions(+), 1940 deletions(-)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ConsentLevelModel.ts => ConsentLevelPresentationModel.ts} (81%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ContentViewModelBaseDocumentValueDocumentVariantModel.ts => ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts} (50%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel.ts => ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts} (51%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryMoveModel.ts => CopyDataTypeRequestModel.ts} (71%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypeCreateModel.ts => CreateDataTypeRequestModel.ts} (60%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryItemCreateModel.ts => CreateDictionaryItemRequestModel.ts} (59%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDocumentRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{FolderCreateModel.ts => CreateFolderRequestModel.ts} (61%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LanguageCreateModel.ts => CreateLanguageRequestModel.ts} (62%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateMediaRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PackageCreateModel.ts => CreatePackageRequestModel.ts} (69%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateRelationTypeRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateUpdateModel.ts => CreateTemplateRequestModel.ts} (69%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{CultureModel.ts => CultureReponseModel.ts} (76%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypePropertyModel.ts => DataTypePropertyPresentationModel.ts} (68%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypeReferenceModel.ts => DataTypeReferenceResponseModel.ts} (84%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypeModel.ts => DataTypeResponseModel.ts} (54%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DatabaseInstallModel.ts => DatabaseInstallResponseModel.ts} (87%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DatabaseSettingsModel.ts => DatabaseSettingsPresentationModel.ts} (89%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryItemModel.ts => DictionaryItemResponseModel.ts} (60%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryOverviewModel.ts => DictionaryOverviewResponseModel.ts} (79%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryUploadModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainPresentationModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsPresentationModelBaseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{FieldModel.ts => FieldPresentationModel.ts} (75%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemPresentationModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{FolderModel.ts => FolderReponseModel.ts} (54%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{HealthCheckActionModel.ts => HealthCheckActionRequestModel.ts} (88%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{HealthCheckGroupModelBaseModel.ts => HealthCheckGroupPresentationBaseModel.ts} (63%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{HealthCheckResultModel.ts => HealthCheckResultResponseModel.ts} (55%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultPresentationModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{HelpPageModel.ts => HelpPageResponseModel.ts} (82%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryItemsImportModel.ts => ImportDictionaryItemsPresentationModel.ts} (72%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryImportModel.ts => ImportDictionaryRequestModel.ts} (73%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{IndexModel.ts => IndexResponseModel.ts} (90%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallVResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LanguageModel.ts => LanguageResponseModel.ts} (64%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LogLevelCountsModel.ts => LogLevelCountsReponseModel.ts} (80%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LogMessagePropertyModel.ts => LogMessagePropertyPresentationModel.ts} (69%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LogMessageModel.ts => LogMessageResponseModel.ts} (58%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LogTemplateModel.ts => LogTemplateResponseModel.ts} (76%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LoggerModel.ts => LoggerResponseModel.ts} (82%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeContainerResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypeResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaValueModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ModelsBuilderModel.ts => ModelsBuilderResponseModel.ts} (89%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypeMoveModel.ts => MoveDataTypeRequestModel.ts} (71%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypeCopyModel.ts => MoveDictionaryRequestModel.ts} (70%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ObjectTypeResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{OutOfDateStatusModel.ts => OutOfDateStatusResponseModel.ts} (79%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PackageDefinitionModel.ts => PackageDefinitionResponseModel.ts} (57%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PackageManifestModel.ts => PackageManifestResponseModel.ts} (76%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PackageMigrationStatusModel.ts => PackageMigrationStatusResponseModel.ts} (72%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureReponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemPresentationModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupModelBaseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerResponseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedObjectTypeResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupPresentationModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ProfilingStatusModel.ts => ProfilingStatusRequestModel.ts} (68%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PropertyTypeContainerViewModelBaseModel.ts => PropertyTypeContainerResponseModelBaseModel.ts} (76%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PropertyTypeViewModelBaseModel.ts => PropertyTypeResponseModelBaseModel.ts} (91%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{RecycleBinItemModel.ts => RecycleBinItemResponseModel.ts} (85%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{RedirectUrlModel.ts => RedirectUrlResponseModel.ts} (84%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{RedirectUrlStatusModel.ts => RedirectUrlStatusResponseModel.ts} (81%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{RelationItemModel.ts => RelationItemResponseModel.ts} (90%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{RelationModel.ts => RelationResponseModel.ts} (86%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeBaseModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{UserGroupSaveModel.ts => SaveUserGroupRequestModel.ts} (69%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{SavedLogSearchModel.ts => SavedLogSearchPresenationBaseModel.ts} (68%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchResponseModel.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{SearcherModel.ts => SearcherResponseModel.ts} (70%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ServerStatusModel.ts => ServerStatusResponseModel.ts} (80%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TelemetryModel.ts => TelemetryRepresentationBaseModel.ts} (78%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateQueryExecuteFilterModel.ts => TemplateQueryExecuteFilterPresentationModel.ts} (78%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateQueryPropertyModel.ts => TemplateQueryPropertyPresentationModel.ts} (80%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateQueryResultItemModel.ts => TemplateQueryResultItemPresentationModel.ts} (66%)
 delete mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateQuerySettingsModel.ts => TemplateQuerySettingsResponseModel.ts} (52%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateModel.ts => TemplateResponseModel.ts} (60%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateScaffoldModel.ts => TemplateScaffoldResponseModel.ts} (67%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TreeItemModel.ts => TreeItemPresentationModel.ts} (78%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DataTypeUpdateModel.ts => UpdateDataTypeRequestModel.ts} (69%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{DictionaryItemUpdateModel.ts => UpdateDictionaryItemRequestModel.ts} (66%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDocumentRequestModel.ts
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDomainsRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{FolderUpdateModel.ts => UpdateFolderReponseModel.ts} (69%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{LanguageUpdateModel.ts => UpdateLanguageRequestModel.ts} (69%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateMediaRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{PackageUpdateModel.ts => UpdatePackageRequestModel.ts} (61%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateRelationTypeRequestModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{TemplateCreateModel.ts => UpdateTemplateRequestModel.ts} (69%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{UserGroupUpdateModel.ts => UpdateUserGroupRequestModel.ts} (68%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{UpgradeSettingsModel.ts => UpgradeSettingsResponseModel.ts} (82%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UploadDictionaryResponseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{UserGroupModel.ts => UserGroupPresentationModel.ts} (60%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{UserInstallModel.ts => UserInstallResponseModel.ts} (81%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{ValueViewModelBaseModel.ts => ValueModelBaseModel.ts} (75%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantModelBaseModel.ts
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{VariantViewModelBaseModel.ts => VariantResponseModelBaseModel.ts} (75%)
 rename src/Umbraco.Web.UI.Client/libs/backend-api/src/models/{VersionModel.ts => VersionResponseModel.ts} (71%)
 create mode 100644 src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ObjectTypesResource.ts

diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/core/CancelablePromise.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/core/CancelablePromise.ts
index 800d901ec4..26ad303915 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/core/CancelablePromise.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/core/CancelablePromise.ts
@@ -2,122 +2,127 @@
 /* tslint:disable */
 /* eslint-disable */
 export class CancelError extends Error {
-	constructor(message: string) {
-		super(message);
-		this.name = 'CancelError';
-	}
 
-	public get isCancelled(): boolean {
-		return true;
-	}
+    constructor(message: string) {
+        super(message);
+        this.name = 'CancelError';
+    }
+
+    public get isCancelled(): boolean {
+        return true;
+    }
 }
 
 export interface OnCancel {
-	readonly isResolved: boolean;
-	readonly isRejected: boolean;
-	readonly isCancelled: boolean;
+    readonly isResolved: boolean;
+    readonly isRejected: boolean;
+    readonly isCancelled: boolean;
 
-	(cancelHandler: () => void): void;
+    (cancelHandler: () => void): void;
 }
 
 export class CancelablePromise<T> implements Promise<T> {
-	readonly [Symbol.toStringTag]!: string;
+    readonly [Symbol.toStringTag]!: string;
 
-	private _isResolved: boolean;
-	private _isRejected: boolean;
-	private _isCancelled: boolean;
-	private readonly _cancelHandlers: (() => void)[];
-	private readonly _promise: Promise<T>;
-	private _resolve?: (value: T | PromiseLike<T>) => void;
-	private _reject?: (reason?: any) => void;
+    private _isResolved: boolean;
+    private _isRejected: boolean;
+    private _isCancelled: boolean;
+    private readonly _cancelHandlers: (() => void)[];
+    private readonly _promise: Promise<T>;
+    private _resolve?: (value: T | PromiseLike<T>) => void;
+    private _reject?: (reason?: any) => void;
 
-	constructor(
-		executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void, onCancel: OnCancel) => void
-	) {
-		this._isResolved = false;
-		this._isRejected = false;
-		this._isCancelled = false;
-		this._cancelHandlers = [];
-		this._promise = new Promise<T>((resolve, reject) => {
-			this._resolve = resolve;
-			this._reject = reject;
+    constructor(
+        executor: (
+            resolve: (value: T | PromiseLike<T>) => void,
+            reject: (reason?: any) => void,
+            onCancel: OnCancel
+        ) => void
+    ) {
+        this._isResolved = false;
+        this._isRejected = false;
+        this._isCancelled = false;
+        this._cancelHandlers = [];
+        this._promise = new Promise<T>((resolve, reject) => {
+            this._resolve = resolve;
+            this._reject = reject;
 
-			const onResolve = (value: T | PromiseLike<T>): void => {
-				if (this._isResolved || this._isRejected || this._isCancelled) {
-					return;
-				}
-				this._isResolved = true;
-				this._resolve?.(value);
-			};
+            const onResolve = (value: T | PromiseLike<T>): void => {
+                if (this._isResolved || this._isRejected || this._isCancelled) {
+                    return;
+                }
+                this._isResolved = true;
+                this._resolve?.(value);
+            };
 
-			const onReject = (reason?: any): void => {
-				if (this._isResolved || this._isRejected || this._isCancelled) {
-					return;
-				}
-				this._isRejected = true;
-				this._reject?.(reason);
-			};
+            const onReject = (reason?: any): void => {
+                if (this._isResolved || this._isRejected || this._isCancelled) {
+                    return;
+                }
+                this._isRejected = true;
+                this._reject?.(reason);
+            };
 
-			const onCancel = (cancelHandler: () => void): void => {
-				if (this._isResolved || this._isRejected || this._isCancelled) {
-					return;
-				}
-				this._cancelHandlers.push(cancelHandler);
-			};
+            const onCancel = (cancelHandler: () => void): void => {
+                if (this._isResolved || this._isRejected || this._isCancelled) {
+                    return;
+                }
+                this._cancelHandlers.push(cancelHandler);
+            };
 
-			Object.defineProperty(onCancel, 'isResolved', {
-				get: (): boolean => this._isResolved,
-			});
+            Object.defineProperty(onCancel, 'isResolved', {
+                get: (): boolean => this._isResolved,
+            });
 
-			Object.defineProperty(onCancel, 'isRejected', {
-				get: (): boolean => this._isRejected,
-			});
+            Object.defineProperty(onCancel, 'isRejected', {
+                get: (): boolean => this._isRejected,
+            });
 
-			Object.defineProperty(onCancel, 'isCancelled', {
-				get: (): boolean => this._isCancelled,
-			});
+            Object.defineProperty(onCancel, 'isCancelled', {
+                get: (): boolean => this._isCancelled,
+            });
 
-			return executor(onResolve, onReject, onCancel as OnCancel);
-		});
-	}
+            return executor(onResolve, onReject, onCancel as OnCancel);
+        });
+    }
 
-	public then<TResult1 = T, TResult2 = never>(
-		onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
-		onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
-	): Promise<TResult1 | TResult2> {
-		return this._promise.then(onFulfilled, onRejected);
-	}
+    public then<TResult1 = T, TResult2 = never>(
+        onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
+        onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
+    ): Promise<TResult1 | TResult2> {
+        return this._promise.then(onFulfilled, onRejected);
+    }
 
-	public catch<TResult = never>(
-		onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
-	): Promise<T | TResult> {
-		return this._promise.catch(onRejected);
-	}
+    public catch<TResult = never>(
+        onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null
+    ): Promise<T | TResult> {
+        return this._promise.catch(onRejected);
+    }
 
-	public finally(onFinally?: (() => void) | null): Promise<T> {
-		return this._promise.finally(onFinally);
-	}
+    public finally(onFinally?: (() => void) | null): Promise<T> {
+        return this._promise.finally(onFinally);
+    }
 
-	public cancel(): void {
-		if (this._isResolved || this._isRejected || this._isCancelled) {
-			return;
-		}
-		this._isCancelled = true;
-		if (this._cancelHandlers.length) {
-			try {
-				for (const cancelHandler of this._cancelHandlers) {
-					cancelHandler();
-				}
-			} catch (error) {
-				console.warn('Cancellation threw an error', error);
-				return;
-			}
-		}
-		this._cancelHandlers.length = 0;
-		this._reject?.(new CancelError('Request aborted'));
-	}
+    public cancel(): void {
+        if (this._isResolved || this._isRejected || this._isCancelled) {
+            return;
+        }
+        this._isCancelled = true;
+        if (this._cancelHandlers.length) {
+            try {
+                for (const cancelHandler of this._cancelHandlers) {
+                    cancelHandler();
+                }
+            } catch (error) {
+                console.warn('Cancellation threw an error', error);
+                return;
+            }
+        }
+        this._cancelHandlers.length = 0;
+        this._reject?.(new CancelError('Request aborted'));
+    }
 
-	public get isCancelled(): boolean {
-		return this._isCancelled;
-	}
+    public get isCancelled(): boolean {
+        return this._isCancelled;
+    }
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/index.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/index.ts
index dd1647bd85..5e9a463517 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/index.ts
@@ -10,165 +10,198 @@ export type { AuditLogBaseModel } from './models/AuditLogBaseModel';
 export type { AuditLogResponseModel } from './models/AuditLogResponseModel';
 export type { AuditLogWithUsernameResponseModel } from './models/AuditLogWithUsernameResponseModel';
 export { AuditTypeModel } from './models/AuditTypeModel';
-export type { ConsentLevelModel } from './models/ConsentLevelModel';
+export type { ConsentLevelPresentationModel } from './models/ConsentLevelPresentationModel';
+export type { ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel } from './models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel';
 export { ContentStateModel } from './models/ContentStateModel';
-export type { ContentTreeItemModel } from './models/ContentTreeItemModel';
+export type { ContentTreeItemResponseModel } from './models/ContentTreeItemResponseModel';
 export type { ContentTypeCleanupModel } from './models/ContentTypeCleanupModel';
 export type { ContentTypeCompositionModel } from './models/ContentTypeCompositionModel';
 export { ContentTypeCompositionTypeModel } from './models/ContentTypeCompositionTypeModel';
+export type { ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel } from './models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel';
+export type { ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel } from './models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel';
 export type { ContentTypeSortModel } from './models/ContentTypeSortModel';
-export type { ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel } from './models/ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel';
 export type { ContentUrlInfoModel } from './models/ContentUrlInfoModel';
-export type { ContentViewModelBaseDocumentValueDocumentVariantModel } from './models/ContentViewModelBaseDocumentValueDocumentVariantModel';
-export type { CultureModel } from './models/CultureModel';
-export type { DatabaseInstallModel } from './models/DatabaseInstallModel';
-export type { DatabaseSettingsModel } from './models/DatabaseSettingsModel';
-export type { DataTypeCopyModel } from './models/DataTypeCopyModel';
-export type { DataTypeCreateModel } from './models/DataTypeCreateModel';
-export type { DataTypeModel } from './models/DataTypeModel';
+export type { CopyDataTypeRequestModel } from './models/CopyDataTypeRequestModel';
+export type { CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
+export type { CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
+export type { CreateDataTypeRequestModel } from './models/CreateDataTypeRequestModel';
+export type { CreateDictionaryItemRequestModel } from './models/CreateDictionaryItemRequestModel';
+export type { CreateDocumentRequestModel } from './models/CreateDocumentRequestModel';
+export type { CreateFolderRequestModel } from './models/CreateFolderRequestModel';
+export type { CreateLanguageRequestModel } from './models/CreateLanguageRequestModel';
+export type { CreateMediaRequestModel } from './models/CreateMediaRequestModel';
+export type { CreatePackageRequestModel } from './models/CreatePackageRequestModel';
+export type { CreateRelationTypeRequestModel } from './models/CreateRelationTypeRequestModel';
+export type { CreateTemplateRequestModel } from './models/CreateTemplateRequestModel';
+export type { CultureReponseModel } from './models/CultureReponseModel';
+export type { DatabaseInstallResponseModel } from './models/DatabaseInstallResponseModel';
+export type { DatabaseSettingsPresentationModel } from './models/DatabaseSettingsPresentationModel';
 export type { DataTypeModelBaseModel } from './models/DataTypeModelBaseModel';
-export type { DataTypeMoveModel } from './models/DataTypeMoveModel';
-export type { DataTypePropertyModel } from './models/DataTypePropertyModel';
+export type { DataTypePropertyPresentationModel } from './models/DataTypePropertyPresentationModel';
 export type { DataTypePropertyReferenceModel } from './models/DataTypePropertyReferenceModel';
-export type { DataTypeReferenceModel } from './models/DataTypeReferenceModel';
-export type { DataTypeUpdateModel } from './models/DataTypeUpdateModel';
-export type { DictionaryImportModel } from './models/DictionaryImportModel';
-export type { DictionaryItemCreateModel } from './models/DictionaryItemCreateModel';
-export type { DictionaryItemModel } from './models/DictionaryItemModel';
+export type { DataTypeReferenceResponseModel } from './models/DataTypeReferenceResponseModel';
+export type { DataTypeResponseModel } from './models/DataTypeResponseModel';
 export type { DictionaryItemModelBaseModel } from './models/DictionaryItemModelBaseModel';
-export type { DictionaryItemsImportModel } from './models/DictionaryItemsImportModel';
+export type { DictionaryItemResponseModel } from './models/DictionaryItemResponseModel';
 export type { DictionaryItemTranslationModel } from './models/DictionaryItemTranslationModel';
-export type { DictionaryItemUpdateModel } from './models/DictionaryItemUpdateModel';
-export type { DictionaryMoveModel } from './models/DictionaryMoveModel';
-export type { DictionaryOverviewModel } from './models/DictionaryOverviewModel';
-export type { DictionaryUploadModel } from './models/DictionaryUploadModel';
+export type { DictionaryOverviewResponseModel } from './models/DictionaryOverviewResponseModel';
 export { DirectionModel } from './models/DirectionModel';
-export type { DocumentBlueprintTreeItemModel } from './models/DocumentBlueprintTreeItemModel';
-export type { DocumentModel } from './models/DocumentModel';
-export type { DocumentTreeItemModel } from './models/DocumentTreeItemModel';
-export type { DocumentTypeModel } from './models/DocumentTypeModel';
-export type { DocumentTypePropertyTypeContainerModel } from './models/DocumentTypePropertyTypeContainerModel';
-export type { DocumentTypePropertyTypeModel } from './models/DocumentTypePropertyTypeModel';
-export type { DocumentTypeTreeItemModel } from './models/DocumentTypeTreeItemModel';
+export type { DocumentBlueprintTreeItemResponseModel } from './models/DocumentBlueprintTreeItemResponseModel';
+export type { DocumentResponseModel } from './models/DocumentResponseModel';
+export type { DocumentTreeItemResponseModel } from './models/DocumentTreeItemResponseModel';
+export type { DocumentTypePropertyTypeContainerResponseModel } from './models/DocumentTypePropertyTypeContainerResponseModel';
+export type { DocumentTypePropertyTypeResponseModel } from './models/DocumentTypePropertyTypeResponseModel';
+export type { DocumentTypeResponseModel } from './models/DocumentTypeResponseModel';
+export type { DocumentTypeTreeItemResponseModel } from './models/DocumentTypeTreeItemResponseModel';
 export type { DocumentValueModel } from './models/DocumentValueModel';
-export type { DocumentVariantModel } from './models/DocumentVariantModel';
-export type { EntityTreeItemModel } from './models/EntityTreeItemModel';
-export type { FieldModel } from './models/FieldModel';
-export type { FileSystemTreeItemModel } from './models/FileSystemTreeItemModel';
-export type { FolderCreateModel } from './models/FolderCreateModel';
-export type { FolderModel } from './models/FolderModel';
+export type { DocumentVariantRequestModel } from './models/DocumentVariantRequestModel';
+export type { DocumentVariantResponseModel } from './models/DocumentVariantResponseModel';
+export type { DomainPresentationModel } from './models/DomainPresentationModel';
+export type { DomainsPresentationModelBaseModel } from './models/DomainsPresentationModelBaseModel';
+export type { DomainsResponseModel } from './models/DomainsResponseModel';
+export type { EntityTreeItemResponseModel } from './models/EntityTreeItemResponseModel';
+export type { FieldPresentationModel } from './models/FieldPresentationModel';
+export type { FileSystemTreeItemPresentationModel } from './models/FileSystemTreeItemPresentationModel';
 export type { FolderModelBaseModel } from './models/FolderModelBaseModel';
-export type { FolderTreeItemModel } from './models/FolderTreeItemModel';
-export type { FolderUpdateModel } from './models/FolderUpdateModel';
-export type { HealthCheckActionModel } from './models/HealthCheckActionModel';
-export type { HealthCheckGroupModel } from './models/HealthCheckGroupModel';
-export type { HealthCheckGroupModelBaseModel } from './models/HealthCheckGroupModelBaseModel';
-export type { HealthCheckGroupWithResultModel } from './models/HealthCheckGroupWithResultModel';
+export type { FolderReponseModel } from './models/FolderReponseModel';
+export type { FolderTreeItemResponseModel } from './models/FolderTreeItemResponseModel';
+export type { HealthCheckActionRequestModel } from './models/HealthCheckActionRequestModel';
+export type { HealthCheckGroupPresentationBaseModel } from './models/HealthCheckGroupPresentationBaseModel';
+export type { HealthCheckGroupPresentationModel } from './models/HealthCheckGroupPresentationModel';
+export type { HealthCheckGroupResponseModel } from './models/HealthCheckGroupResponseModel';
+export type { HealthCheckGroupWithResultResponseModel } from './models/HealthCheckGroupWithResultResponseModel';
 export type { HealthCheckModel } from './models/HealthCheckModel';
 export type { HealthCheckModelBaseModel } from './models/HealthCheckModelBaseModel';
-export type { HealthCheckResultModel } from './models/HealthCheckResultModel';
-export type { HealthCheckWithResultModel } from './models/HealthCheckWithResultModel';
+export type { HealthCheckResultResponseModel } from './models/HealthCheckResultResponseModel';
+export type { HealthCheckWithResultPresentationModel } from './models/HealthCheckWithResultPresentationModel';
 export { HealthStatusModel } from './models/HealthStatusModel';
-export type { HelpPageModel } from './models/HelpPageModel';
-export type { IndexModel } from './models/IndexModel';
-export type { InstallModel } from './models/InstallModel';
-export type { InstallSettingsModel } from './models/InstallSettingsModel';
-export type { LanguageCreateModel } from './models/LanguageCreateModel';
-export type { LanguageModel } from './models/LanguageModel';
+export type { HelpPageResponseModel } from './models/HelpPageResponseModel';
+export type { ImportDictionaryItemsPresentationModel } from './models/ImportDictionaryItemsPresentationModel';
+export type { ImportDictionaryRequestModel } from './models/ImportDictionaryRequestModel';
+export type { IndexResponseModel } from './models/IndexResponseModel';
+export type { InstallSettingsResponseModel } from './models/InstallSettingsResponseModel';
+export type { InstallVResponseModel } from './models/InstallVResponseModel';
 export type { LanguageModelBaseModel } from './models/LanguageModelBaseModel';
-export type { LanguageUpdateModel } from './models/LanguageUpdateModel';
-export type { LoggerModel } from './models/LoggerModel';
-export type { LogLevelCountsModel } from './models/LogLevelCountsModel';
+export type { LanguageResponseModel } from './models/LanguageResponseModel';
+export type { LoggerResponseModel } from './models/LoggerResponseModel';
+export type { LogLevelCountsReponseModel } from './models/LogLevelCountsReponseModel';
 export { LogLevelModel } from './models/LogLevelModel';
-export type { LogMessageModel } from './models/LogMessageModel';
-export type { LogMessagePropertyModel } from './models/LogMessagePropertyModel';
-export type { LogTemplateModel } from './models/LogTemplateModel';
-export type { ModelsBuilderModel } from './models/ModelsBuilderModel';
+export type { LogMessagePropertyPresentationModel } from './models/LogMessagePropertyPresentationModel';
+export type { LogMessageResponseModel } from './models/LogMessageResponseModel';
+export type { LogTemplateResponseModel } from './models/LogTemplateResponseModel';
+export type { MediaTypePropertyTypeContainerResponseModel } from './models/MediaTypePropertyTypeContainerResponseModel';
+export type { MediaTypePropertyTypeResponseModel } from './models/MediaTypePropertyTypeResponseModel';
+export type { MediaTypeResponseModel } from './models/MediaTypeResponseModel';
+export type { MediaValueModel } from './models/MediaValueModel';
+export type { MediaVariantRequestModel } from './models/MediaVariantRequestModel';
+export type { MediaVariantResponseModel } from './models/MediaVariantResponseModel';
+export type { ModelsBuilderResponseModel } from './models/ModelsBuilderResponseModel';
 export { ModelsModeModel } from './models/ModelsModeModel';
+export type { MoveDataTypeRequestModel } from './models/MoveDataTypeRequestModel';
+export type { MoveDictionaryRequestModel } from './models/MoveDictionaryRequestModel';
+export type { ObjectTypeResponseModel } from './models/ObjectTypeResponseModel';
 export type { OkResultModel } from './models/OkResultModel';
 export { OperatorModel } from './models/OperatorModel';
-export type { OutOfDateStatusModel } from './models/OutOfDateStatusModel';
+export type { OutOfDateStatusResponseModel } from './models/OutOfDateStatusResponseModel';
 export { OutOfDateTypeModel } from './models/OutOfDateTypeModel';
-export type { PackageCreateModel } from './models/PackageCreateModel';
-export type { PackageDefinitionModel } from './models/PackageDefinitionModel';
-export type { PackageManifestModel } from './models/PackageManifestModel';
-export type { PackageMigrationStatusModel } from './models/PackageMigrationStatusModel';
+export type { PackageDefinitionResponseModel } from './models/PackageDefinitionResponseModel';
+export type { PackageManifestResponseModel } from './models/PackageManifestResponseModel';
+export type { PackageMigrationStatusResponseModel } from './models/PackageMigrationStatusResponseModel';
 export type { PackageModelBaseModel } from './models/PackageModelBaseModel';
-export type { PackageUpdateModel } from './models/PackageUpdateModel';
 export type { PagedAuditLogResponseModel } from './models/PagedAuditLogResponseModel';
 export type { PagedAuditLogWithUsernameResponseModel } from './models/PagedAuditLogWithUsernameResponseModel';
-export type { PagedContentTreeItemModel } from './models/PagedContentTreeItemModel';
-export type { PagedCultureModel } from './models/PagedCultureModel';
-export type { PagedDictionaryOverviewModel } from './models/PagedDictionaryOverviewModel';
-export type { PagedDocumentBlueprintTreeItemModel } from './models/PagedDocumentBlueprintTreeItemModel';
-export type { PagedDocumentTreeItemModel } from './models/PagedDocumentTreeItemModel';
-export type { PagedDocumentTypeTreeItemModel } from './models/PagedDocumentTypeTreeItemModel';
-export type { PagedEntityTreeItemModel } from './models/PagedEntityTreeItemModel';
-export type { PagedFileSystemTreeItemModel } from './models/PagedFileSystemTreeItemModel';
-export type { PagedFolderTreeItemModel } from './models/PagedFolderTreeItemModel';
-export type { PagedHealthCheckGroupModelBaseModel } from './models/PagedHealthCheckGroupModelBaseModel';
-export type { PagedHelpPageModel } from './models/PagedHelpPageModel';
-export type { PagedIndexModel } from './models/PagedIndexModel';
-export type { PagedLanguageModel } from './models/PagedLanguageModel';
-export type { PagedLoggerModel } from './models/PagedLoggerModel';
-export type { PagedLogMessageModel } from './models/PagedLogMessageModel';
-export type { PagedLogTemplateModel } from './models/PagedLogTemplateModel';
-export type { PagedPackageDefinitionModel } from './models/PagedPackageDefinitionModel';
-export type { PagedPackageMigrationStatusModel } from './models/PagedPackageMigrationStatusModel';
-export type { PagedRecycleBinItemModel } from './models/PagedRecycleBinItemModel';
-export type { PagedRedirectUrlModel } from './models/PagedRedirectUrlModel';
-export type { PagedRelationItemModel } from './models/PagedRelationItemModel';
-export type { PagedRelationModel } from './models/PagedRelationModel';
-export type { PagedSavedLogSearchModel } from './models/PagedSavedLogSearchModel';
-export type { PagedSearcherModel } from './models/PagedSearcherModel';
-export type { PagedSearchResultModel } from './models/PagedSearchResultModel';
-export type { PagedTelemetryModel } from './models/PagedTelemetryModel';
-export type { PagedUserGroupModel } from './models/PagedUserGroupModel';
+export type { PagedContentTreeItemResponseModel } from './models/PagedContentTreeItemResponseModel';
+export type { PagedCultureReponseModel } from './models/PagedCultureReponseModel';
+export type { PagedDictionaryOverviewResponseModel } from './models/PagedDictionaryOverviewResponseModel';
+export type { PagedDocumentBlueprintTreeItemResponseModel } from './models/PagedDocumentBlueprintTreeItemResponseModel';
+export type { PagedDocumentTreeItemResponseModel } from './models/PagedDocumentTreeItemResponseModel';
+export type { PagedDocumentTypeTreeItemResponseModel } from './models/PagedDocumentTypeTreeItemResponseModel';
+export type { PagedEntityTreeItemResponseModel } from './models/PagedEntityTreeItemResponseModel';
+export type { PagedFileSystemTreeItemPresentationModel } from './models/PagedFileSystemTreeItemPresentationModel';
+export type { PagedFolderTreeItemResponseModel } from './models/PagedFolderTreeItemResponseModel';
+export type { PagedHealthCheckGroupResponseModel } from './models/PagedHealthCheckGroupResponseModel';
+export type { PagedHelpPageResponseModel } from './models/PagedHelpPageResponseModel';
+export type { PagedIndexResponseModel } from './models/PagedIndexResponseModel';
+export type { PagedLanguageResponseModel } from './models/PagedLanguageResponseModel';
+export type { PagedLoggerResponseModel } from './models/PagedLoggerResponseModel';
+export type { PagedLogMessageResponseModel } from './models/PagedLogMessageResponseModel';
+export type { PagedLogTemplateResponseModel } from './models/PagedLogTemplateResponseModel';
+export type { PagedObjectTypeResponseModel } from './models/PagedObjectTypeResponseModel';
+export type { PagedPackageDefinitionResponseModel } from './models/PagedPackageDefinitionResponseModel';
+export type { PagedPackageMigrationStatusResponseModel } from './models/PagedPackageMigrationStatusResponseModel';
+export type { PagedRecycleBinItemResponseModel } from './models/PagedRecycleBinItemResponseModel';
+export type { PagedRedirectUrlResponseModel } from './models/PagedRedirectUrlResponseModel';
+export type { PagedRelationItemResponseModel } from './models/PagedRelationItemResponseModel';
+export type { PagedRelationResponseModel } from './models/PagedRelationResponseModel';
+export type { PagedSavedLogSearchResponseModel } from './models/PagedSavedLogSearchResponseModel';
+export type { PagedSearcherResponseModel } from './models/PagedSearcherResponseModel';
+export type { PagedSearchResultResponseModel } from './models/PagedSearchResultResponseModel';
+export type { PagedTelemetryResponseModel } from './models/PagedTelemetryResponseModel';
+export type { PagedUserGroupPresentationModel } from './models/PagedUserGroupPresentationModel';
 export type { ProblemDetailsModel } from './models/ProblemDetailsModel';
-export type { ProfilingStatusModel } from './models/ProfilingStatusModel';
+export type { ProfilingStatusRequestModel } from './models/ProfilingStatusRequestModel';
+export type { ProfilingStatusResponseModel } from './models/ProfilingStatusResponseModel';
 export type { PropertyTypeAppearanceModel } from './models/PropertyTypeAppearanceModel';
-export type { PropertyTypeContainerViewModelBaseModel } from './models/PropertyTypeContainerViewModelBaseModel';
+export type { PropertyTypeContainerResponseModelBaseModel } from './models/PropertyTypeContainerResponseModelBaseModel';
+export type { PropertyTypeResponseModelBaseModel } from './models/PropertyTypeResponseModelBaseModel';
 export type { PropertyTypeValidationModel } from './models/PropertyTypeValidationModel';
-export type { PropertyTypeViewModelBaseModel } from './models/PropertyTypeViewModelBaseModel';
-export type { RecycleBinItemModel } from './models/RecycleBinItemModel';
+export type { RecycleBinItemResponseModel } from './models/RecycleBinItemResponseModel';
 export { RedirectStatusModel } from './models/RedirectStatusModel';
-export type { RedirectUrlModel } from './models/RedirectUrlModel';
-export type { RedirectUrlStatusModel } from './models/RedirectUrlStatusModel';
-export type { RelationItemModel } from './models/RelationItemModel';
-export type { RelationModel } from './models/RelationModel';
+export type { RedirectUrlResponseModel } from './models/RedirectUrlResponseModel';
+export type { RedirectUrlStatusResponseModel } from './models/RedirectUrlStatusResponseModel';
+export type { RelationItemResponseModel } from './models/RelationItemResponseModel';
+export type { RelationResponseModel } from './models/RelationResponseModel';
+export type { RelationTypeBaseModel } from './models/RelationTypeBaseModel';
+export type { RelationTypeResponseModel } from './models/RelationTypeResponseModel';
 export { RuntimeLevelModel } from './models/RuntimeLevelModel';
-export type { SavedLogSearchModel } from './models/SavedLogSearchModel';
-export type { SearcherModel } from './models/SearcherModel';
-export type { SearchResultModel } from './models/SearchResultModel';
-export type { ServerStatusModel } from './models/ServerStatusModel';
+export type { SavedLogSearchPresenationBaseModel } from './models/SavedLogSearchPresenationBaseModel';
+export type { SavedLogSearchRequestModel } from './models/SavedLogSearchRequestModel';
+export type { SavedLogSearchResponseModel } from './models/SavedLogSearchResponseModel';
+export type { SaveUserGroupRequestModel } from './models/SaveUserGroupRequestModel';
+export type { SearcherResponseModel } from './models/SearcherResponseModel';
+export type { SearchResultResponseModel } from './models/SearchResultResponseModel';
+export type { ServerStatusResponseModel } from './models/ServerStatusResponseModel';
 export { StatusResultTypeModel } from './models/StatusResultTypeModel';
 export { TelemetryLevelModel } from './models/TelemetryLevelModel';
-export type { TelemetryModel } from './models/TelemetryModel';
-export type { TemplateCreateModel } from './models/TemplateCreateModel';
-export type { TemplateModel } from './models/TemplateModel';
+export type { TelemetryRepresentationBaseModel } from './models/TelemetryRepresentationBaseModel';
+export type { TelemetryRequestModel } from './models/TelemetryRequestModel';
+export type { TelemetryResponseModel } from './models/TelemetryResponseModel';
 export type { TemplateModelBaseModel } from './models/TemplateModelBaseModel';
-export type { TemplateQueryExecuteFilterModel } from './models/TemplateQueryExecuteFilterModel';
+export type { TemplateQueryExecuteFilterPresentationModel } from './models/TemplateQueryExecuteFilterPresentationModel';
 export type { TemplateQueryExecuteModel } from './models/TemplateQueryExecuteModel';
 export type { TemplateQueryExecuteSortModel } from './models/TemplateQueryExecuteSortModel';
 export type { TemplateQueryOperatorModel } from './models/TemplateQueryOperatorModel';
-export type { TemplateQueryPropertyModel } from './models/TemplateQueryPropertyModel';
+export type { TemplateQueryPropertyPresentationModel } from './models/TemplateQueryPropertyPresentationModel';
 export { TemplateQueryPropertyTypeModel } from './models/TemplateQueryPropertyTypeModel';
-export type { TemplateQueryResultItemModel } from './models/TemplateQueryResultItemModel';
-export type { TemplateQueryResultModel } from './models/TemplateQueryResultModel';
-export type { TemplateQuerySettingsModel } from './models/TemplateQuerySettingsModel';
-export type { TemplateScaffoldModel } from './models/TemplateScaffoldModel';
-export type { TemplateUpdateModel } from './models/TemplateUpdateModel';
-export type { TreeItemModel } from './models/TreeItemModel';
-export type { UpgradeSettingsModel } from './models/UpgradeSettingsModel';
+export type { TemplateQueryResultItemPresentationModel } from './models/TemplateQueryResultItemPresentationModel';
+export type { TemplateQueryResultResponseModel } from './models/TemplateQueryResultResponseModel';
+export type { TemplateQuerySettingsResponseModel } from './models/TemplateQuerySettingsResponseModel';
+export type { TemplateResponseModel } from './models/TemplateResponseModel';
+export type { TemplateScaffoldResponseModel } from './models/TemplateScaffoldResponseModel';
+export type { TreeItemPresentationModel } from './models/TreeItemPresentationModel';
+export type { UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
+export type { UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
+export type { UpdateDataTypeRequestModel } from './models/UpdateDataTypeRequestModel';
+export type { UpdateDictionaryItemRequestModel } from './models/UpdateDictionaryItemRequestModel';
+export type { UpdateDocumentRequestModel } from './models/UpdateDocumentRequestModel';
+export type { UpdateDomainsRequestModel } from './models/UpdateDomainsRequestModel';
+export type { UpdateFolderReponseModel } from './models/UpdateFolderReponseModel';
+export type { UpdateLanguageRequestModel } from './models/UpdateLanguageRequestModel';
+export type { UpdateMediaRequestModel } from './models/UpdateMediaRequestModel';
+export type { UpdatePackageRequestModel } from './models/UpdatePackageRequestModel';
+export type { UpdateRelationTypeRequestModel } from './models/UpdateRelationTypeRequestModel';
+export type { UpdateTemplateRequestModel } from './models/UpdateTemplateRequestModel';
+export type { UpdateUserGroupRequestModel } from './models/UpdateUserGroupRequestModel';
+export type { UpgradeSettingsResponseModel } from './models/UpgradeSettingsResponseModel';
+export type { UploadDictionaryResponseModel } from './models/UploadDictionaryResponseModel';
 export type { UserGroupBaseModel } from './models/UserGroupBaseModel';
-export type { UserGroupModel } from './models/UserGroupModel';
-export type { UserGroupSaveModel } from './models/UserGroupSaveModel';
-export type { UserGroupUpdateModel } from './models/UserGroupUpdateModel';
-export type { UserInstallModel } from './models/UserInstallModel';
+export type { UserGroupPresentationModel } from './models/UserGroupPresentationModel';
+export type { UserInstallResponseModel } from './models/UserInstallResponseModel';
 export type { UserSettingsModel } from './models/UserSettingsModel';
-export type { ValueViewModelBaseModel } from './models/ValueViewModelBaseModel';
-export type { VariantViewModelBaseModel } from './models/VariantViewModelBaseModel';
-export type { VersionModel } from './models/VersionModel';
+export type { ValueModelBaseModel } from './models/ValueModelBaseModel';
+export type { VariantModelBaseModel } from './models/VariantModelBaseModel';
+export type { VariantResponseModelBaseModel } from './models/VariantResponseModelBaseModel';
+export type { VersionResponseModel } from './models/VersionResponseModel';
 
 export { AuditLogResource } from './services/AuditLogResource';
 export { CultureResource } from './services/CultureResource';
@@ -188,6 +221,7 @@ export { MediaTypeResource } from './services/MediaTypeResource';
 export { MemberGroupResource } from './services/MemberGroupResource';
 export { MemberTypeResource } from './services/MemberTypeResource';
 export { ModelsBuilderResource } from './services/ModelsBuilderResource';
+export { ObjectTypesResource } from './services/ObjectTypesResource';
 export { PackageResource } from './services/PackageResource';
 export { PartialViewResource } from './services/PartialViewResource';
 export { ProfilingResource } from './services/ProfilingResource';
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogBaseModel.ts
index 8da67f825a..1e56192c01 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogBaseModel.ts
@@ -13,4 +13,3 @@ export type AuditLogBaseModel = {
     comment?: string | null;
     parameters?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogResponseModel.ts
index 53aaafdb87..150aed42b7 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogResponseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogResponseModel.ts
@@ -5,4 +5,3 @@
 import type { AuditLogBaseModel } from './AuditLogBaseModel';
 
 export type AuditLogResponseModel = AuditLogBaseModel;
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogWithUsernameResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogWithUsernameResponseModel.ts
index eb768a7c43..3cc6f615f3 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogWithUsernameResponseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/AuditLogWithUsernameResponseModel.ts
@@ -5,7 +5,6 @@
 import type { AuditLogBaseModel } from './AuditLogBaseModel';
 
 export type AuditLogWithUsernameResponseModel = (AuditLogBaseModel & {
-    userName?: string | null;
-    userAvatars?: Array<string> | null;
+userName?: string | null;
+userAvatars?: Array<string> | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ConsentLevelModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ConsentLevelPresentationModel.ts
similarity index 81%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ConsentLevelModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ConsentLevelPresentationModel.ts
index 713ad10919..f8481a3c36 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ConsentLevelModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ConsentLevelPresentationModel.ts
@@ -4,8 +4,7 @@
 
 import type { TelemetryLevelModel } from './TelemetryLevelModel';
 
-export type ConsentLevelModel = {
+export type ConsentLevelPresentationModel = {
     level?: TelemetryLevelModel;
     description?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentViewModelBaseDocumentValueDocumentVariantModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts
similarity index 50%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentViewModelBaseDocumentValueDocumentVariantModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts
index 4f95f27cbe..ed77830467 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentViewModelBaseDocumentValueDocumentVariantModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel.ts
@@ -3,12 +3,11 @@
 /* eslint-disable */
 
 import type { DocumentValueModel } from './DocumentValueModel';
-import type { DocumentVariantModel } from './DocumentVariantModel';
+import type { DocumentVariantResponseModel } from './DocumentVariantResponseModel';
 
-export type ContentViewModelBaseDocumentValueDocumentVariantModel = {
+export type ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel = {
+    values?: Array<DocumentValueModel>;
+    variants?: Array<DocumentVariantResponseModel>;
     key?: string;
     contentTypeKey?: string;
-    values?: Array<DocumentValueModel>;
-    variants?: Array<DocumentVariantModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemModel.ts
deleted file mode 100644
index 2144bc6a1f..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntityTreeItemModel } from './EntityTreeItemModel';
-
-export type ContentTreeItemModel = (EntityTreeItemModel & {
-    $type: string;
-    noAccess?: boolean;
-    isTrashed?: boolean;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemResponseModel.ts
new file mode 100644
index 0000000000..d87dbd5e82
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTreeItemResponseModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { EntityTreeItemResponseModel } from './EntityTreeItemResponseModel';
+
+export type ContentTreeItemResponseModel = (EntityTreeItemResponseModel & {
+$type: string;
+noAccess?: boolean;
+isTrashed?: boolean;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCleanupModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCleanupModel.ts
index 7ea186e255..6d5a4bdf54 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCleanupModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCleanupModel.ts
@@ -7,4 +7,3 @@ export type ContentTypeCleanupModel = {
     keepAllVersionsNewerThanDays?: number | null;
     keepLatestVersionPerDayForDays?: number | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCompositionModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCompositionModel.ts
index eefcd22a19..55cd2c0c03 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCompositionModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeCompositionModel.ts
@@ -8,4 +8,3 @@ export type ContentTypeCompositionModel = {
     key?: string;
     compositionType?: ContentTypeCompositionTypeModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts
similarity index 51%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts
index f4edc901a6..34a78a67b9 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel.ts
@@ -2,13 +2,12 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel';
 import type { ContentTypeCompositionModel } from './ContentTypeCompositionModel';
 import type { ContentTypeSortModel } from './ContentTypeSortModel';
-import type { DocumentTypePropertyTypeContainerModel } from './DocumentTypePropertyTypeContainerModel';
-import type { DocumentTypePropertyTypeModel } from './DocumentTypePropertyTypeModel';
+import type { DocumentTypePropertyTypeContainerResponseModel } from './DocumentTypePropertyTypeContainerResponseModel';
+import type { DocumentTypePropertyTypeResponseModel } from './DocumentTypePropertyTypeResponseModel';
 
-export type ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel = {
+export type ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel = {
     key?: string;
     alias?: string;
     name?: string;
@@ -18,10 +17,8 @@ export type ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypeProperty
     variesByCulture?: boolean;
     variesBySegment?: boolean;
     isElement?: boolean;
-    properties?: Array<DocumentTypePropertyTypeModel>;
-    containers?: Array<DocumentTypePropertyTypeContainerModel>;
+    properties?: Array<DocumentTypePropertyTypeResponseModel>;
+    containers?: Array<DocumentTypePropertyTypeContainerResponseModel>;
     allowedContentTypes?: Array<ContentTypeSortModel>;
     compositions?: Array<ContentTypeCompositionModel>;
-    cleanup?: ContentTypeCleanupModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts
new file mode 100644
index 0000000000..0cae4423f3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel.ts
@@ -0,0 +1,24 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentTypeCompositionModel } from './ContentTypeCompositionModel';
+import type { ContentTypeSortModel } from './ContentTypeSortModel';
+import type { MediaTypePropertyTypeContainerResponseModel } from './MediaTypePropertyTypeContainerResponseModel';
+import type { MediaTypePropertyTypeResponseModel } from './MediaTypePropertyTypeResponseModel';
+
+export type ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel = {
+    key?: string;
+    alias?: string;
+    name?: string;
+    description?: string | null;
+    icon?: string;
+    allowedAsRoot?: boolean;
+    variesByCulture?: boolean;
+    variesBySegment?: boolean;
+    isElement?: boolean;
+    properties?: Array<MediaTypePropertyTypeResponseModel>;
+    containers?: Array<MediaTypePropertyTypeContainerResponseModel>;
+    allowedContentTypes?: Array<ContentTypeSortModel>;
+    compositions?: Array<ContentTypeCompositionModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeSortModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeSortModel.ts
index 63b6a44a11..bf4f78b7d6 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeSortModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentTypeSortModel.ts
@@ -6,4 +6,3 @@ export type ContentTypeSortModel = {
     key?: string;
     sortOrder?: number;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentUrlInfoModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentUrlInfoModel.ts
index aabc5314c5..0afeb120d3 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentUrlInfoModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ContentUrlInfoModel.ts
@@ -6,4 +6,3 @@ export type ContentUrlInfoModel = {
     culture?: string | null;
     url?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryMoveModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CopyDataTypeRequestModel.ts
similarity index 71%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryMoveModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CopyDataTypeRequestModel.ts
index c58b2262a1..d15502deef 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryMoveModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CopyDataTypeRequestModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DictionaryMoveModel = {
+export type CopyDataTypeRequestModel = {
     targetKey?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts
new file mode 100644
index 0000000000..6e7608eca4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DocumentValueModel } from './DocumentValueModel';
+import type { DocumentVariantRequestModel } from './DocumentVariantRequestModel';
+
+export type CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel = {
+    values?: Array<DocumentValueModel>;
+    variants?: Array<DocumentVariantRequestModel>;
+    parentKey?: string | null;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts
new file mode 100644
index 0000000000..a8ecb5c7bb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { MediaValueModel } from './MediaValueModel';
+import type { MediaVariantRequestModel } from './MediaVariantRequestModel';
+
+export type CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel = {
+    values?: Array<MediaValueModel>;
+    variants?: Array<MediaVariantRequestModel>;
+    parentKey?: string | null;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeCreateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDataTypeRequestModel.ts
similarity index 60%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeCreateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDataTypeRequestModel.ts
index 0c686d4136..df4380d8ad 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDataTypeRequestModel.ts
@@ -4,7 +4,6 @@
 
 import type { DataTypeModelBaseModel } from './DataTypeModelBaseModel';
 
-export type DataTypeCreateModel = (DataTypeModelBaseModel & {
-    parentKey?: string | null;
+export type CreateDataTypeRequestModel = (DataTypeModelBaseModel & {
+parentKey?: string | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemCreateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDictionaryItemRequestModel.ts
similarity index 59%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemCreateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDictionaryItemRequestModel.ts
index 211bed9e4f..fb32c43da5 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDictionaryItemRequestModel.ts
@@ -4,7 +4,6 @@
 
 import type { DictionaryItemModelBaseModel } from './DictionaryItemModelBaseModel';
 
-export type DictionaryItemCreateModel = (DictionaryItemModelBaseModel & {
-    parentKey?: string | null;
+export type CreateDictionaryItemRequestModel = (DictionaryItemModelBaseModel & {
+parentKey?: string | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDocumentRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDocumentRequestModel.ts
new file mode 100644
index 0000000000..a789b2c4fa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateDocumentRequestModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
+
+export type CreateDocumentRequestModel = (CreateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel & {
+contentTypeKey?: string;
+templateKey?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderCreateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateFolderRequestModel.ts
similarity index 61%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderCreateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateFolderRequestModel.ts
index 1ae49bc7fa..6f23857001 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateFolderRequestModel.ts
@@ -4,7 +4,6 @@
 
 import type { FolderModelBaseModel } from './FolderModelBaseModel';
 
-export type FolderCreateModel = (FolderModelBaseModel & {
-    parentKey?: string | null;
+export type CreateFolderRequestModel = (FolderModelBaseModel & {
+parentKey?: string | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageCreateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateLanguageRequestModel.ts
similarity index 62%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageCreateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateLanguageRequestModel.ts
index 69149b0561..4eed24634f 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateLanguageRequestModel.ts
@@ -4,7 +4,6 @@
 
 import type { LanguageModelBaseModel } from './LanguageModelBaseModel';
 
-export type LanguageCreateModel = (LanguageModelBaseModel & {
-    isoCode?: string;
+export type CreateLanguageRequestModel = (LanguageModelBaseModel & {
+isoCode?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateMediaRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateMediaRequestModel.ts
new file mode 100644
index 0000000000..bf4333b9da
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateMediaRequestModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
+
+export type CreateMediaRequestModel = (CreateContentRequestModelBaseMediaValueModelMediaVariantRequestModel & {
+contentTypeKey?: string;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageCreateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreatePackageRequestModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageCreateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreatePackageRequestModel.ts
index 4061ed4560..2cfedb1c03 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreatePackageRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { PackageModelBaseModel } from './PackageModelBaseModel';
 
-export type PackageCreateModel = PackageModelBaseModel;
-
+export type CreatePackageRequestModel = PackageModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateRelationTypeRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateRelationTypeRequestModel.ts
new file mode 100644
index 0000000000..de6232ee5c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateRelationTypeRequestModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RelationTypeBaseModel } from './RelationTypeBaseModel';
+
+export type CreateRelationTypeRequestModel = (RelationTypeBaseModel & {
+key?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateTemplateRequestModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateTemplateRequestModel.ts
index 64da7cb574..e2d8afb847 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CreateTemplateRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { TemplateModelBaseModel } from './TemplateModelBaseModel';
 
-export type TemplateUpdateModel = TemplateModelBaseModel;
-
+export type CreateTemplateRequestModel = TemplateModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CultureModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CultureReponseModel.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CultureModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CultureReponseModel.ts
index 8a6836bd00..3b17cfc739 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CultureModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/CultureReponseModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type CultureModel = {
+export type CultureReponseModel = {
     name?: string;
     englishName?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModelBaseModel.ts
index 85a98bebfb..9c8b59ed42 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModelBaseModel.ts
@@ -2,12 +2,11 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { DataTypePropertyModel } from './DataTypePropertyModel';
+import type { DataTypePropertyPresentationModel } from './DataTypePropertyPresentationModel';
 
 export type DataTypeModelBaseModel = {
     name?: string;
     propertyEditorAlias?: string;
     propertyEditorUiAlias?: string | null;
-    data?: Array<DataTypePropertyModel>;
+    values?: Array<DataTypePropertyPresentationModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyPresentationModel.ts
similarity index 68%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyPresentationModel.ts
index 89e844f606..10ca3bc30c 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyPresentationModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DataTypePropertyModel = {
+export type DataTypePropertyPresentationModel = {
     alias?: string;
     value?: any;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyReferenceModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyReferenceModel.ts
index f891dd3af0..d78ee8d9f8 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyReferenceModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypePropertyReferenceModel.ts
@@ -6,4 +6,3 @@ export type DataTypePropertyReferenceModel = {
     name?: string;
     alias?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeReferenceModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeReferenceResponseModel.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeReferenceModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeReferenceResponseModel.ts
index fef54b8bec..4586e124d8 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeReferenceModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeReferenceResponseModel.ts
@@ -4,9 +4,8 @@
 
 import type { DataTypePropertyReferenceModel } from './DataTypePropertyReferenceModel';
 
-export type DataTypeReferenceModel = {
+export type DataTypeReferenceResponseModel = {
     key?: string;
     type?: string;
     properties?: Array<DataTypePropertyReferenceModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeResponseModel.ts
similarity index 54%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeResponseModel.ts
index 18401c998f..ab8d3cef09 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeResponseModel.ts
@@ -4,9 +4,8 @@
 
 import type { DataTypeModelBaseModel } from './DataTypeModelBaseModel';
 
-export type DataTypeModel = (DataTypeModelBaseModel & {
-    $type: string;
-    key?: string;
-    parentKey?: string | null;
+export type DataTypeResponseModel = (DataTypeModelBaseModel & {
+$type: string;
+key?: string;
+parentKey?: string | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseInstallModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseInstallResponseModel.ts
similarity index 87%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseInstallModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseInstallResponseModel.ts
index fca252ff44..48dac68577 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseInstallModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseInstallResponseModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DatabaseInstallModel = {
+export type DatabaseInstallResponseModel = {
     id: string;
     providerName: string;
     server?: string | null;
@@ -12,4 +12,3 @@ export type DatabaseInstallModel = {
     useIntegratedAuthentication?: boolean;
     connectionString?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseSettingsModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseSettingsPresentationModel.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseSettingsModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseSettingsPresentationModel.ts
index 1dd2cfcf83..ed0057f69f 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseSettingsModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DatabaseSettingsPresentationModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DatabaseSettingsModel = {
+export type DatabaseSettingsPresentationModel = {
     id?: string;
     sortOrder?: number;
     displayName?: string;
@@ -15,4 +15,3 @@ export type DatabaseSettingsModel = {
     supportsIntegratedAuthentication?: boolean;
     requiresConnectionTest?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModelBaseModel.ts
index cd1a89d95a..1ffac7af64 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModelBaseModel.ts
@@ -8,4 +8,3 @@ export type DictionaryItemModelBaseModel = {
     name?: string;
     translations?: Array<DictionaryItemTranslationModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemResponseModel.ts
similarity index 60%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemResponseModel.ts
index 22e1edb1e3..b691fd7c96 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemResponseModel.ts
@@ -4,8 +4,7 @@
 
 import type { DictionaryItemModelBaseModel } from './DictionaryItemModelBaseModel';
 
-export type DictionaryItemModel = (DictionaryItemModelBaseModel & {
-    $type: string;
-    key?: string;
+export type DictionaryItemResponseModel = (DictionaryItemModelBaseModel & {
+$type: string;
+key?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemTranslationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemTranslationModel.ts
index 9bc10a302f..37e5189a01 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemTranslationModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemTranslationModel.ts
@@ -6,4 +6,3 @@ export type DictionaryItemTranslationModel = {
     isoCode?: string;
     translation?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryOverviewModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryOverviewResponseModel.ts
similarity index 79%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryOverviewModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryOverviewResponseModel.ts
index 9955664ba7..f0744047dc 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryOverviewModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryOverviewResponseModel.ts
@@ -2,10 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DictionaryOverviewModel = {
+export type DictionaryOverviewResponseModel = {
     name?: string | null;
     key?: string;
     parentKey?: string | null;
     translatedIsoCodes?: Array<string>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryUploadModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryUploadModel.ts
deleted file mode 100644
index b8191ffc6d..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryUploadModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DictionaryItemsImportModel } from './DictionaryItemsImportModel';
-
-export type DictionaryUploadModel = {
-    dictionaryItems?: Array<DictionaryItemsImportModel>;
-    fileName?: string | null;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemModel.ts
deleted file mode 100644
index f2a937ba4e..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntityTreeItemModel } from './EntityTreeItemModel';
-
-export type DocumentBlueprintTreeItemModel = (EntityTreeItemModel & {
-    $type: string;
-    documentTypeKey?: string;
-    documentTypeAlias?: string;
-    documentTypeName?: string | null;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemResponseModel.ts
new file mode 100644
index 0000000000..6821ca9675
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentBlueprintTreeItemResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { EntityTreeItemResponseModel } from './EntityTreeItemResponseModel';
+
+export type DocumentBlueprintTreeItemResponseModel = (EntityTreeItemResponseModel & {
+$type: string;
+documentTypeKey?: string;
+documentTypeAlias?: string;
+documentTypeName?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentModel.ts
deleted file mode 100644
index dd0c6f24d0..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ContentUrlInfoModel } from './ContentUrlInfoModel';
-import type { ContentViewModelBaseDocumentValueDocumentVariantModel } from './ContentViewModelBaseDocumentValueDocumentVariantModel';
-
-export type DocumentModel = (ContentViewModelBaseDocumentValueDocumentVariantModel & {
-    urls?: Array<ContentUrlInfoModel>;
-    templateKey?: string | null;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentResponseModel.ts
new file mode 100644
index 0000000000..af1dbfa151
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentResponseModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel } from './ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel';
+import type { ContentUrlInfoModel } from './ContentUrlInfoModel';
+
+export type DocumentResponseModel = (ContentResponseModelBaseDocumentValueModelDocumentVariantResponseModel & {
+urls?: Array<ContentUrlInfoModel>;
+templateKey?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemModel.ts
deleted file mode 100644
index 0376baedf3..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ContentTreeItemModel } from './ContentTreeItemModel';
-
-export type DocumentTreeItemModel = (ContentTreeItemModel & {
-    $type: string;
-    isProtected?: boolean;
-    isPublished?: boolean;
-    isEdited?: boolean;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemResponseModel.ts
new file mode 100644
index 0000000000..2f49967d81
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTreeItemResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentTreeItemResponseModel } from './ContentTreeItemResponseModel';
+
+export type DocumentTreeItemResponseModel = (ContentTreeItemResponseModel & {
+$type: string;
+isProtected?: boolean;
+isPublished?: boolean;
+isEdited?: boolean;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeModel.ts
deleted file mode 100644
index 6885b3e0c3..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel } from './ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel';
-
-export type DocumentTypeModel = (ContentTypeViewModelBaseDocumentTypePropertyTypeDocumentTypePropertyTypeContainerModel & {
-    allowedTemplateKeys?: Array<string>;
-    defaultTemplateKey?: string | null;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerModel.ts
deleted file mode 100644
index 69737e93e0..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { PropertyTypeContainerViewModelBaseModel } from './PropertyTypeContainerViewModelBaseModel';
-
-export type DocumentTypePropertyTypeContainerModel = PropertyTypeContainerViewModelBaseModel;
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerResponseModel.ts
new file mode 100644
index 0000000000..0aa23dce56
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeContainerResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { PropertyTypeContainerResponseModelBaseModel } from './PropertyTypeContainerResponseModelBaseModel';
+
+export type DocumentTypePropertyTypeContainerResponseModel = PropertyTypeContainerResponseModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeModel.ts
deleted file mode 100644
index 6fa071b539..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { PropertyTypeViewModelBaseModel } from './PropertyTypeViewModelBaseModel';
-
-export type DocumentTypePropertyTypeModel = PropertyTypeViewModelBaseModel;
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeResponseModel.ts
new file mode 100644
index 0000000000..2cd2e32d6e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypePropertyTypeResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { PropertyTypeResponseModelBaseModel } from './PropertyTypeResponseModelBaseModel';
+
+export type DocumentTypePropertyTypeResponseModel = PropertyTypeResponseModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeResponseModel.ts
new file mode 100644
index 0000000000..7e0adcb071
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentTypeCleanupModel } from './ContentTypeCleanupModel';
+import type { ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel } from './ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel';
+
+export type DocumentTypeResponseModel = (ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel & {
+allowedTemplateKeys?: Array<string>;
+defaultTemplateKey?: string | null;
+cleanup?: ContentTypeCleanupModel;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemModel.ts
deleted file mode 100644
index 13f61975bb..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { FolderTreeItemModel } from './FolderTreeItemModel';
-
-export type DocumentTypeTreeItemModel = (FolderTreeItemModel & {
-    $type: string;
-    isElement?: boolean;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemResponseModel.ts
new file mode 100644
index 0000000000..f6737ab3af
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentTypeTreeItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { FolderTreeItemResponseModel } from './FolderTreeItemResponseModel';
+
+export type DocumentTypeTreeItemResponseModel = (FolderTreeItemResponseModel & {
+$type: string;
+isElement?: boolean;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentValueModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentValueModel.ts
index da3e425d98..3f856dc060 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentValueModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentValueModel.ts
@@ -2,7 +2,8 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ValueViewModelBaseModel } from './ValueViewModelBaseModel';
-
-export type DocumentValueModel = ValueViewModelBaseModel;
+import type { ValueModelBaseModel } from './ValueModelBaseModel';
 
+export type DocumentValueModel = (ValueModelBaseModel & {
+$type: string;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantModel.ts
deleted file mode 100644
index b2d7431caa..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ContentStateModel } from './ContentStateModel';
-import type { VariantViewModelBaseModel } from './VariantViewModelBaseModel';
-
-export type DocumentVariantModel = (VariantViewModelBaseModel & {
-    state?: ContentStateModel;
-    publishDate?: string | null;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantRequestModel.ts
new file mode 100644
index 0000000000..a362a5d53c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantRequestModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { VariantModelBaseModel } from './VariantModelBaseModel';
+
+export type DocumentVariantRequestModel = (VariantModelBaseModel & {
+$type: string;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantResponseModel.ts
new file mode 100644
index 0000000000..1ec48739e2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DocumentVariantResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentStateModel } from './ContentStateModel';
+import type { VariantResponseModelBaseModel } from './VariantResponseModelBaseModel';
+
+export type DocumentVariantResponseModel = (VariantResponseModelBaseModel & {
+$type: string;
+state?: ContentStateModel;
+publishDate?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainPresentationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainPresentationModel.ts
new file mode 100644
index 0000000000..05f340dbb8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainPresentationModel.ts
@@ -0,0 +1,8 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type DomainPresentationModel = {
+    domainName?: string;
+    isoCode?: string;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsPresentationModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsPresentationModelBaseModel.ts
new file mode 100644
index 0000000000..0109e12809
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsPresentationModelBaseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DomainPresentationModel } from './DomainPresentationModel';
+
+export type DomainsPresentationModelBaseModel = {
+    defaultIsoCode?: string | null;
+    domains?: Array<DomainPresentationModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsResponseModel.ts
new file mode 100644
index 0000000000..4ef04f4c24
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DomainsResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DomainsPresentationModelBaseModel } from './DomainsPresentationModelBaseModel';
+
+export type DomainsResponseModel = DomainsPresentationModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemModel.ts
deleted file mode 100644
index 9dd2539305..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TreeItemModel } from './TreeItemModel';
-
-export type EntityTreeItemModel = (TreeItemModel & {
-    $type: string;
-    key?: string;
-    isContainer?: boolean;
-    parentKey?: string | null;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemResponseModel.ts
new file mode 100644
index 0000000000..7efeefad1e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/EntityTreeItemResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TreeItemPresentationModel } from './TreeItemPresentationModel';
+
+export type EntityTreeItemResponseModel = (TreeItemPresentationModel & {
+$type: string;
+key?: string;
+isContainer?: boolean;
+parentKey?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FieldModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FieldPresentationModel.ts
similarity index 75%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FieldModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FieldPresentationModel.ts
index 0ef3d38779..14255377d9 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FieldModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FieldPresentationModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type FieldModel = {
+export type FieldPresentationModel = {
     name?: string;
     values?: Array<string>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemModel.ts
deleted file mode 100644
index 970c0ef60f..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TreeItemModel } from './TreeItemModel';
-
-export type FileSystemTreeItemModel = (TreeItemModel & {
-    path?: string;
-    isFolder?: boolean;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemPresentationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemPresentationModel.ts
new file mode 100644
index 0000000000..98c014b13c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FileSystemTreeItemPresentationModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TreeItemPresentationModel } from './TreeItemPresentationModel';
+
+export type FileSystemTreeItemPresentationModel = (TreeItemPresentationModel & {
+path?: string;
+isFolder?: boolean;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModelBaseModel.ts
index bb5a9dab5b..f4fa285d6a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModelBaseModel.ts
@@ -5,4 +5,3 @@
 export type FolderModelBaseModel = {
     name?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderReponseModel.ts
similarity index 54%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderReponseModel.ts
index ab789bb8eb..c3606779e5 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderReponseModel.ts
@@ -4,9 +4,8 @@
 
 import type { FolderModelBaseModel } from './FolderModelBaseModel';
 
-export type FolderModel = (FolderModelBaseModel & {
-    $type: string;
-    key?: string;
-    parentKey?: string | null;
+export type FolderReponseModel = (FolderModelBaseModel & {
+$type: string;
+key?: string;
+parentKey?: string | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemModel.ts
deleted file mode 100644
index 618a10ba2f..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { EntityTreeItemModel } from './EntityTreeItemModel';
-
-export type FolderTreeItemModel = (EntityTreeItemModel & {
-    $type: string;
-    isFolder?: boolean;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemResponseModel.ts
new file mode 100644
index 0000000000..25c0f50fd2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderTreeItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { EntityTreeItemResponseModel } from './EntityTreeItemResponseModel';
+
+export type FolderTreeItemResponseModel = (EntityTreeItemResponseModel & {
+$type: string;
+isFolder?: boolean;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckActionModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckActionRequestModel.ts
similarity index 88%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckActionModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckActionRequestModel.ts
index 82f2cd7448..0a64ed3f60 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckActionModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckActionRequestModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type HealthCheckActionModel = {
+export type HealthCheckActionRequestModel = {
     healthCheckKey?: string;
     alias?: string | null;
     name?: string | null;
@@ -12,4 +12,3 @@ export type HealthCheckActionModel = {
     providedValueValidation?: string | null;
     providedValueValidationRegex?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModel.ts
deleted file mode 100644
index 7f452c35ed..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HealthCheckGroupModelBaseModel } from './HealthCheckGroupModelBaseModel';
-import type { HealthCheckModel } from './HealthCheckModel';
-
-export type HealthCheckGroupModel = (HealthCheckGroupModelBaseModel & {
-    checks?: Array<HealthCheckModel>;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationBaseModel.ts
similarity index 63%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModelBaseModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationBaseModel.ts
index e024867963..fbc62be4ff 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationBaseModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type HealthCheckGroupModelBaseModel = {
+export type HealthCheckGroupPresentationBaseModel = {
     name?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationModel.ts
new file mode 100644
index 0000000000..dfdf778e12
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupPresentationModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HealthCheckGroupPresentationBaseModel } from './HealthCheckGroupPresentationBaseModel';
+import type { HealthCheckModel } from './HealthCheckModel';
+
+export type HealthCheckGroupPresentationModel = (HealthCheckGroupPresentationBaseModel & {
+checks?: Array<HealthCheckModel>;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupResponseModel.ts
new file mode 100644
index 0000000000..5a038bd74e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HealthCheckGroupPresentationBaseModel } from './HealthCheckGroupPresentationBaseModel';
+
+export type HealthCheckGroupResponseModel = HealthCheckGroupPresentationBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultModel.ts
deleted file mode 100644
index 4fe58a6a10..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultModel.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HealthCheckWithResultModel } from './HealthCheckWithResultModel';
-
-export type HealthCheckGroupWithResultModel = {
-    checks?: Array<HealthCheckWithResultModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultResponseModel.ts
new file mode 100644
index 0000000000..45f3b948df
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckGroupWithResultResponseModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HealthCheckWithResultPresentationModel } from './HealthCheckWithResultPresentationModel';
+
+export type HealthCheckGroupWithResultResponseModel = {
+    checks?: Array<HealthCheckWithResultPresentationModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModel.ts
index 9a85add96d..56ca3e0121 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModel.ts
@@ -5,7 +5,6 @@
 import type { HealthCheckModelBaseModel } from './HealthCheckModelBaseModel';
 
 export type HealthCheckModel = (HealthCheckModelBaseModel & {
-    name?: string;
-    description?: string | null;
+name?: string;
+description?: string | null;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModelBaseModel.ts
index 053af0b984..55f41c4618 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckModelBaseModel.ts
@@ -5,4 +5,3 @@
 export type HealthCheckModelBaseModel = {
     key?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckResultResponseModel.ts
similarity index 55%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckResultModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckResultResponseModel.ts
index 4665a20f16..d5a99706b5 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckResultModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckResultResponseModel.ts
@@ -2,13 +2,12 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { HealthCheckActionModel } from './HealthCheckActionModel';
+import type { HealthCheckActionRequestModel } from './HealthCheckActionRequestModel';
 import type { StatusResultTypeModel } from './StatusResultTypeModel';
 
-export type HealthCheckResultModel = {
+export type HealthCheckResultResponseModel = {
     message?: string;
     resultType?: StatusResultTypeModel;
-    actions?: Array<HealthCheckActionModel> | null;
+    actions?: Array<HealthCheckActionRequestModel> | null;
     readMoreLink?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultModel.ts
deleted file mode 100644
index a75a4c52a8..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HealthCheckModelBaseModel } from './HealthCheckModelBaseModel';
-import type { HealthCheckResultModel } from './HealthCheckResultModel';
-
-export type HealthCheckWithResultModel = (HealthCheckModelBaseModel & {
-    results?: Array<HealthCheckResultModel> | null;
-});
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultPresentationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultPresentationModel.ts
new file mode 100644
index 0000000000..12929e62f8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HealthCheckWithResultPresentationModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HealthCheckModelBaseModel } from './HealthCheckModelBaseModel';
+import type { HealthCheckResultResponseModel } from './HealthCheckResultResponseModel';
+
+export type HealthCheckWithResultPresentationModel = (HealthCheckModelBaseModel & {
+results?: Array<HealthCheckResultResponseModel> | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HelpPageModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HelpPageResponseModel.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HelpPageModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HelpPageResponseModel.ts
index 7a56b0085e..43a41c82c6 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HelpPageModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/HelpPageResponseModel.ts
@@ -2,10 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type HelpPageModel = {
+export type HelpPageResponseModel = {
     name?: string | null;
     description?: string | null;
     url?: string | null;
     type?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemsImportModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ImportDictionaryItemsPresentationModel.ts
similarity index 72%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemsImportModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ImportDictionaryItemsPresentationModel.ts
index 73d0d2c31e..ae77e85dbc 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemsImportModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ImportDictionaryItemsPresentationModel.ts
@@ -2,9 +2,8 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DictionaryItemsImportModel = {
+export type ImportDictionaryItemsPresentationModel = {
     key?: string;
     name?: string | null;
     parentKey?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryImportModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ImportDictionaryRequestModel.ts
similarity index 73%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryImportModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ImportDictionaryRequestModel.ts
index 3f0b6be219..f08dd2599a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryImportModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ImportDictionaryRequestModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DictionaryImportModel = {
+export type ImportDictionaryRequestModel = {
     fileName?: string;
     parentKey?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/IndexModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/IndexResponseModel.ts
similarity index 90%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/IndexModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/IndexResponseModel.ts
index a9aec87082..befb90a467 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/IndexModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/IndexResponseModel.ts
@@ -4,7 +4,7 @@
 
 import type { HealthStatusModel } from './HealthStatusModel';
 
-export type IndexModel = {
+export type IndexResponseModel = {
     name: string;
     healthStatus?: HealthStatusModel;
     canRebuild: boolean;
@@ -13,4 +13,3 @@ export type IndexModel = {
     fieldCount: number;
     providerProperties?: Record<string, any> | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallModel.ts
deleted file mode 100644
index d1898faede..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallModel.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DatabaseInstallModel } from './DatabaseInstallModel';
-import type { TelemetryLevelModel } from './TelemetryLevelModel';
-import type { UserInstallModel } from './UserInstallModel';
-
-export type InstallModel = {
-    user: UserInstallModel;
-    database: DatabaseInstallModel;
-    telemetryLevel?: TelemetryLevelModel;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsModel.ts
deleted file mode 100644
index b5b8065fdf..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DatabaseSettingsModel } from './DatabaseSettingsModel';
-import type { UserSettingsModel } from './UserSettingsModel';
-
-export type InstallSettingsModel = {
-    user?: UserSettingsModel;
-    databases?: Array<DatabaseSettingsModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsResponseModel.ts
new file mode 100644
index 0000000000..2b432cb901
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallSettingsResponseModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DatabaseSettingsPresentationModel } from './DatabaseSettingsPresentationModel';
+import type { UserSettingsModel } from './UserSettingsModel';
+
+export type InstallSettingsResponseModel = {
+    user?: UserSettingsModel;
+    databases?: Array<DatabaseSettingsPresentationModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallVResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallVResponseModel.ts
new file mode 100644
index 0000000000..0754a817a4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/InstallVResponseModel.ts
@@ -0,0 +1,13 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DatabaseInstallResponseModel } from './DatabaseInstallResponseModel';
+import type { TelemetryLevelModel } from './TelemetryLevelModel';
+import type { UserInstallResponseModel } from './UserInstallResponseModel';
+
+export type InstallVResponseModel = {
+    user: UserInstallResponseModel;
+    database: DatabaseInstallResponseModel;
+    telemetryLevel?: TelemetryLevelModel;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModelBaseModel.ts
index eaff3e8d4e..b7dd8054d4 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModelBaseModel.ts
@@ -8,4 +8,3 @@ export type LanguageModelBaseModel = {
     isMandatory?: boolean;
     fallbackIsoCode?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageResponseModel.ts
similarity index 64%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageResponseModel.ts
index cba035758b..77993ea4ae 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageResponseModel.ts
@@ -4,7 +4,6 @@
 
 import type { LanguageModelBaseModel } from './LanguageModelBaseModel';
 
-export type LanguageModel = (LanguageModelBaseModel & {
-    isoCode?: string;
+export type LanguageResponseModel = (LanguageModelBaseModel & {
+isoCode?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogLevelCountsModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogLevelCountsReponseModel.ts
similarity index 80%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogLevelCountsModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogLevelCountsReponseModel.ts
index 6fbb50efba..8a423396d7 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogLevelCountsModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogLevelCountsReponseModel.ts
@@ -2,11 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type LogLevelCountsModel = {
+export type LogLevelCountsReponseModel = {
     information?: number;
     debug?: number;
     warning?: number;
     error?: number;
     fatal?: number;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessagePropertyModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessagePropertyPresentationModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessagePropertyModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessagePropertyPresentationModel.ts
index 098e1d9228..51a22a6a2b 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessagePropertyModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessagePropertyPresentationModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type LogMessagePropertyModel = {
+export type LogMessagePropertyPresentationModel = {
     name?: string;
     value?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessageModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessageResponseModel.ts
similarity index 58%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessageModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessageResponseModel.ts
index 750fb168e8..38e9321909 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessageModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogMessageResponseModel.ts
@@ -3,14 +3,13 @@
 /* eslint-disable */
 
 import type { LogLevelModel } from './LogLevelModel';
-import type { LogMessagePropertyModel } from './LogMessagePropertyModel';
+import type { LogMessagePropertyPresentationModel } from './LogMessagePropertyPresentationModel';
 
-export type LogMessageModel = {
+export type LogMessageResponseModel = {
     timestamp?: string;
     level?: LogLevelModel;
     messageTemplate?: string | null;
     renderedMessage?: string | null;
-    properties?: Array<LogMessagePropertyModel>;
+    properties?: Array<LogMessagePropertyPresentationModel>;
     exception?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogTemplateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogTemplateResponseModel.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogTemplateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogTemplateResponseModel.ts
index 30919c8239..2731cd2df8 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogTemplateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LogTemplateResponseModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type LogTemplateModel = {
+export type LogTemplateResponseModel = {
     messageTemplate?: string | null;
     count?: number;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LoggerModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LoggerResponseModel.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LoggerModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LoggerResponseModel.ts
index 2eeedc8142..6615168857 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LoggerModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LoggerResponseModel.ts
@@ -4,8 +4,7 @@
 
 import type { LogLevelModel } from './LogLevelModel';
 
-export type LoggerModel = {
+export type LoggerResponseModel = {
     name?: string;
     level?: LogLevelModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeContainerResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeContainerResponseModel.ts
new file mode 100644
index 0000000000..dea0899aee
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeContainerResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { PropertyTypeContainerResponseModelBaseModel } from './PropertyTypeContainerResponseModelBaseModel';
+
+export type MediaTypePropertyTypeContainerResponseModel = PropertyTypeContainerResponseModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeResponseModel.ts
new file mode 100644
index 0000000000..30de030f1a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypePropertyTypeResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { PropertyTypeResponseModelBaseModel } from './PropertyTypeResponseModelBaseModel';
+
+export type MediaTypePropertyTypeResponseModel = PropertyTypeResponseModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypeResponseModel.ts
new file mode 100644
index 0000000000..ba0ca6251c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaTypeResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel } from './ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel';
+
+export type MediaTypeResponseModel = ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaValueModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaValueModel.ts
new file mode 100644
index 0000000000..3df317dfed
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaValueModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ValueModelBaseModel } from './ValueModelBaseModel';
+
+export type MediaValueModel = (ValueModelBaseModel & {
+$type: string;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantRequestModel.ts
new file mode 100644
index 0000000000..49b8b7b4e6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantRequestModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { VariantModelBaseModel } from './VariantModelBaseModel';
+
+export type MediaVariantRequestModel = (VariantModelBaseModel & {
+$type: string;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantResponseModel.ts
new file mode 100644
index 0000000000..b76e970304
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MediaVariantResponseModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { VariantResponseModelBaseModel } from './VariantResponseModelBaseModel';
+
+export type MediaVariantResponseModel = (VariantResponseModelBaseModel & {
+$type: string;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ModelsBuilderModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ModelsBuilderResponseModel.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ModelsBuilderModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ModelsBuilderResponseModel.ts
index 745bba54df..cb7477ebdf 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ModelsBuilderModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ModelsBuilderResponseModel.ts
@@ -4,7 +4,7 @@
 
 import type { ModelsModeModel } from './ModelsModeModel';
 
-export type ModelsBuilderModel = {
+export type ModelsBuilderResponseModel = {
     mode?: ModelsModeModel;
     canGenerate?: boolean;
     outOfDateModels?: boolean;
@@ -13,4 +13,3 @@ export type ModelsBuilderModel = {
     modelsNamespace?: string | null;
     trackingOutOfDateModels?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeMoveModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MoveDataTypeRequestModel.ts
similarity index 71%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeMoveModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MoveDataTypeRequestModel.ts
index 2c8513a405..2470cac98c 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeMoveModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MoveDataTypeRequestModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DataTypeMoveModel = {
+export type MoveDataTypeRequestModel = {
     targetKey?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeCopyModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MoveDictionaryRequestModel.ts
similarity index 70%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeCopyModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MoveDictionaryRequestModel.ts
index 163d127437..742605cfcc 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeCopyModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/MoveDictionaryRequestModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type DataTypeCopyModel = {
+export type MoveDictionaryRequestModel = {
     targetKey?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ObjectTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ObjectTypeResponseModel.ts
new file mode 100644
index 0000000000..4b5b44cb19
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ObjectTypeResponseModel.ts
@@ -0,0 +1,8 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type ObjectTypeResponseModel = {
+    name?: string | null;
+    id?: string;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OkResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OkResultModel.ts
index 886e643b17..0b041f81ee 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OkResultModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OkResultModel.ts
@@ -5,4 +5,3 @@
 export type OkResultModel = {
     statusCode?: number;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OutOfDateStatusModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OutOfDateStatusResponseModel.ts
similarity index 79%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OutOfDateStatusModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OutOfDateStatusResponseModel.ts
index 7493102346..3525c5b9a3 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OutOfDateStatusModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/OutOfDateStatusResponseModel.ts
@@ -4,7 +4,6 @@
 
 import type { OutOfDateTypeModel } from './OutOfDateTypeModel';
 
-export type OutOfDateStatusModel = {
+export type OutOfDateStatusResponseModel = {
     status?: OutOfDateTypeModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageDefinitionModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageDefinitionResponseModel.ts
similarity index 57%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageDefinitionModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageDefinitionResponseModel.ts
index 70f174f33d..1e40334b1d 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageDefinitionModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageDefinitionResponseModel.ts
@@ -4,8 +4,7 @@
 
 import type { PackageModelBaseModel } from './PackageModelBaseModel';
 
-export type PackageDefinitionModel = (PackageModelBaseModel & {
-    key?: string;
-    packagePath?: string;
+export type PackageDefinitionResponseModel = (PackageModelBaseModel & {
+key?: string;
+packagePath?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageManifestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageManifestResponseModel.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageManifestModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageManifestResponseModel.ts
index 0c0518f0ed..1ac843ab9b 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageManifestModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageManifestResponseModel.ts
@@ -2,9 +2,8 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type PackageManifestModel = {
+export type PackageManifestResponseModel = {
     name?: string;
     version?: string | null;
     extensions?: Array<any>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageMigrationStatusModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageMigrationStatusResponseModel.ts
similarity index 72%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageMigrationStatusModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageMigrationStatusResponseModel.ts
index a0317649c5..f2aa442a61 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageMigrationStatusModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageMigrationStatusResponseModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type PackageMigrationStatusModel = {
+export type PackageMigrationStatusResponseModel = {
     packageName?: string;
     hasPendingMigrations?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageModelBaseModel.ts
index a405b0ecc2..4ccfb1eacf 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageModelBaseModel.ts
@@ -18,4 +18,3 @@ export type PackageModelBaseModel = {
     languages?: Array<string>;
     dictionaryItems?: Array<string>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogResponseModel.ts
index 28e4883e9d..4d8cbdd238 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogResponseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogResponseModel.ts
@@ -8,4 +8,3 @@ export type PagedAuditLogResponseModel = {
     total: number;
     items: Array<AuditLogResponseModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogWithUsernameResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogWithUsernameResponseModel.ts
index 2faa8a352c..32531185f4 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogWithUsernameResponseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedAuditLogWithUsernameResponseModel.ts
@@ -8,4 +8,3 @@ export type PagedAuditLogWithUsernameResponseModel = {
     total: number;
     items: Array<AuditLogWithUsernameResponseModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemModel.ts
deleted file mode 100644
index 397bd30608..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ContentTreeItemModel } from './ContentTreeItemModel';
-import type { DocumentTreeItemModel } from './DocumentTreeItemModel';
-
-export type PagedContentTreeItemModel = {
-    total: number;
-    items: Array<(ContentTreeItemModel | DocumentTreeItemModel)>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemResponseModel.ts
new file mode 100644
index 0000000000..baa7dc3c36
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedContentTreeItemResponseModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentTreeItemResponseModel } from './ContentTreeItemResponseModel';
+import type { DocumentTreeItemResponseModel } from './DocumentTreeItemResponseModel';
+
+export type PagedContentTreeItemResponseModel = {
+    total: number;
+    items: Array<(ContentTreeItemResponseModel | DocumentTreeItemResponseModel)>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureModel.ts
deleted file mode 100644
index 3c15f63914..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { CultureModel } from './CultureModel';
-
-export type PagedCultureModel = {
-    total: number;
-    items: Array<CultureModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureReponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureReponseModel.ts
new file mode 100644
index 0000000000..266daa8cd2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedCultureReponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { CultureReponseModel } from './CultureReponseModel';
+
+export type PagedCultureReponseModel = {
+    total: number;
+    items: Array<CultureReponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewModel.ts
deleted file mode 100644
index 14418fbd87..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DictionaryOverviewModel } from './DictionaryOverviewModel';
-
-export type PagedDictionaryOverviewModel = {
-    total: number;
-    items: Array<DictionaryOverviewModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewResponseModel.ts
new file mode 100644
index 0000000000..990d186c40
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDictionaryOverviewResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DictionaryOverviewResponseModel } from './DictionaryOverviewResponseModel';
+
+export type PagedDictionaryOverviewResponseModel = {
+    total: number;
+    items: Array<DictionaryOverviewResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemModel.ts
deleted file mode 100644
index 699f2e1741..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DocumentBlueprintTreeItemModel } from './DocumentBlueprintTreeItemModel';
-
-export type PagedDocumentBlueprintTreeItemModel = {
-    total: number;
-    items: Array<DocumentBlueprintTreeItemModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemResponseModel.ts
new file mode 100644
index 0000000000..8dc4a5165e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentBlueprintTreeItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DocumentBlueprintTreeItemResponseModel } from './DocumentBlueprintTreeItemResponseModel';
+
+export type PagedDocumentBlueprintTreeItemResponseModel = {
+    total: number;
+    items: Array<DocumentBlueprintTreeItemResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemModel.ts
deleted file mode 100644
index 3a919899d1..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DocumentTreeItemModel } from './DocumentTreeItemModel';
-
-export type PagedDocumentTreeItemModel = {
-    total: number;
-    items: Array<DocumentTreeItemModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemResponseModel.ts
new file mode 100644
index 0000000000..d8dd2f0fc6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTreeItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DocumentTreeItemResponseModel } from './DocumentTreeItemResponseModel';
+
+export type PagedDocumentTreeItemResponseModel = {
+    total: number;
+    items: Array<DocumentTreeItemResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemModel.ts
deleted file mode 100644
index 36a53706fd..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DocumentTypeTreeItemModel } from './DocumentTypeTreeItemModel';
-
-export type PagedDocumentTypeTreeItemModel = {
-    total: number;
-    items: Array<DocumentTypeTreeItemModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemResponseModel.ts
new file mode 100644
index 0000000000..ba0f93c358
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedDocumentTypeTreeItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DocumentTypeTreeItemResponseModel } from './DocumentTypeTreeItemResponseModel';
+
+export type PagedDocumentTypeTreeItemResponseModel = {
+    total: number;
+    items: Array<DocumentTypeTreeItemResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemModel.ts
deleted file mode 100644
index ba5f939425..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemModel.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { ContentTreeItemModel } from './ContentTreeItemModel';
-import type { DocumentBlueprintTreeItemModel } from './DocumentBlueprintTreeItemModel';
-import type { DocumentTreeItemModel } from './DocumentTreeItemModel';
-import type { DocumentTypeTreeItemModel } from './DocumentTypeTreeItemModel';
-import type { EntityTreeItemModel } from './EntityTreeItemModel';
-import type { FolderTreeItemModel } from './FolderTreeItemModel';
-
-export type PagedEntityTreeItemModel = {
-    total: number;
-    items: Array<(EntityTreeItemModel | ContentTreeItemModel | DocumentBlueprintTreeItemModel | DocumentTreeItemModel | DocumentTypeTreeItemModel | FolderTreeItemModel)>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemResponseModel.ts
new file mode 100644
index 0000000000..9df2b4b601
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedEntityTreeItemResponseModel.ts
@@ -0,0 +1,15 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ContentTreeItemResponseModel } from './ContentTreeItemResponseModel';
+import type { DocumentBlueprintTreeItemResponseModel } from './DocumentBlueprintTreeItemResponseModel';
+import type { DocumentTreeItemResponseModel } from './DocumentTreeItemResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from './DocumentTypeTreeItemResponseModel';
+import type { EntityTreeItemResponseModel } from './EntityTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from './FolderTreeItemResponseModel';
+
+export type PagedEntityTreeItemResponseModel = {
+    total: number;
+    items: Array<(EntityTreeItemResponseModel | ContentTreeItemResponseModel | DocumentBlueprintTreeItemResponseModel | DocumentTreeItemResponseModel | DocumentTypeTreeItemResponseModel | FolderTreeItemResponseModel)>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemModel.ts
deleted file mode 100644
index 4b45c03949..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { FileSystemTreeItemModel } from './FileSystemTreeItemModel';
-
-export type PagedFileSystemTreeItemModel = {
-    total: number;
-    items: Array<FileSystemTreeItemModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemPresentationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemPresentationModel.ts
new file mode 100644
index 0000000000..be96ca744e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFileSystemTreeItemPresentationModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { FileSystemTreeItemPresentationModel } from './FileSystemTreeItemPresentationModel';
+
+export type PagedFileSystemTreeItemPresentationModel = {
+    total: number;
+    items: Array<FileSystemTreeItemPresentationModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemModel.ts
deleted file mode 100644
index 25377aa29c..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { DocumentTypeTreeItemModel } from './DocumentTypeTreeItemModel';
-import type { FolderTreeItemModel } from './FolderTreeItemModel';
-
-export type PagedFolderTreeItemModel = {
-    total: number;
-    items: Array<(FolderTreeItemModel | DocumentTypeTreeItemModel)>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemResponseModel.ts
new file mode 100644
index 0000000000..3543ba5636
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedFolderTreeItemResponseModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DocumentTypeTreeItemResponseModel } from './DocumentTypeTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from './FolderTreeItemResponseModel';
+
+export type PagedFolderTreeItemResponseModel = {
+    total: number;
+    items: Array<(FolderTreeItemResponseModel | DocumentTypeTreeItemResponseModel)>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupModelBaseModel.ts
deleted file mode 100644
index 8a2687142d..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupModelBaseModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HealthCheckGroupModel } from './HealthCheckGroupModel';
-import type { HealthCheckGroupModelBaseModel } from './HealthCheckGroupModelBaseModel';
-
-export type PagedHealthCheckGroupModelBaseModel = {
-    total: number;
-    items: Array<(HealthCheckGroupModelBaseModel | HealthCheckGroupModel)>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupResponseModel.ts
new file mode 100644
index 0000000000..8bcb42c1d8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHealthCheckGroupResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HealthCheckGroupResponseModel } from './HealthCheckGroupResponseModel';
+
+export type PagedHealthCheckGroupResponseModel = {
+    total: number;
+    items: Array<HealthCheckGroupResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageModel.ts
deleted file mode 100644
index a5fe785cea..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { HelpPageModel } from './HelpPageModel';
-
-export type PagedHelpPageModel = {
-    total: number;
-    items: Array<HelpPageModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageResponseModel.ts
new file mode 100644
index 0000000000..fb379bf641
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedHelpPageResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { HelpPageResponseModel } from './HelpPageResponseModel';
+
+export type PagedHelpPageResponseModel = {
+    total: number;
+    items: Array<HelpPageResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexModel.ts
deleted file mode 100644
index ffb2a4a1ca..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { IndexModel } from './IndexModel';
-
-export type PagedIndexModel = {
-    total: number;
-    items: Array<IndexModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexResponseModel.ts
new file mode 100644
index 0000000000..a84e061c7c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedIndexResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { IndexResponseModel } from './IndexResponseModel';
+
+export type PagedIndexResponseModel = {
+    total: number;
+    items: Array<IndexResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageModel.ts
deleted file mode 100644
index 700a00b67c..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { LanguageModel } from './LanguageModel';
-
-export type PagedLanguageModel = {
-    total: number;
-    items: Array<LanguageModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageResponseModel.ts
new file mode 100644
index 0000000000..d749a241cb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLanguageResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { LanguageResponseModel } from './LanguageResponseModel';
+
+export type PagedLanguageResponseModel = {
+    total: number;
+    items: Array<LanguageResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageModel.ts
deleted file mode 100644
index 2e0370b852..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { LogMessageModel } from './LogMessageModel';
-
-export type PagedLogMessageModel = {
-    total: number;
-    items: Array<LogMessageModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageResponseModel.ts
new file mode 100644
index 0000000000..88457e9701
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogMessageResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { LogMessageResponseModel } from './LogMessageResponseModel';
+
+export type PagedLogMessageResponseModel = {
+    total: number;
+    items: Array<LogMessageResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateModel.ts
deleted file mode 100644
index eefc94d7d1..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { LogTemplateModel } from './LogTemplateModel';
-
-export type PagedLogTemplateModel = {
-    total: number;
-    items: Array<LogTemplateModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateResponseModel.ts
new file mode 100644
index 0000000000..801c440db4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLogTemplateResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { LogTemplateResponseModel } from './LogTemplateResponseModel';
+
+export type PagedLogTemplateResponseModel = {
+    total: number;
+    items: Array<LogTemplateResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerModel.ts
deleted file mode 100644
index 7f2e381960..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { LoggerModel } from './LoggerModel';
-
-export type PagedLoggerModel = {
-    total: number;
-    items: Array<LoggerModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerResponseModel.ts
new file mode 100644
index 0000000000..273205e323
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedLoggerResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { LoggerResponseModel } from './LoggerResponseModel';
+
+export type PagedLoggerResponseModel = {
+    total: number;
+    items: Array<LoggerResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedObjectTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedObjectTypeResponseModel.ts
new file mode 100644
index 0000000000..e72657d180
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedObjectTypeResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ObjectTypeResponseModel } from './ObjectTypeResponseModel';
+
+export type PagedObjectTypeResponseModel = {
+    total: number;
+    items: Array<ObjectTypeResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionModel.ts
deleted file mode 100644
index 3a596e659a..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { PackageDefinitionModel } from './PackageDefinitionModel';
-
-export type PagedPackageDefinitionModel = {
-    total: number;
-    items: Array<PackageDefinitionModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionResponseModel.ts
new file mode 100644
index 0000000000..8582af874a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageDefinitionResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { PackageDefinitionResponseModel } from './PackageDefinitionResponseModel';
+
+export type PagedPackageDefinitionResponseModel = {
+    total: number;
+    items: Array<PackageDefinitionResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusModel.ts
deleted file mode 100644
index b9a95529d8..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { PackageMigrationStatusModel } from './PackageMigrationStatusModel';
-
-export type PagedPackageMigrationStatusModel = {
-    total: number;
-    items: Array<PackageMigrationStatusModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusResponseModel.ts
new file mode 100644
index 0000000000..114244e919
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedPackageMigrationStatusResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { PackageMigrationStatusResponseModel } from './PackageMigrationStatusResponseModel';
+
+export type PagedPackageMigrationStatusResponseModel = {
+    total: number;
+    items: Array<PackageMigrationStatusResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemModel.ts
deleted file mode 100644
index 530f70a624..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { RecycleBinItemModel } from './RecycleBinItemModel';
-
-export type PagedRecycleBinItemModel = {
-    total: number;
-    items: Array<RecycleBinItemModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemResponseModel.ts
new file mode 100644
index 0000000000..4077e2d0d5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRecycleBinItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RecycleBinItemResponseModel } from './RecycleBinItemResponseModel';
+
+export type PagedRecycleBinItemResponseModel = {
+    total: number;
+    items: Array<RecycleBinItemResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlModel.ts
deleted file mode 100644
index 6bd46c9a32..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { RedirectUrlModel } from './RedirectUrlModel';
-
-export type PagedRedirectUrlModel = {
-    total: number;
-    items: Array<RedirectUrlModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlResponseModel.ts
new file mode 100644
index 0000000000..3026d71af4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRedirectUrlResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RedirectUrlResponseModel } from './RedirectUrlResponseModel';
+
+export type PagedRedirectUrlResponseModel = {
+    total: number;
+    items: Array<RedirectUrlResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemModel.ts
deleted file mode 100644
index fc7f3bc0db..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { RelationItemModel } from './RelationItemModel';
-
-export type PagedRelationItemModel = {
-    total: number;
-    items: Array<RelationItemModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemResponseModel.ts
new file mode 100644
index 0000000000..4ad8badc22
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationItemResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RelationItemResponseModel } from './RelationItemResponseModel';
+
+export type PagedRelationItemResponseModel = {
+    total: number;
+    items: Array<RelationItemResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationModel.ts
deleted file mode 100644
index 155680334e..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { RelationModel } from './RelationModel';
-
-export type PagedRelationModel = {
-    total: number;
-    items: Array<RelationModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationResponseModel.ts
new file mode 100644
index 0000000000..5a4d95e4c1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedRelationResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RelationResponseModel } from './RelationResponseModel';
+
+export type PagedRelationResponseModel = {
+    total: number;
+    items: Array<RelationResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchModel.ts
deleted file mode 100644
index 069463afc4..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { SavedLogSearchModel } from './SavedLogSearchModel';
-
-export type PagedSavedLogSearchModel = {
-    total: number;
-    items: Array<SavedLogSearchModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchResponseModel.ts
new file mode 100644
index 0000000000..6f5b02d4f3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSavedLogSearchResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { SavedLogSearchResponseModel } from './SavedLogSearchResponseModel';
+
+export type PagedSavedLogSearchResponseModel = {
+    total: number;
+    items: Array<SavedLogSearchResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultModel.ts
deleted file mode 100644
index 849f5368a8..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { SearchResultModel } from './SearchResultModel';
-
-export type PagedSearchResultModel = {
-    total: number;
-    items: Array<SearchResultModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultResponseModel.ts
new file mode 100644
index 0000000000..2a95a2d85b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearchResultResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { SearchResultResponseModel } from './SearchResultResponseModel';
+
+export type PagedSearchResultResponseModel = {
+    total: number;
+    items: Array<SearchResultResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherModel.ts
deleted file mode 100644
index 83c716fe93..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { SearcherModel } from './SearcherModel';
-
-export type PagedSearcherModel = {
-    total: number;
-    items: Array<SearcherModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherResponseModel.ts
new file mode 100644
index 0000000000..b8c9c60dab
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedSearcherResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { SearcherResponseModel } from './SearcherResponseModel';
+
+export type PagedSearcherResponseModel = {
+    total: number;
+    items: Array<SearcherResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryModel.ts
deleted file mode 100644
index a447d38f2e..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TelemetryModel } from './TelemetryModel';
-
-export type PagedTelemetryModel = {
-    total: number;
-    items: Array<TelemetryModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryResponseModel.ts
new file mode 100644
index 0000000000..6a8ddbabfd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedTelemetryResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TelemetryResponseModel } from './TelemetryResponseModel';
+
+export type PagedTelemetryResponseModel = {
+    total: number;
+    items: Array<TelemetryResponseModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupModel.ts
deleted file mode 100644
index c4d0191652..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { UserGroupModel } from './UserGroupModel';
-
-export type PagedUserGroupModel = {
-    total: number;
-    items: Array<UserGroupModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupPresentationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupPresentationModel.ts
new file mode 100644
index 0000000000..8a01377edf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PagedUserGroupPresentationModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { UserGroupPresentationModel } from './UserGroupPresentationModel';
+
+export type PagedUserGroupPresentationModel = {
+    total: number;
+    items: Array<UserGroupPresentationModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusRequestModel.ts
similarity index 68%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusRequestModel.ts
index b2a7cc321c..cc933cc8d4 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusRequestModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type ProfilingStatusModel = {
+export type ProfilingStatusRequestModel = {
     enabled?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusResponseModel.ts
new file mode 100644
index 0000000000..98b69d1149
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ProfilingStatusResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type ProfilingStatusResponseModel = {
+    enabled?: boolean;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeAppearanceModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeAppearanceModel.ts
index e8138d4992..cdbf7325af 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeAppearanceModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeAppearanceModel.ts
@@ -5,4 +5,3 @@
 export type PropertyTypeAppearanceModel = {
     labelOnTop?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeContainerViewModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeContainerResponseModelBaseModel.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeContainerViewModelBaseModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeContainerResponseModelBaseModel.ts
index 7c8e755156..44c151e3a4 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeContainerViewModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeContainerResponseModelBaseModel.ts
@@ -2,11 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type PropertyTypeContainerViewModelBaseModel = {
+export type PropertyTypeContainerResponseModelBaseModel = {
     key?: string;
     parentKey?: string | null;
     name?: string | null;
     type?: string;
     sortOrder?: number;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeViewModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeViewModelBaseModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts
index 11fe857a2c..57f4f6c6dd 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeViewModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeResponseModelBaseModel.ts
@@ -5,7 +5,7 @@
 import type { PropertyTypeAppearanceModel } from './PropertyTypeAppearanceModel';
 import type { PropertyTypeValidationModel } from './PropertyTypeValidationModel';
 
-export type PropertyTypeViewModelBaseModel = {
+export type PropertyTypeResponseModelBaseModel = {
     key?: string;
     containerKey?: string | null;
     alias?: string;
@@ -17,4 +17,3 @@ export type PropertyTypeViewModelBaseModel = {
     validation?: PropertyTypeValidationModel;
     appearance?: PropertyTypeAppearanceModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeValidationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeValidationModel.ts
index 6966054e27..efdc5b51ec 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeValidationModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PropertyTypeValidationModel.ts
@@ -8,4 +8,3 @@ export type PropertyTypeValidationModel = {
     regEx?: string | null;
     regExMessage?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RecycleBinItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RecycleBinItemResponseModel.ts
similarity index 85%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RecycleBinItemModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RecycleBinItemResponseModel.ts
index 17bef97f12..203b715fb4 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RecycleBinItemModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RecycleBinItemResponseModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type RecycleBinItemModel = {
+export type RecycleBinItemResponseModel = {
     $type: string;
     key?: string;
     name?: string;
@@ -12,4 +12,3 @@ export type RecycleBinItemModel = {
     isContainer?: boolean;
     parentKey?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlResponseModel.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlResponseModel.ts
index fe39dcab56..d2c743ba79 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlResponseModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type RedirectUrlModel = {
+export type RedirectUrlResponseModel = {
     key?: string;
     originalUrl?: string;
     destinationUrl?: string;
@@ -10,4 +10,3 @@ export type RedirectUrlModel = {
     contentKey?: string;
     culture?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlStatusModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlStatusResponseModel.ts
similarity index 81%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlStatusModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlStatusResponseModel.ts
index c97804bab7..6ef9f24316 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlStatusModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RedirectUrlStatusResponseModel.ts
@@ -4,8 +4,7 @@
 
 import type { RedirectStatusModel } from './RedirectStatusModel';
 
-export type RedirectUrlStatusModel = {
+export type RedirectUrlStatusResponseModel = {
     status?: RedirectStatusModel;
     userIsAdmin?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemResponseModel.ts
similarity index 90%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemResponseModel.ts
index d99d9050a5..2b261d21d2 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationItemResponseModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type RelationItemModel = {
+export type RelationItemResponseModel = {
     nodeKey?: string;
     nodeName?: string | null;
     nodeType?: string | null;
@@ -14,4 +14,3 @@ export type RelationItemModel = {
     relationTypeIsBidirectional?: boolean;
     relationTypeIsDependency?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationResponseModel.ts
similarity index 86%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationResponseModel.ts
index 47de4a65d7..4fe5555e69 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationResponseModel.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type RelationModel = {
+export type RelationResponseModel = {
     parentId?: number;
     parentName?: string | null;
     childId?: number;
@@ -10,4 +10,3 @@ export type RelationModel = {
     createDate?: string;
     comment?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeBaseModel.ts
new file mode 100644
index 0000000000..e7de6f1945
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeBaseModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type RelationTypeBaseModel = {
+    name?: string;
+    isBidirectional?: boolean;
+    parentObjectType?: string | null;
+    childObjectType?: string | null;
+    isDependency?: boolean;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeResponseModel.ts
new file mode 100644
index 0000000000..dab718bbf1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/RelationTypeResponseModel.ts
@@ -0,0 +1,14 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RelationTypeBaseModel } from './RelationTypeBaseModel';
+
+export type RelationTypeResponseModel = (RelationTypeBaseModel & {
+key?: string;
+alias?: string | null;
+path?: string;
+isSystemRelationType?: boolean;
+parentObjectTypeName?: string | null;
+childObjectTypeName?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupSaveModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SaveUserGroupRequestModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupSaveModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SaveUserGroupRequestModel.ts
index a729fbff90..14466b644d 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupSaveModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SaveUserGroupRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { UserGroupBaseModel } from './UserGroupBaseModel';
 
-export type UserGroupSaveModel = UserGroupBaseModel;
-
+export type SaveUserGroupRequestModel = UserGroupBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchPresenationBaseModel.ts
similarity index 68%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchPresenationBaseModel.ts
index f75781f02a..2cc7b02658 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchPresenationBaseModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type SavedLogSearchModel = {
+export type SavedLogSearchPresenationBaseModel = {
     name?: string;
     query?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchRequestModel.ts
new file mode 100644
index 0000000000..e2e7aecf61
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchRequestModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { SavedLogSearchPresenationBaseModel } from './SavedLogSearchPresenationBaseModel';
+
+export type SavedLogSearchRequestModel = SavedLogSearchPresenationBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchResponseModel.ts
new file mode 100644
index 0000000000..1a89ce91c6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SavedLogSearchResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { SavedLogSearchPresenationBaseModel } from './SavedLogSearchPresenationBaseModel';
+
+export type SavedLogSearchResponseModel = SavedLogSearchPresenationBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultModel.ts
deleted file mode 100644
index 82f9cf64de..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { FieldModel } from './FieldModel';
-
-export type SearchResultModel = {
-    id?: string;
-    score?: number;
-    readonly fieldCount?: number;
-    fields?: Array<FieldModel>;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultResponseModel.ts
new file mode 100644
index 0000000000..9706011ad7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearchResultResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { FieldPresentationModel } from './FieldPresentationModel';
+
+export type SearchResultResponseModel = {
+    id?: string;
+    score?: number;
+    readonly fieldCount?: number;
+    fields?: Array<FieldPresentationModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearcherModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearcherResponseModel.ts
similarity index 70%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearcherModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearcherResponseModel.ts
index e20520f4d6..898a4172a8 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearcherModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/SearcherResponseModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type SearcherModel = {
+export type SearcherResponseModel = {
     name?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ServerStatusModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ServerStatusResponseModel.ts
similarity index 80%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ServerStatusModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ServerStatusResponseModel.ts
index 8c338954f5..5ba10b5849 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ServerStatusModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ServerStatusResponseModel.ts
@@ -4,7 +4,6 @@
 
 import type { RuntimeLevelModel } from './RuntimeLevelModel';
 
-export type ServerStatusModel = {
+export type ServerStatusResponseModel = {
     serverStatus?: RuntimeLevelModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRepresentationBaseModel.ts
similarity index 78%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRepresentationBaseModel.ts
index 9cf2ab4b30..1734020f3e 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRepresentationBaseModel.ts
@@ -4,7 +4,6 @@
 
 import type { TelemetryLevelModel } from './TelemetryLevelModel';
 
-export type TelemetryModel = {
+export type TelemetryRepresentationBaseModel = {
     telemetryLevel?: TelemetryLevelModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRequestModel.ts
new file mode 100644
index 0000000000..08f54adf7c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryRequestModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TelemetryRepresentationBaseModel } from './TelemetryRepresentationBaseModel';
+
+export type TelemetryRequestModel = TelemetryRepresentationBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryResponseModel.ts
new file mode 100644
index 0000000000..3ddf37ec02
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TelemetryResponseModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TelemetryRepresentationBaseModel } from './TelemetryRepresentationBaseModel';
+
+export type TelemetryResponseModel = TelemetryRepresentationBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModelBaseModel.ts
index 7471d8b826..11e0260809 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModelBaseModel.ts
@@ -7,4 +7,3 @@ export type TemplateModelBaseModel = {
     alias?: string;
     content?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteFilterModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteFilterPresentationModel.ts
similarity index 78%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteFilterModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteFilterPresentationModel.ts
index 1befb86885..83a2625447 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteFilterModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteFilterPresentationModel.ts
@@ -4,9 +4,8 @@
 
 import type { OperatorModel } from './OperatorModel';
 
-export type TemplateQueryExecuteFilterModel = {
+export type TemplateQueryExecuteFilterPresentationModel = {
     propertyAlias?: string;
     constraintValue?: string;
     operator?: OperatorModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteModel.ts
index 029409b196..29ad0c52ae 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteModel.ts
@@ -2,14 +2,13 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { TemplateQueryExecuteFilterModel } from './TemplateQueryExecuteFilterModel';
+import type { TemplateQueryExecuteFilterPresentationModel } from './TemplateQueryExecuteFilterPresentationModel';
 import type { TemplateQueryExecuteSortModel } from './TemplateQueryExecuteSortModel';
 
 export type TemplateQueryExecuteModel = {
     rootContentKey?: string | null;
     contentTypeAlias?: string | null;
-    filters?: Array<TemplateQueryExecuteFilterModel> | null;
+    filters?: Array<TemplateQueryExecuteFilterPresentationModel> | null;
     sort?: TemplateQueryExecuteSortModel | null;
     take?: number;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteSortModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteSortModel.ts
index d3a1b6cf56..a733632dcc 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteSortModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryExecuteSortModel.ts
@@ -6,4 +6,3 @@ export type TemplateQueryExecuteSortModel = {
     propertyAlias?: string;
     direction?: string | null;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryOperatorModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryOperatorModel.ts
index 5b24f440a5..df264e1646 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryOperatorModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryOperatorModel.ts
@@ -9,4 +9,3 @@ export type TemplateQueryOperatorModel = {
     operator?: OperatorModel;
     applicableTypes?: Array<TemplateQueryPropertyTypeModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryPropertyModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryPropertyPresentationModel.ts
similarity index 80%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryPropertyModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryPropertyPresentationModel.ts
index 545d021964..dfd201f49e 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryPropertyModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryPropertyPresentationModel.ts
@@ -4,8 +4,7 @@
 
 import type { TemplateQueryPropertyTypeModel } from './TemplateQueryPropertyTypeModel';
 
-export type TemplateQueryPropertyModel = {
+export type TemplateQueryPropertyPresentationModel = {
     alias?: string;
     type?: TemplateQueryPropertyTypeModel;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultItemPresentationModel.ts
similarity index 66%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultItemModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultItemPresentationModel.ts
index 43d24a4c62..a2082853e0 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultItemModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultItemPresentationModel.ts
@@ -2,8 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type TemplateQueryResultItemModel = {
+export type TemplateQueryResultItemPresentationModel = {
     icon?: string;
     name?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultModel.ts
deleted file mode 100644
index 1839c4e456..0000000000
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-import type { TemplateQueryResultItemModel } from './TemplateQueryResultItemModel';
-
-export type TemplateQueryResultModel = {
-    queryExpression?: string;
-    sampleResults?: Array<TemplateQueryResultItemModel>;
-    resultCount?: number;
-    executionTime?: number;
-};
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultResponseModel.ts
new file mode 100644
index 0000000000..c32ff1d249
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQueryResultResponseModel.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { TemplateQueryResultItemPresentationModel } from './TemplateQueryResultItemPresentationModel';
+
+export type TemplateQueryResultResponseModel = {
+    queryExpression?: string;
+    sampleResults?: Array<TemplateQueryResultItemPresentationModel>;
+    resultCount?: number;
+    executionTime?: number;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQuerySettingsModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQuerySettingsResponseModel.ts
similarity index 52%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQuerySettingsModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQuerySettingsResponseModel.ts
index 67723966b6..b49bbae056 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQuerySettingsModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateQuerySettingsResponseModel.ts
@@ -3,11 +3,10 @@
 /* eslint-disable */
 
 import type { TemplateQueryOperatorModel } from './TemplateQueryOperatorModel';
-import type { TemplateQueryPropertyModel } from './TemplateQueryPropertyModel';
+import type { TemplateQueryPropertyPresentationModel } from './TemplateQueryPropertyPresentationModel';
 
-export type TemplateQuerySettingsModel = {
+export type TemplateQuerySettingsResponseModel = {
     contentTypeAliases?: Array<string>;
-    properties?: Array<TemplateQueryPropertyModel>;
+    properties?: Array<TemplateQueryPropertyPresentationModel>;
     operators?: Array<TemplateQueryOperatorModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateResponseModel.ts
similarity index 60%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateResponseModel.ts
index 7f14861ddd..1044f35131 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateResponseModel.ts
@@ -4,8 +4,7 @@
 
 import type { TemplateModelBaseModel } from './TemplateModelBaseModel';
 
-export type TemplateModel = (TemplateModelBaseModel & {
-    $type: string;
-    key?: string;
+export type TemplateResponseModel = (TemplateModelBaseModel & {
+$type: string;
+key?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateScaffoldModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateScaffoldResponseModel.ts
similarity index 67%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateScaffoldModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateScaffoldResponseModel.ts
index 47040df1dc..d616c8c655 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateScaffoldModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateScaffoldResponseModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type TemplateScaffoldModel = {
+export type TemplateScaffoldResponseModel = {
     content?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TreeItemModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TreeItemPresentationModel.ts
similarity index 78%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TreeItemModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TreeItemPresentationModel.ts
index b16725118d..e62a6043a5 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TreeItemModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TreeItemPresentationModel.ts
@@ -2,10 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type TreeItemModel = {
+export type TreeItemPresentationModel = {
     name?: string;
     type?: string;
     icon?: string;
     hasChildren?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts
new file mode 100644
index 0000000000..c2d856a916
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DocumentValueModel } from './DocumentValueModel';
+import type { DocumentVariantRequestModel } from './DocumentVariantRequestModel';
+
+export type UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel = {
+    values?: Array<DocumentValueModel>;
+    variants?: Array<DocumentVariantRequestModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts
new file mode 100644
index 0000000000..5c95019eb1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { MediaValueModel } from './MediaValueModel';
+import type { MediaVariantRequestModel } from './MediaVariantRequestModel';
+
+export type UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel = {
+    values?: Array<MediaValueModel>;
+    variants?: Array<MediaVariantRequestModel>;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDataTypeRequestModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDataTypeRequestModel.ts
index 9905f91b45..fce11fbc4e 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DataTypeUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDataTypeRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { DataTypeModelBaseModel } from './DataTypeModelBaseModel';
 
-export type DataTypeUpdateModel = DataTypeModelBaseModel;
-
+export type UpdateDataTypeRequestModel = DataTypeModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDictionaryItemRequestModel.ts
similarity index 66%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDictionaryItemRequestModel.ts
index 7ec1024f75..2c4af9822a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/DictionaryItemUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDictionaryItemRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { DictionaryItemModelBaseModel } from './DictionaryItemModelBaseModel';
 
-export type DictionaryItemUpdateModel = DictionaryItemModelBaseModel;
-
+export type UpdateDictionaryItemRequestModel = DictionaryItemModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDocumentRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDocumentRequestModel.ts
new file mode 100644
index 0000000000..2b10730abb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDocumentRequestModel.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel } from './UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel';
+
+export type UpdateDocumentRequestModel = (UpdateContentRequestModelBaseDocumentValueModelDocumentVariantRequestModel & {
+templateKey?: string | null;
+});
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDomainsRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDomainsRequestModel.ts
new file mode 100644
index 0000000000..06caa5c458
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateDomainsRequestModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DomainsPresentationModelBaseModel } from './DomainsPresentationModelBaseModel';
+
+export type UpdateDomainsRequestModel = DomainsPresentationModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateFolderReponseModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateFolderReponseModel.ts
index cadefa91e6..1644854933 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/FolderUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateFolderReponseModel.ts
@@ -4,5 +4,4 @@
 
 import type { FolderModelBaseModel } from './FolderModelBaseModel';
 
-export type FolderUpdateModel = FolderModelBaseModel;
-
+export type UpdateFolderReponseModel = FolderModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateLanguageRequestModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateLanguageRequestModel.ts
index 43ede0907e..45f9f1a76c 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/LanguageUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateLanguageRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { LanguageModelBaseModel } from './LanguageModelBaseModel';
 
-export type LanguageUpdateModel = LanguageModelBaseModel;
-
+export type UpdateLanguageRequestModel = LanguageModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateMediaRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateMediaRequestModel.ts
new file mode 100644
index 0000000000..8363477f55
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateMediaRequestModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel } from './UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel';
+
+export type UpdateMediaRequestModel = UpdateContentRequestModelBaseMediaValueModelMediaVariantRequestModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdatePackageRequestModel.ts
similarity index 61%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdatePackageRequestModel.ts
index e8bbd052fe..ab91b916f3 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/PackageUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdatePackageRequestModel.ts
@@ -4,7 +4,6 @@
 
 import type { PackageModelBaseModel } from './PackageModelBaseModel';
 
-export type PackageUpdateModel = (PackageModelBaseModel & {
-    packagePath?: string;
+export type UpdatePackageRequestModel = (PackageModelBaseModel & {
+packagePath?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateRelationTypeRequestModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateRelationTypeRequestModel.ts
new file mode 100644
index 0000000000..df64f4fb41
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateRelationTypeRequestModel.ts
@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { RelationTypeBaseModel } from './RelationTypeBaseModel';
+
+export type UpdateRelationTypeRequestModel = RelationTypeBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateCreateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateTemplateRequestModel.ts
similarity index 69%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateCreateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateTemplateRequestModel.ts
index 7096084213..a95046e2f9 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/TemplateCreateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateTemplateRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { TemplateModelBaseModel } from './TemplateModelBaseModel';
 
-export type TemplateCreateModel = TemplateModelBaseModel;
-
+export type UpdateTemplateRequestModel = TemplateModelBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupUpdateModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateUserGroupRequestModel.ts
similarity index 68%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupUpdateModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateUserGroupRequestModel.ts
index 9d329770d4..7e357408c1 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupUpdateModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpdateUserGroupRequestModel.ts
@@ -4,5 +4,4 @@
 
 import type { UserGroupBaseModel } from './UserGroupBaseModel';
 
-export type UserGroupUpdateModel = UserGroupBaseModel;
-
+export type UpdateUserGroupRequestModel = UserGroupBaseModel;
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpgradeSettingsModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpgradeSettingsResponseModel.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpgradeSettingsModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpgradeSettingsResponseModel.ts
index 0486d96ff8..8331fa652a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpgradeSettingsModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UpgradeSettingsResponseModel.ts
@@ -2,11 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type UpgradeSettingsModel = {
+export type UpgradeSettingsResponseModel = {
     currentState?: string;
     newState?: string;
     newVersion?: string;
     oldVersion?: string;
     readonly reportUrl?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UploadDictionaryResponseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UploadDictionaryResponseModel.ts
new file mode 100644
index 0000000000..3394ac66c7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UploadDictionaryResponseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ImportDictionaryItemsPresentationModel } from './ImportDictionaryItemsPresentationModel';
+
+export type UploadDictionaryResponseModel = {
+    dictionaryItems?: Array<ImportDictionaryItemsPresentationModel>;
+    fileName?: string | null;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupBaseModel.ts
index 3b22ff01eb..5da0876910 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupBaseModel.ts
@@ -12,4 +12,3 @@ export type UserGroupBaseModel = {
     mediaStartNodeKey?: string | null;
     permissions?: Array<string>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupPresentationModel.ts
similarity index 60%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupPresentationModel.ts
index 0aae1e4cf7..e812fc9384 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserGroupPresentationModel.ts
@@ -4,8 +4,7 @@
 
 import type { UserGroupBaseModel } from './UserGroupBaseModel';
 
-export type UserGroupModel = (UserGroupBaseModel & {
-    $type: string;
-    key?: string;
+export type UserGroupPresentationModel = (UserGroupBaseModel & {
+$type: string;
+key?: string;
 });
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserInstallModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserInstallResponseModel.ts
similarity index 81%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserInstallModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserInstallResponseModel.ts
index 9c89afe57b..c107963227 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserInstallModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserInstallResponseModel.ts
@@ -2,10 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type UserInstallModel = {
+export type UserInstallResponseModel = {
     name: string;
     email: string;
     password: string;
     readonly subscribeToNewsletter?: boolean;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserSettingsModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserSettingsModel.ts
index af052a9cc7..e5837a651d 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserSettingsModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/UserSettingsModel.ts
@@ -2,11 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ConsentLevelModel } from './ConsentLevelModel';
+import type { ConsentLevelPresentationModel } from './ConsentLevelPresentationModel';
 
 export type UserSettingsModel = {
     minCharLength?: number;
     minNonAlphaNumericLength?: number;
-    consentLevels?: Array<ConsentLevelModel>;
+    consentLevels?: Array<ConsentLevelPresentationModel>;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ValueViewModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ValueModelBaseModel.ts
similarity index 75%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ValueViewModelBaseModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ValueModelBaseModel.ts
index f63bda6058..ef9d722992 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ValueViewModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/ValueModelBaseModel.ts
@@ -2,10 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type ValueViewModelBaseModel = {
+export type ValueModelBaseModel = {
+    $type: string;
     culture?: string | null;
     segment?: string | null;
     alias?: string;
     value?: any;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantModelBaseModel.ts
new file mode 100644
index 0000000000..b2227d9a71
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantModelBaseModel.ts
@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type VariantModelBaseModel = {
+    $type: string;
+    culture?: string | null;
+    segment?: string | null;
+    name?: string;
+};
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantViewModelBaseModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantResponseModelBaseModel.ts
similarity index 75%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantViewModelBaseModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantResponseModelBaseModel.ts
index 6e2f7e0a05..a0b2fa88a5 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantViewModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VariantResponseModelBaseModel.ts
@@ -2,11 +2,11 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type VariantViewModelBaseModel = {
+export type VariantResponseModelBaseModel = {
+    $type: string;
     culture?: string | null;
     segment?: string | null;
     name?: string;
     createDate?: string;
     updateDate?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VersionModel.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VersionResponseModel.ts
similarity index 71%
rename from src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VersionModel.ts
rename to src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VersionResponseModel.ts
index a4405a253b..b454174231 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VersionModel.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/models/VersionResponseModel.ts
@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type VersionModel = {
+export type VersionResponseModel = {
     version?: string;
 };
-
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/AuditLogResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/AuditLogResource.ts
index 20a267dcb5..f1c3b47e92 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/AuditLogResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/AuditLogResource.ts
@@ -17,16 +17,16 @@ export class AuditLogResource {
      * @throws ApiError
      */
     public static getAuditLog({
-        orderDirection,
-        sinceDate,
-        skip,
-        take = 100,
-    }: {
-        orderDirection?: DirectionModel,
-        sinceDate?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedAuditLogWithUsernameResponseModel> {
+orderDirection,
+sinceDate,
+skip,
+take = 100,
+}: {
+orderDirection?: DirectionModel,
+sinceDate?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedAuditLogWithUsernameResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/audit-log',
@@ -44,18 +44,18 @@ export class AuditLogResource {
      * @throws ApiError
      */
     public static getAuditLogByKey({
-        key,
-        orderDirection,
-        sinceDate,
-        skip,
-        take = 100,
-    }: {
-        key: string,
-        orderDirection?: DirectionModel,
-        sinceDate?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedAuditLogResponseModel> {
+key,
+orderDirection,
+sinceDate,
+skip,
+take = 100,
+}: {
+key: string,
+orderDirection?: DirectionModel,
+sinceDate?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedAuditLogResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/audit-log/{key}',
@@ -76,16 +76,16 @@ export class AuditLogResource {
      * @throws ApiError
      */
     public static getAuditLogTypeByLogType({
-        logType,
-        sinceDate,
-        skip,
-        take = 100,
-    }: {
-        logType: AuditTypeModel,
-        sinceDate?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedAuditLogResponseModel> {
+logType,
+sinceDate,
+skip,
+take = 100,
+}: {
+logType: AuditTypeModel,
+sinceDate?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedAuditLogResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/audit-log/type/{logType}',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/CultureResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/CultureResource.ts
index 1c0efea89e..16fe49b915 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/CultureResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/CultureResource.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedCultureModel } from '../models/PagedCultureModel';
+import type { PagedCultureReponseModel } from '../models/PagedCultureReponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -10,16 +10,16 @@ import { request as __request } from '../core/request';
 export class CultureResource {
 
     /**
-     * @returns PagedCultureModel Success
+     * @returns PagedCultureReponseModel Success
      * @throws ApiError
      */
     public static getCulture({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedCultureModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedCultureReponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/culture',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DataTypeResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DataTypeResource.ts
index 29f0ca82bd..dddb4cd14f 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DataTypeResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DataTypeResource.ts
@@ -1,18 +1,18 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DataTypeCopyModel } from '../models/DataTypeCopyModel';
-import type { DataTypeCreateModel } from '../models/DataTypeCreateModel';
-import type { DataTypeModel } from '../models/DataTypeModel';
-import type { DataTypeMoveModel } from '../models/DataTypeMoveModel';
-import type { DataTypeReferenceModel } from '../models/DataTypeReferenceModel';
-import type { DataTypeUpdateModel } from '../models/DataTypeUpdateModel';
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { FolderCreateModel } from '../models/FolderCreateModel';
-import type { FolderModel } from '../models/FolderModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { FolderUpdateModel } from '../models/FolderUpdateModel';
-import type { PagedFolderTreeItemModel } from '../models/PagedFolderTreeItemModel';
+import type { CopyDataTypeRequestModel } from '../models/CopyDataTypeRequestModel';
+import type { CreateDataTypeRequestModel } from '../models/CreateDataTypeRequestModel';
+import type { CreateFolderRequestModel } from '../models/CreateFolderRequestModel';
+import type { DataTypeReferenceResponseModel } from '../models/DataTypeReferenceResponseModel';
+import type { DataTypeResponseModel } from '../models/DataTypeResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { FolderReponseModel } from '../models/FolderReponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { MoveDataTypeRequestModel } from '../models/MoveDataTypeRequestModel';
+import type { PagedFolderTreeItemResponseModel } from '../models/PagedFolderTreeItemResponseModel';
+import type { UpdateDataTypeRequestModel } from '../models/UpdateDataTypeRequestModel';
+import type { UpdateFolderReponseModel } from '../models/UpdateFolderReponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -25,10 +25,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static postDataType({
-        requestBody,
-    }: {
-        requestBody?: DataTypeCreateModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: CreateDataTypeRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/data-type',
@@ -47,10 +47,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static getDataTypeByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<DataTypeModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<DataTypeResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/data-type/{key}',
@@ -68,10 +68,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static deleteDataTypeByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/data-type/{key}',
@@ -90,12 +90,12 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static putDataTypeByKey({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: DataTypeUpdateModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateDataTypeRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/data-type/{key}',
@@ -116,12 +116,12 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static postDataTypeByKeyCopy({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: DataTypeCopyModel,
-    }): CancelablePromise<string> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: CopyDataTypeRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/data-type/{key}/copy',
@@ -142,12 +142,12 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static postDataTypeByKeyMove({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: DataTypeMoveModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: MoveDataTypeRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/data-type/{key}/move',
@@ -167,10 +167,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static getDataTypeByKeyReferences({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<Array<DataTypeReferenceModel>> {
+key,
+}: {
+key: string,
+}): CancelablePromise<Array<DataTypeReferenceResponseModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/data-type/{key}/references',
@@ -188,10 +188,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static postDataTypeFolder({
-        requestBody,
-    }: {
-        requestBody?: FolderCreateModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: CreateFolderRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/data-type/folder',
@@ -206,10 +206,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static getDataTypeFolderByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<FolderModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<FolderReponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/data-type/folder/{key}',
@@ -227,10 +227,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static deleteDataTypeFolderByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/data-type/folder/{key}',
@@ -248,12 +248,12 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static putDataTypeFolderByKey({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: FolderUpdateModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateFolderReponseModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/data-type/folder/{key}',
@@ -269,20 +269,20 @@ export class DataTypeResource {
     }
 
     /**
-     * @returns PagedFolderTreeItemModel Success
+     * @returns PagedFolderTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDataTypeChildren({
-        parentKey,
-        skip,
-        take = 100,
-        foldersOnly = false,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-        foldersOnly?: boolean,
-    }): CancelablePromise<PagedFolderTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+foldersOnly = false,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+foldersOnly?: boolean,
+}): CancelablePromise<PagedFolderTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/data-type/children',
@@ -300,10 +300,10 @@ export class DataTypeResource {
      * @throws ApiError
      */
     public static getTreeDataTypeItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(FolderTreeItemModel | DocumentTypeTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(FolderTreeItemResponseModel | DocumentTypeTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/data-type/item',
@@ -314,18 +314,18 @@ export class DataTypeResource {
     }
 
     /**
-     * @returns PagedFolderTreeItemModel Success
+     * @returns PagedFolderTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDataTypeRoot({
-        skip,
-        take = 100,
-        foldersOnly = false,
-    }: {
-        skip?: number,
-        take?: number,
-        foldersOnly?: boolean,
-    }): CancelablePromise<PagedFolderTreeItemModel> {
+skip,
+take = 100,
+foldersOnly = false,
+}: {
+skip?: number,
+take?: number,
+foldersOnly?: boolean,
+}): CancelablePromise<PagedFolderTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/data-type/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DictionaryResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DictionaryResource.ts
index 3b4d8125e7..b2a18ac44d 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DictionaryResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DictionaryResource.ts
@@ -1,16 +1,16 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DictionaryImportModel } from '../models/DictionaryImportModel';
-import type { DictionaryItemCreateModel } from '../models/DictionaryItemCreateModel';
-import type { DictionaryItemModel } from '../models/DictionaryItemModel';
-import type { DictionaryItemUpdateModel } from '../models/DictionaryItemUpdateModel';
-import type { DictionaryMoveModel } from '../models/DictionaryMoveModel';
-import type { DictionaryUploadModel } from '../models/DictionaryUploadModel';
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { PagedDictionaryOverviewModel } from '../models/PagedDictionaryOverviewModel';
-import type { PagedEntityTreeItemModel } from '../models/PagedEntityTreeItemModel';
+import type { CreateDictionaryItemRequestModel } from '../models/CreateDictionaryItemRequestModel';
+import type { DictionaryItemResponseModel } from '../models/DictionaryItemResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { ImportDictionaryRequestModel } from '../models/ImportDictionaryRequestModel';
+import type { MoveDictionaryRequestModel } from '../models/MoveDictionaryRequestModel';
+import type { PagedDictionaryOverviewResponseModel } from '../models/PagedDictionaryOverviewResponseModel';
+import type { PagedEntityTreeItemResponseModel } from '../models/PagedEntityTreeItemResponseModel';
+import type { UpdateDictionaryItemRequestModel } from '../models/UpdateDictionaryItemRequestModel';
+import type { UploadDictionaryResponseModel } from '../models/UploadDictionaryResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -19,16 +19,16 @@ import { request as __request } from '../core/request';
 export class DictionaryResource {
 
     /**
-     * @returns PagedDictionaryOverviewModel Success
+     * @returns PagedDictionaryOverviewResponseModel Success
      * @throws ApiError
      */
     public static getDictionary({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedDictionaryOverviewModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedDictionaryOverviewResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/dictionary',
@@ -44,10 +44,10 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static postDictionary({
-        requestBody,
-    }: {
-        requestBody?: DictionaryItemCreateModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: CreateDictionaryItemRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/dictionary',
@@ -67,10 +67,10 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static getDictionaryByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<DictionaryItemModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<DictionaryItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/dictionary/{key}',
@@ -88,10 +88,10 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static deleteDictionaryByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/dictionary/{key}',
@@ -110,12 +110,12 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static putDictionaryByKey({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: DictionaryItemUpdateModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateDictionaryItemRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/dictionary/{key}',
@@ -136,12 +136,12 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static getDictionaryByKeyExport({
-        key,
-        includeChildren = false,
-    }: {
-        key: string,
-        includeChildren?: boolean,
-    }): CancelablePromise<Blob> {
+key,
+includeChildren = false,
+}: {
+key: string,
+includeChildren?: boolean,
+}): CancelablePromise<Blob> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/dictionary/{key}/export',
@@ -162,12 +162,12 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static postDictionaryByKeyMove({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: DictionaryMoveModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: MoveDictionaryRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/dictionary/{key}/move',
@@ -188,10 +188,10 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static postDictionaryImport({
-        requestBody,
-    }: {
-        requestBody?: DictionaryImportModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: ImportDictionaryRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/dictionary/import',
@@ -210,10 +210,10 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static postDictionaryUpload({
-        requestBody,
-    }: {
-        requestBody?: any,
-    }): CancelablePromise<DictionaryUploadModel> {
+requestBody,
+}: {
+requestBody?: any,
+}): CancelablePromise<UploadDictionaryResponseModel> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/dictionary/upload',
@@ -225,18 +225,18 @@ export class DictionaryResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDictionaryChildren({
-        parentKey,
-        skip,
-        take = 100,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/dictionary/children',
@@ -253,10 +253,10 @@ export class DictionaryResource {
      * @throws ApiError
      */
     public static getTreeDictionaryItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(FolderTreeItemModel | DocumentTypeTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(FolderTreeItemResponseModel | DocumentTypeTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/dictionary/item',
@@ -267,16 +267,16 @@ export class DictionaryResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDictionaryRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/dictionary/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentBlueprintResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentBlueprintResource.ts
index 3513d34d4e..5a31940e98 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentBlueprintResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentBlueprintResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DocumentBlueprintTreeItemModel } from '../models/DocumentBlueprintTreeItemModel';
-import type { PagedDocumentBlueprintTreeItemModel } from '../models/PagedDocumentBlueprintTreeItemModel';
+import type { DocumentBlueprintTreeItemResponseModel } from '../models/DocumentBlueprintTreeItemResponseModel';
+import type { PagedDocumentBlueprintTreeItemResponseModel } from '../models/PagedDocumentBlueprintTreeItemResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -15,10 +15,10 @@ export class DocumentBlueprintResource {
      * @throws ApiError
      */
     public static getTreeDocumentBlueprintItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<DocumentBlueprintTreeItemModel>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<DocumentBlueprintTreeItemResponseModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document-blueprint/item',
@@ -29,16 +29,16 @@ export class DocumentBlueprintResource {
     }
 
     /**
-     * @returns PagedDocumentBlueprintTreeItemModel Success
+     * @returns PagedDocumentBlueprintTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDocumentBlueprintRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedDocumentBlueprintTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedDocumentBlueprintTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document-blueprint/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentResource.ts
index 470fa0033c..8d30863d05 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentResource.ts
@@ -1,10 +1,13 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DocumentModel } from '../models/DocumentModel';
-import type { DocumentTreeItemModel } from '../models/DocumentTreeItemModel';
-import type { PagedDocumentTreeItemModel } from '../models/PagedDocumentTreeItemModel';
-import type { PagedRecycleBinItemModel } from '../models/PagedRecycleBinItemModel';
+import type { CreateDocumentRequestModel } from '../models/CreateDocumentRequestModel';
+import type { DocumentResponseModel } from '../models/DocumentResponseModel';
+import type { DocumentTreeItemResponseModel } from '../models/DocumentTreeItemResponseModel';
+import type { PagedDocumentTreeItemResponseModel } from '../models/PagedDocumentTreeItemResponseModel';
+import type { PagedRecycleBinItemResponseModel } from '../models/PagedRecycleBinItemResponseModel';
+import type { UpdateDocumentRequestModel } from '../models/UpdateDocumentRequestModel';
+import type { UpdateDomainsRequestModel } from '../models/UpdateDomainsRequestModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -12,15 +15,37 @@ import { request as __request } from '../core/request';
 
 export class DocumentResource {
 
+    /**
+     * @returns string Created
+     * @throws ApiError
+     */
+    public static postDocument({
+requestBody,
+}: {
+requestBody?: CreateDocumentRequestModel,
+}): CancelablePromise<string> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/umbraco/management/api/v1/document',
+            body: requestBody,
+            mediaType: 'application/json',
+            responseHeader: 'Location',
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
     /**
      * @returns any Success
      * @throws ApiError
      */
     public static getDocumentByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<DocumentModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<DocumentResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/document/{key}',
@@ -34,18 +59,106 @@ export class DocumentResource {
     }
 
     /**
-     * @returns PagedRecycleBinItemModel Success
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static deleteDocumentByKey({
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/umbraco/management/api/v1/document/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static putDocumentByKey({
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateDocumentRequestModel,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'PUT',
+            url: '/umbraco/management/api/v1/document/{key}',
+            path: {
+                'key': key,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static getDocumentByKeyDomains({
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/document/{key}/domains',
+            path: {
+                'key': key,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static putDocumentByKeyDomains({
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateDomainsRequestModel,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'PUT',
+            url: '/umbraco/management/api/v1/document/{key}/domains',
+            path: {
+                'key': key,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+
+    /**
+     * @returns PagedRecycleBinItemResponseModel Success
      * @throws ApiError
      */
     public static getRecycleBinDocumentChildren({
-        parentKey,
-        skip,
-        take = 100,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedRecycleBinItemModel> {
+parentKey,
+skip,
+take = 100,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRecycleBinItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/recycle-bin/document/children',
@@ -61,16 +174,16 @@ export class DocumentResource {
     }
 
     /**
-     * @returns PagedRecycleBinItemModel Success
+     * @returns PagedRecycleBinItemResponseModel Success
      * @throws ApiError
      */
     public static getRecycleBinDocumentRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedRecycleBinItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRecycleBinItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/recycle-bin/document/root',
@@ -85,22 +198,22 @@ export class DocumentResource {
     }
 
     /**
-     * @returns PagedDocumentTreeItemModel Success
+     * @returns PagedDocumentTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDocumentChildren({
-        parentKey,
-        skip,
-        take = 100,
-        dataTypeKey,
-        culture,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-        dataTypeKey?: string,
-        culture?: string,
-    }): CancelablePromise<PagedDocumentTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+dataTypeKey,
+culture,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+dataTypeKey?: string,
+culture?: string,
+}): CancelablePromise<PagedDocumentTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document/children',
@@ -119,14 +232,14 @@ export class DocumentResource {
      * @throws ApiError
      */
     public static getTreeDocumentItem({
-        key,
-        dataTypeKey,
-        culture,
-    }: {
-        key?: Array<string>,
-        dataTypeKey?: string,
-        culture?: string,
-    }): CancelablePromise<Array<DocumentTreeItemModel>> {
+key,
+dataTypeKey,
+culture,
+}: {
+key?: Array<string>,
+dataTypeKey?: string,
+culture?: string,
+}): CancelablePromise<Array<DocumentTreeItemResponseModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document/item',
@@ -139,20 +252,20 @@ export class DocumentResource {
     }
 
     /**
-     * @returns PagedDocumentTreeItemModel Success
+     * @returns PagedDocumentTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDocumentRoot({
-        skip,
-        take = 100,
-        dataTypeKey,
-        culture,
-    }: {
-        skip?: number,
-        take?: number,
-        dataTypeKey?: string,
-        culture?: string,
-    }): CancelablePromise<PagedDocumentTreeItemModel> {
+skip,
+take = 100,
+dataTypeKey,
+culture,
+}: {
+skip?: number,
+take?: number,
+dataTypeKey?: string,
+culture?: string,
+}): CancelablePromise<PagedDocumentTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentTypeResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentTypeResource.ts
index a36a6081cc..5d034deb83 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentTypeResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/DocumentTypeResource.ts
@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DocumentTypeModel } from '../models/DocumentTypeModel';
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { PagedDocumentTypeTreeItemModel } from '../models/PagedDocumentTypeTreeItemModel';
+import type { DocumentTypeResponseModel } from '../models/DocumentTypeResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { PagedDocumentTypeTreeItemResponseModel } from '../models/PagedDocumentTypeTreeItemResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -16,10 +16,10 @@ export class DocumentTypeResource {
      * @throws ApiError
      */
     public static getDocumentTypeByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<DocumentTypeModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<DocumentTypeResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/document-type/{key}',
@@ -33,20 +33,20 @@ export class DocumentTypeResource {
     }
 
     /**
-     * @returns PagedDocumentTypeTreeItemModel Success
+     * @returns PagedDocumentTypeTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDocumentTypeChildren({
-        parentKey,
-        skip,
-        take = 100,
-        foldersOnly = false,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-        foldersOnly?: boolean,
-    }): CancelablePromise<PagedDocumentTypeTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+foldersOnly = false,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+foldersOnly?: boolean,
+}): CancelablePromise<PagedDocumentTypeTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document-type/children',
@@ -64,10 +64,10 @@ export class DocumentTypeResource {
      * @throws ApiError
      */
     public static getTreeDocumentTypeItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<DocumentTypeTreeItemModel>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<DocumentTypeTreeItemResponseModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document-type/item',
@@ -78,18 +78,18 @@ export class DocumentTypeResource {
     }
 
     /**
-     * @returns PagedDocumentTypeTreeItemModel Success
+     * @returns PagedDocumentTypeTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeDocumentTypeRoot({
-        skip,
-        take = 100,
-        foldersOnly = false,
-    }: {
-        skip?: number,
-        take?: number,
-        foldersOnly?: boolean,
-    }): CancelablePromise<PagedDocumentTypeTreeItemModel> {
+skip,
+take = 100,
+foldersOnly = false,
+}: {
+skip?: number,
+take?: number,
+foldersOnly?: boolean,
+}): CancelablePromise<PagedDocumentTypeTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/document-type/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HealthCheckResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HealthCheckResource.ts
index 1497c8ac6f..d7100791c1 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HealthCheckResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HealthCheckResource.ts
@@ -1,11 +1,11 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { HealthCheckActionModel } from '../models/HealthCheckActionModel';
-import type { HealthCheckGroupModel } from '../models/HealthCheckGroupModel';
-import type { HealthCheckGroupWithResultModel } from '../models/HealthCheckGroupWithResultModel';
-import type { HealthCheckResultModel } from '../models/HealthCheckResultModel';
-import type { PagedHealthCheckGroupModelBaseModel } from '../models/PagedHealthCheckGroupModelBaseModel';
+import type { HealthCheckActionRequestModel } from '../models/HealthCheckActionRequestModel';
+import type { HealthCheckGroupPresentationModel } from '../models/HealthCheckGroupPresentationModel';
+import type { HealthCheckGroupWithResultResponseModel } from '../models/HealthCheckGroupWithResultResponseModel';
+import type { HealthCheckResultResponseModel } from '../models/HealthCheckResultResponseModel';
+import type { PagedHealthCheckGroupResponseModel } from '../models/PagedHealthCheckGroupResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -14,16 +14,16 @@ import { request as __request } from '../core/request';
 export class HealthCheckResource {
 
     /**
-     * @returns PagedHealthCheckGroupModelBaseModel Success
+     * @returns PagedHealthCheckGroupResponseModel Success
      * @throws ApiError
      */
     public static getHealthCheckGroup({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedHealthCheckGroupModelBaseModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedHealthCheckGroupResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/health-check-group',
@@ -39,10 +39,10 @@ export class HealthCheckResource {
      * @throws ApiError
      */
     public static getHealthCheckGroupByName({
-        name,
-    }: {
-        name: string,
-    }): CancelablePromise<HealthCheckGroupModel> {
+name,
+}: {
+name: string,
+}): CancelablePromise<HealthCheckGroupPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/health-check-group/{name}',
@@ -60,10 +60,10 @@ export class HealthCheckResource {
      * @throws ApiError
      */
     public static postHealthCheckGroupByNameCheck({
-        name,
-    }: {
-        name: string,
-    }): CancelablePromise<HealthCheckGroupWithResultModel> {
+name,
+}: {
+name: string,
+}): CancelablePromise<HealthCheckGroupWithResultResponseModel> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/health-check-group/{name}/check',
@@ -81,10 +81,10 @@ export class HealthCheckResource {
      * @throws ApiError
      */
     public static postHealthCheckExecuteAction({
-        requestBody,
-    }: {
-        requestBody?: HealthCheckActionModel,
-    }): CancelablePromise<HealthCheckResultModel> {
+requestBody,
+}: {
+requestBody?: HealthCheckActionRequestModel,
+}): CancelablePromise<HealthCheckResultResponseModel> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/health-check/execute-action',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HelpResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HelpResource.ts
index 86bf5f9a4f..c9377a09fc 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HelpResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/HelpResource.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedHelpPageModel } from '../models/PagedHelpPageModel';
+import type { PagedHelpPageResponseModel } from '../models/PagedHelpPageResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -10,22 +10,22 @@ import { request as __request } from '../core/request';
 export class HelpResource {
 
     /**
-     * @returns PagedHelpPageModel Success
+     * @returns PagedHelpPageResponseModel Success
      * @throws ApiError
      */
     public static getHelp({
-        section,
-        tree,
-        skip,
-        take,
-        baseUrl = 'https://our.umbraco.com',
-    }: {
-        section?: string,
-        tree?: string,
-        skip?: number,
-        take?: number,
-        baseUrl?: string,
-    }): CancelablePromise<PagedHelpPageModel> {
+section,
+tree,
+skip,
+take,
+baseUrl = 'https://our.umbraco.com',
+}: {
+section?: string,
+tree?: string,
+skip?: number,
+take?: number,
+baseUrl?: string,
+}): CancelablePromise<PagedHelpPageResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/help',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/IndexerResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/IndexerResource.ts
index e59bb94642..0ba53cc918 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/IndexerResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/IndexerResource.ts
@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { IndexModel } from '../models/IndexModel';
+import type { IndexResponseModel } from '../models/IndexResponseModel';
 import type { OkResultModel } from '../models/OkResultModel';
-import type { PagedIndexModel } from '../models/PagedIndexModel';
+import type { PagedIndexResponseModel } from '../models/PagedIndexResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -12,16 +12,16 @@ import { request as __request } from '../core/request';
 export class IndexerResource {
 
     /**
-     * @returns PagedIndexModel Success
+     * @returns PagedIndexResponseModel Success
      * @throws ApiError
      */
     public static getIndexer({
-        skip,
-        take,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedIndexModel> {
+skip,
+take,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedIndexResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/indexer',
@@ -37,10 +37,10 @@ export class IndexerResource {
      * @throws ApiError
      */
     public static getIndexerByIndexName({
-        indexName,
-    }: {
-        indexName: string,
-    }): CancelablePromise<IndexModel> {
+indexName,
+}: {
+indexName: string,
+}): CancelablePromise<IndexResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/indexer/{indexName}',
@@ -58,10 +58,10 @@ export class IndexerResource {
      * @throws ApiError
      */
     public static postIndexerByIndexNameRebuild({
-        indexName,
-    }: {
-        indexName: string,
-    }): CancelablePromise<OkResultModel> {
+indexName,
+}: {
+indexName: string,
+}): CancelablePromise<OkResultModel> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/indexer/{indexName}/rebuild',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/InstallResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/InstallResource.ts
index d5e8ae2949..dcf826bbcf 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/InstallResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/InstallResource.ts
@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DatabaseInstallModel } from '../models/DatabaseInstallModel';
-import type { InstallModel } from '../models/InstallModel';
-import type { InstallSettingsModel } from '../models/InstallSettingsModel';
+import type { DatabaseInstallResponseModel } from '../models/DatabaseInstallResponseModel';
+import type { InstallSettingsResponseModel } from '../models/InstallSettingsResponseModel';
+import type { InstallVResponseModel } from '../models/InstallVResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -15,7 +15,7 @@ export class InstallResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getInstallSettings(): CancelablePromise<InstallSettingsModel> {
+    public static getInstallSettings(): CancelablePromise<InstallSettingsResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/install/settings',
@@ -31,10 +31,10 @@ export class InstallResource {
      * @throws ApiError
      */
     public static postInstallSetup({
-        requestBody,
-    }: {
-        requestBody?: InstallModel,
-    }): CancelablePromise<any> {
+requestBody,
+}: {
+requestBody?: InstallVResponseModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/install/setup',
@@ -52,10 +52,10 @@ export class InstallResource {
      * @throws ApiError
      */
     public static postInstallValidateDatabase({
-        requestBody,
-    }: {
-        requestBody?: DatabaseInstallModel,
-    }): CancelablePromise<any> {
+requestBody,
+}: {
+requestBody?: DatabaseInstallResponseModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/install/validate-database',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LanguageResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LanguageResource.ts
index b724860487..51967f3fce 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LanguageResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LanguageResource.ts
@@ -1,10 +1,10 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { LanguageCreateModel } from '../models/LanguageCreateModel';
-import type { LanguageModel } from '../models/LanguageModel';
-import type { LanguageUpdateModel } from '../models/LanguageUpdateModel';
-import type { PagedLanguageModel } from '../models/PagedLanguageModel';
+import type { CreateLanguageRequestModel } from '../models/CreateLanguageRequestModel';
+import type { LanguageResponseModel } from '../models/LanguageResponseModel';
+import type { PagedLanguageResponseModel } from '../models/PagedLanguageResponseModel';
+import type { UpdateLanguageRequestModel } from '../models/UpdateLanguageRequestModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -13,16 +13,16 @@ import { request as __request } from '../core/request';
 export class LanguageResource {
 
     /**
-     * @returns PagedLanguageModel Success
+     * @returns PagedLanguageResponseModel Success
      * @throws ApiError
      */
     public static getLanguage({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedLanguageModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedLanguageResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/language',
@@ -38,10 +38,10 @@ export class LanguageResource {
      * @throws ApiError
      */
     public static postLanguage({
-        requestBody,
-    }: {
-        requestBody?: LanguageCreateModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: CreateLanguageRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/language',
@@ -60,10 +60,10 @@ export class LanguageResource {
      * @throws ApiError
      */
     public static getLanguageByIsoCode({
-        isoCode,
-    }: {
-        isoCode: string,
-    }): CancelablePromise<LanguageModel> {
+isoCode,
+}: {
+isoCode: string,
+}): CancelablePromise<LanguageResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/language/{isoCode}',
@@ -81,10 +81,10 @@ export class LanguageResource {
      * @throws ApiError
      */
     public static deleteLanguageByIsoCode({
-        isoCode,
-    }: {
-        isoCode: string,
-    }): CancelablePromise<any> {
+isoCode,
+}: {
+isoCode: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/language/{isoCode}',
@@ -103,12 +103,12 @@ export class LanguageResource {
      * @throws ApiError
      */
     public static putLanguageByIsoCode({
-        isoCode,
-        requestBody,
-    }: {
-        isoCode: string,
-        requestBody?: LanguageUpdateModel,
-    }): CancelablePromise<any> {
+isoCode,
+requestBody,
+}: {
+isoCode: string,
+requestBody?: UpdateLanguageRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/language/{isoCode}',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LogViewerResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LogViewerResource.ts
index b768fba3a1..ef9b3cbf79 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LogViewerResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/LogViewerResource.ts
@@ -2,13 +2,14 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { DirectionModel } from '../models/DirectionModel';
-import type { LogLevelCountsModel } from '../models/LogLevelCountsModel';
+import type { LogLevelCountsReponseModel } from '../models/LogLevelCountsReponseModel';
 import type { LogLevelModel } from '../models/LogLevelModel';
-import type { PagedLoggerModel } from '../models/PagedLoggerModel';
-import type { PagedLogMessageModel } from '../models/PagedLogMessageModel';
-import type { PagedLogTemplateModel } from '../models/PagedLogTemplateModel';
-import type { PagedSavedLogSearchModel } from '../models/PagedSavedLogSearchModel';
-import type { SavedLogSearchModel } from '../models/SavedLogSearchModel';
+import type { PagedLoggerResponseModel } from '../models/PagedLoggerResponseModel';
+import type { PagedLogMessageResponseModel } from '../models/PagedLogMessageResponseModel';
+import type { PagedLogTemplateResponseModel } from '../models/PagedLogTemplateResponseModel';
+import type { PagedSavedLogSearchResponseModel } from '../models/PagedSavedLogSearchResponseModel';
+import type { SavedLogSearchRequestModel } from '../models/SavedLogSearchRequestModel';
+import type { SavedLogSearchResponseModel } from '../models/SavedLogSearchResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -17,16 +18,16 @@ import { request as __request } from '../core/request';
 export class LogViewerResource {
 
     /**
-     * @returns PagedLoggerModel Success
+     * @returns PagedLoggerResponseModel Success
      * @throws ApiError
      */
     public static getLogViewerLevel({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedLoggerModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedLoggerResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/level',
@@ -42,12 +43,12 @@ export class LogViewerResource {
      * @throws ApiError
      */
     public static getLogViewerLevelCount({
-        startDate,
-        endDate,
-    }: {
-        startDate?: string,
-        endDate?: string,
-    }): CancelablePromise<LogLevelCountsModel> {
+startDate,
+endDate,
+}: {
+startDate?: string,
+endDate?: string,
+}): CancelablePromise<LogLevelCountsReponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/level-count',
@@ -62,26 +63,26 @@ export class LogViewerResource {
     }
 
     /**
-     * @returns PagedLogMessageModel Success
+     * @returns PagedLogMessageResponseModel Success
      * @throws ApiError
      */
     public static getLogViewerLog({
-        skip,
-        take = 100,
-        orderDirection,
-        filterExpression,
-        logLevel,
-        startDate,
-        endDate,
-    }: {
-        skip?: number,
-        take?: number,
-        orderDirection?: DirectionModel,
-        filterExpression?: string,
-        logLevel?: Array<LogLevelModel>,
-        startDate?: string,
-        endDate?: string,
-    }): CancelablePromise<PagedLogMessageModel> {
+skip,
+take = 100,
+orderDirection,
+filterExpression,
+logLevel,
+startDate,
+endDate,
+}: {
+skip?: number,
+take?: number,
+orderDirection?: DirectionModel,
+filterExpression?: string,
+logLevel?: Array<LogLevelModel>,
+startDate?: string,
+endDate?: string,
+}): CancelablePromise<PagedLogMessageResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/log',
@@ -98,20 +99,20 @@ export class LogViewerResource {
     }
 
     /**
-     * @returns PagedLogTemplateModel Success
+     * @returns PagedLogTemplateResponseModel Success
      * @throws ApiError
      */
     public static getLogViewerMessageTemplate({
-        skip,
-        take = 100,
-        startDate,
-        endDate,
-    }: {
-        skip?: number,
-        take?: number,
-        startDate?: string,
-        endDate?: string,
-    }): CancelablePromise<PagedLogTemplateModel> {
+skip,
+take = 100,
+startDate,
+endDate,
+}: {
+skip?: number,
+take?: number,
+startDate?: string,
+endDate?: string,
+}): CancelablePromise<PagedLogTemplateResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/message-template',
@@ -128,16 +129,16 @@ export class LogViewerResource {
     }
 
     /**
-     * @returns PagedSavedLogSearchModel Success
+     * @returns PagedSavedLogSearchResponseModel Success
      * @throws ApiError
      */
     public static getLogViewerSavedSearch({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedSavedLogSearchModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedSavedLogSearchResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/saved-search',
@@ -153,10 +154,10 @@ export class LogViewerResource {
      * @throws ApiError
      */
     public static postLogViewerSavedSearch({
-        requestBody,
-    }: {
-        requestBody?: SavedLogSearchModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: SavedLogSearchRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/log-viewer/saved-search',
@@ -174,10 +175,10 @@ export class LogViewerResource {
      * @throws ApiError
      */
     public static getLogViewerSavedSearchByName({
-        name,
-    }: {
-        name: string,
-    }): CancelablePromise<SavedLogSearchModel> {
+name,
+}: {
+name: string,
+}): CancelablePromise<SavedLogSearchResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/saved-search/{name}',
@@ -195,10 +196,10 @@ export class LogViewerResource {
      * @throws ApiError
      */
     public static deleteLogViewerSavedSearchByName({
-        name,
-    }: {
-        name: string,
-    }): CancelablePromise<any> {
+name,
+}: {
+name: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/log-viewer/saved-search/{name}',
@@ -216,12 +217,12 @@ export class LogViewerResource {
      * @throws ApiError
      */
     public static getLogViewerValidateLogsSize({
-        startDate,
-        endDate,
-    }: {
-        startDate?: string,
-        endDate?: string,
-    }): CancelablePromise<any> {
+startDate,
+endDate,
+}: {
+startDate?: string,
+endDate?: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/log-viewer/validate-logs-size',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaResource.ts
index 074a7704cb..bd2f3e59d6 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaResource.ts
@@ -1,10 +1,13 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ContentTreeItemModel } from '../models/ContentTreeItemModel';
-import type { DocumentTreeItemModel } from '../models/DocumentTreeItemModel';
-import type { PagedContentTreeItemModel } from '../models/PagedContentTreeItemModel';
-import type { PagedRecycleBinItemModel } from '../models/PagedRecycleBinItemModel';
+import type { ContentTreeItemResponseModel } from '../models/ContentTreeItemResponseModel';
+import type { CreateMediaRequestModel } from '../models/CreateMediaRequestModel';
+import type { DocumentResponseModel } from '../models/DocumentResponseModel';
+import type { DocumentTreeItemResponseModel } from '../models/DocumentTreeItemResponseModel';
+import type { PagedContentTreeItemResponseModel } from '../models/PagedContentTreeItemResponseModel';
+import type { PagedRecycleBinItemResponseModel } from '../models/PagedRecycleBinItemResponseModel';
+import type { UpdateMediaRequestModel } from '../models/UpdateMediaRequestModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -13,18 +16,109 @@ import { request as __request } from '../core/request';
 export class MediaResource {
 
     /**
-     * @returns PagedRecycleBinItemModel Success
+     * @returns string Created
+     * @throws ApiError
+     */
+    public static postMedia({
+requestBody,
+}: {
+requestBody?: CreateMediaRequestModel,
+}): CancelablePromise<string> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/umbraco/management/api/v1/media',
+            body: requestBody,
+            mediaType: 'application/json',
+            responseHeader: 'Location',
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static getMediaByKey({
+key,
+}: {
+key: string,
+}): CancelablePromise<DocumentResponseModel> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/media/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static deleteMediaByKey({
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/umbraco/management/api/v1/media/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static putMediaByKey({
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateMediaRequestModel,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'PUT',
+            url: '/umbraco/management/api/v1/media/{key}',
+            path: {
+                'key': key,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns PagedRecycleBinItemResponseModel Success
      * @throws ApiError
      */
     public static getRecycleBinMediaChildren({
-        parentKey,
-        skip,
-        take = 100,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedRecycleBinItemModel> {
+parentKey,
+skip,
+take = 100,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRecycleBinItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/recycle-bin/media/children',
@@ -40,16 +134,16 @@ export class MediaResource {
     }
 
     /**
-     * @returns PagedRecycleBinItemModel Success
+     * @returns PagedRecycleBinItemResponseModel Success
      * @throws ApiError
      */
     public static getRecycleBinMediaRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedRecycleBinItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRecycleBinItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/recycle-bin/media/root',
@@ -64,20 +158,20 @@ export class MediaResource {
     }
 
     /**
-     * @returns PagedContentTreeItemModel Success
+     * @returns PagedContentTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeMediaChildren({
-        parentKey,
-        skip,
-        take = 100,
-        dataTypeKey,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-        dataTypeKey?: string,
-    }): CancelablePromise<PagedContentTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+dataTypeKey,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+dataTypeKey?: string,
+}): CancelablePromise<PagedContentTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/media/children',
@@ -95,12 +189,12 @@ export class MediaResource {
      * @throws ApiError
      */
     public static getTreeMediaItem({
-        key,
-        dataTypeKey,
-    }: {
-        key?: Array<string>,
-        dataTypeKey?: string,
-    }): CancelablePromise<Array<(ContentTreeItemModel | DocumentTreeItemModel)>> {
+key,
+dataTypeKey,
+}: {
+key?: Array<string>,
+dataTypeKey?: string,
+}): CancelablePromise<Array<(ContentTreeItemResponseModel | DocumentTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/media/item',
@@ -112,18 +206,18 @@ export class MediaResource {
     }
 
     /**
-     * @returns PagedContentTreeItemModel Success
+     * @returns PagedContentTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeMediaRoot({
-        skip,
-        take = 100,
-        dataTypeKey,
-    }: {
-        skip?: number,
-        take?: number,
-        dataTypeKey?: string,
-    }): CancelablePromise<PagedContentTreeItemModel> {
+skip,
+take = 100,
+dataTypeKey,
+}: {
+skip?: number,
+take?: number,
+dataTypeKey?: string,
+}): CancelablePromise<PagedContentTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/media/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaTypeResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaTypeResource.ts
index 3f4b9b1eed..e8cd962868 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaTypeResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MediaTypeResource.ts
@@ -1,9 +1,10 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { PagedFolderTreeItemModel } from '../models/PagedFolderTreeItemModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { MediaTypeResponseModel } from '../models/MediaTypeResponseModel';
+import type { PagedFolderTreeItemResponseModel } from '../models/PagedFolderTreeItemResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -12,20 +13,41 @@ import { request as __request } from '../core/request';
 export class MediaTypeResource {
 
     /**
-     * @returns PagedFolderTreeItemModel Success
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static getMediaTypeByKey({
+key,
+}: {
+key: string,
+}): CancelablePromise<MediaTypeResponseModel> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/media-type/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns PagedFolderTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeMediaTypeChildren({
-        parentKey,
-        skip,
-        take = 100,
-        foldersOnly = false,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-        foldersOnly?: boolean,
-    }): CancelablePromise<PagedFolderTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+foldersOnly = false,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+foldersOnly?: boolean,
+}): CancelablePromise<PagedFolderTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/media-type/children',
@@ -43,10 +65,10 @@ export class MediaTypeResource {
      * @throws ApiError
      */
     public static getTreeMediaTypeItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(FolderTreeItemModel | DocumentTypeTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(FolderTreeItemResponseModel | DocumentTypeTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/media-type/item',
@@ -57,18 +79,18 @@ export class MediaTypeResource {
     }
 
     /**
-     * @returns PagedFolderTreeItemModel Success
+     * @returns PagedFolderTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeMediaTypeRoot({
-        skip,
-        take = 100,
-        foldersOnly = false,
-    }: {
-        skip?: number,
-        take?: number,
-        foldersOnly?: boolean,
-    }): CancelablePromise<PagedFolderTreeItemModel> {
+skip,
+take = 100,
+foldersOnly = false,
+}: {
+skip?: number,
+take?: number,
+foldersOnly?: boolean,
+}): CancelablePromise<PagedFolderTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/media-type/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberGroupResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberGroupResource.ts
index 0229bafb93..d0845c8968 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberGroupResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberGroupResource.ts
@@ -1,13 +1,13 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ContentTreeItemModel } from '../models/ContentTreeItemModel';
-import type { DocumentBlueprintTreeItemModel } from '../models/DocumentBlueprintTreeItemModel';
-import type { DocumentTreeItemModel } from '../models/DocumentTreeItemModel';
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { EntityTreeItemModel } from '../models/EntityTreeItemModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { PagedEntityTreeItemModel } from '../models/PagedEntityTreeItemModel';
+import type { ContentTreeItemResponseModel } from '../models/ContentTreeItemResponseModel';
+import type { DocumentBlueprintTreeItemResponseModel } from '../models/DocumentBlueprintTreeItemResponseModel';
+import type { DocumentTreeItemResponseModel } from '../models/DocumentTreeItemResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { EntityTreeItemResponseModel } from '../models/EntityTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { PagedEntityTreeItemResponseModel } from '../models/PagedEntityTreeItemResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -20,10 +20,10 @@ export class MemberGroupResource {
      * @throws ApiError
      */
     public static getTreeMemberGroupItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(EntityTreeItemModel | ContentTreeItemModel | DocumentBlueprintTreeItemModel | DocumentTreeItemModel | DocumentTypeTreeItemModel | FolderTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(EntityTreeItemResponseModel | ContentTreeItemResponseModel | DocumentBlueprintTreeItemResponseModel | DocumentTreeItemResponseModel | DocumentTypeTreeItemResponseModel | FolderTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/member-group/item',
@@ -34,16 +34,16 @@ export class MemberGroupResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeMemberGroupRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/member-group/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberTypeResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberTypeResource.ts
index c0bda15f8a..3336953d5a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberTypeResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/MemberTypeResource.ts
@@ -1,13 +1,13 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ContentTreeItemModel } from '../models/ContentTreeItemModel';
-import type { DocumentBlueprintTreeItemModel } from '../models/DocumentBlueprintTreeItemModel';
-import type { DocumentTreeItemModel } from '../models/DocumentTreeItemModel';
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { EntityTreeItemModel } from '../models/EntityTreeItemModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { PagedEntityTreeItemModel } from '../models/PagedEntityTreeItemModel';
+import type { ContentTreeItemResponseModel } from '../models/ContentTreeItemResponseModel';
+import type { DocumentBlueprintTreeItemResponseModel } from '../models/DocumentBlueprintTreeItemResponseModel';
+import type { DocumentTreeItemResponseModel } from '../models/DocumentTreeItemResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { EntityTreeItemResponseModel } from '../models/EntityTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { PagedEntityTreeItemResponseModel } from '../models/PagedEntityTreeItemResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -20,10 +20,10 @@ export class MemberTypeResource {
      * @throws ApiError
      */
     public static getTreeMemberTypeItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(EntityTreeItemModel | ContentTreeItemModel | DocumentBlueprintTreeItemModel | DocumentTreeItemModel | DocumentTypeTreeItemModel | FolderTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(EntityTreeItemResponseModel | ContentTreeItemResponseModel | DocumentBlueprintTreeItemResponseModel | DocumentTreeItemResponseModel | DocumentTypeTreeItemResponseModel | FolderTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/member-type/item',
@@ -34,16 +34,16 @@ export class MemberTypeResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeMemberTypeRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/member-type/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ModelsBuilderResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ModelsBuilderResource.ts
index 2d078b6c4c..de6f0498bc 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ModelsBuilderResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ModelsBuilderResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ModelsBuilderModel } from '../models/ModelsBuilderModel';
-import type { OutOfDateStatusModel } from '../models/OutOfDateStatusModel';
+import type { ModelsBuilderResponseModel } from '../models/ModelsBuilderResponseModel';
+import type { OutOfDateStatusResponseModel } from '../models/OutOfDateStatusResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -28,7 +28,7 @@ export class ModelsBuilderResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getModelsBuilderDashboard(): CancelablePromise<ModelsBuilderModel> {
+    public static getModelsBuilderDashboard(): CancelablePromise<ModelsBuilderResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/models-builder/dashboard',
@@ -39,7 +39,7 @@ export class ModelsBuilderResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getModelsBuilderStatus(): CancelablePromise<OutOfDateStatusModel> {
+    public static getModelsBuilderStatus(): CancelablePromise<OutOfDateStatusResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/models-builder/status',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ObjectTypesResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ObjectTypesResource.ts
new file mode 100644
index 0000000000..c87823f5aa
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ObjectTypesResource.ts
@@ -0,0 +1,33 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { PagedObjectTypeResponseModel } from '../models/PagedObjectTypeResponseModel';
+
+import type { CancelablePromise } from '../core/CancelablePromise';
+import { OpenAPI } from '../core/OpenAPI';
+import { request as __request } from '../core/request';
+
+export class ObjectTypesResource {
+
+    /**
+     * @returns PagedObjectTypeResponseModel Success
+     * @throws ApiError
+     */
+    public static getObjectTypes({
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedObjectTypeResponseModel> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/object-types',
+            query: {
+                'skip': skip,
+                'take': take,
+            },
+        });
+    }
+
+}
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PackageResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PackageResource.ts
index 4af66aa239..d33c63d582 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PackageResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PackageResource.ts
@@ -1,12 +1,12 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PackageCreateModel } from '../models/PackageCreateModel';
-import type { PackageDefinitionModel } from '../models/PackageDefinitionModel';
-import type { PackageManifestModel } from '../models/PackageManifestModel';
-import type { PackageUpdateModel } from '../models/PackageUpdateModel';
-import type { PagedPackageDefinitionModel } from '../models/PagedPackageDefinitionModel';
-import type { PagedPackageMigrationStatusModel } from '../models/PagedPackageMigrationStatusModel';
+import type { CreatePackageRequestModel } from '../models/CreatePackageRequestModel';
+import type { PackageDefinitionResponseModel } from '../models/PackageDefinitionResponseModel';
+import type { PackageManifestResponseModel } from '../models/PackageManifestResponseModel';
+import type { PagedPackageDefinitionResponseModel } from '../models/PagedPackageDefinitionResponseModel';
+import type { PagedPackageMigrationStatusResponseModel } from '../models/PagedPackageMigrationStatusResponseModel';
+import type { UpdatePackageRequestModel } from '../models/UpdatePackageRequestModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -19,10 +19,10 @@ export class PackageResource {
      * @throws ApiError
      */
     public static postPackageByNameRunMigration({
-        name,
-    }: {
-        name: string,
-    }): CancelablePromise<any> {
+name,
+}: {
+name: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/package/{name}/run-migration',
@@ -37,16 +37,16 @@ export class PackageResource {
     }
 
     /**
-     * @returns PagedPackageDefinitionModel Success
+     * @returns PagedPackageDefinitionResponseModel Success
      * @throws ApiError
      */
     public static getPackageCreated({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedPackageDefinitionModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedPackageDefinitionResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/package/created',
@@ -62,10 +62,10 @@ export class PackageResource {
      * @throws ApiError
      */
     public static postPackageCreated({
-        requestBody,
-    }: {
-        requestBody?: PackageCreateModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: CreatePackageRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/package/created',
@@ -84,10 +84,10 @@ export class PackageResource {
      * @throws ApiError
      */
     public static getPackageCreatedByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<PackageDefinitionModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<PackageDefinitionResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/package/created/{key}',
@@ -105,10 +105,10 @@ export class PackageResource {
      * @throws ApiError
      */
     public static deletePackageCreatedByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/package/created/{key}',
@@ -126,12 +126,12 @@ export class PackageResource {
      * @throws ApiError
      */
     public static putPackageCreatedByKey({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: PackageUpdateModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdatePackageRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/package/created/{key}',
@@ -151,10 +151,10 @@ export class PackageResource {
      * @throws ApiError
      */
     public static getPackageCreatedByKeyDownload({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<Blob> {
+key,
+}: {
+key: string,
+}): CancelablePromise<Blob> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/package/created/{key}/download',
@@ -171,7 +171,7 @@ export class PackageResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getPackageManifest(): CancelablePromise<Array<PackageManifestModel>> {
+    public static getPackageManifest(): CancelablePromise<Array<PackageManifestResponseModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/package/manifest',
@@ -179,16 +179,16 @@ export class PackageResource {
     }
 
     /**
-     * @returns PagedPackageMigrationStatusModel Success
+     * @returns PagedPackageMigrationStatusResponseModel Success
      * @throws ApiError
      */
     public static getPackageMigrationStatus({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedPackageMigrationStatusModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedPackageMigrationStatusResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/package/migration-status',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PartialViewResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PartialViewResource.ts
index 4ec4cce563..f249b42346 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PartialViewResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/PartialViewResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { FileSystemTreeItemModel } from '../models/FileSystemTreeItemModel';
-import type { PagedFileSystemTreeItemModel } from '../models/PagedFileSystemTreeItemModel';
+import type { FileSystemTreeItemPresentationModel } from '../models/FileSystemTreeItemPresentationModel';
+import type { PagedFileSystemTreeItemPresentationModel } from '../models/PagedFileSystemTreeItemPresentationModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,18 +11,18 @@ import { request as __request } from '../core/request';
 export class PartialViewResource {
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreePartialViewChildren({
-        path,
-        skip,
-        take = 100,
-    }: {
-        path?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+path,
+skip,
+take = 100,
+}: {
+path?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/partial-view/children',
@@ -39,10 +39,10 @@ export class PartialViewResource {
      * @throws ApiError
      */
     public static getTreePartialViewItem({
-        path,
-    }: {
-        path?: Array<string>,
-    }): CancelablePromise<Array<FileSystemTreeItemModel>> {
+path,
+}: {
+path?: Array<string>,
+}): CancelablePromise<Array<FileSystemTreeItemPresentationModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/partial-view/item',
@@ -53,16 +53,16 @@ export class PartialViewResource {
     }
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreePartialViewRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/partial-view/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ProfilingResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ProfilingResource.ts
index c5d65d6bdc..ddd5d31988 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ProfilingResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ProfilingResource.ts
@@ -1,7 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ProfilingStatusModel } from '../models/ProfilingStatusModel';
+import type { ProfilingStatusRequestModel } from '../models/ProfilingStatusRequestModel';
+import type { ProfilingStatusResponseModel } from '../models/ProfilingStatusResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -13,7 +14,7 @@ export class ProfilingResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getProfilingStatus(): CancelablePromise<ProfilingStatusModel> {
+    public static getProfilingStatus(): CancelablePromise<ProfilingStatusResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/profiling/status',
@@ -25,10 +26,10 @@ export class ProfilingResource {
      * @throws ApiError
      */
     public static putProfilingStatus({
-        requestBody,
-    }: {
-        requestBody?: ProfilingStatusModel,
-    }): CancelablePromise<any> {
+requestBody,
+}: {
+requestBody?: ProfilingStatusRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/profiling/status',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RedirectManagementResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RedirectManagementResource.ts
index aa15ce40ac..2c82d24fcd 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RedirectManagementResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RedirectManagementResource.ts
@@ -1,9 +1,9 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedRedirectUrlModel } from '../models/PagedRedirectUrlModel';
+import type { PagedRedirectUrlResponseModel } from '../models/PagedRedirectUrlResponseModel';
 import type { RedirectStatusModel } from '../models/RedirectStatusModel';
-import type { RedirectUrlStatusModel } from '../models/RedirectUrlStatusModel';
+import type { RedirectUrlStatusResponseModel } from '../models/RedirectUrlStatusResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -12,18 +12,18 @@ import { request as __request } from '../core/request';
 export class RedirectManagementResource {
 
     /**
-     * @returns PagedRedirectUrlModel Success
+     * @returns PagedRedirectUrlResponseModel Success
      * @throws ApiError
      */
     public static getRedirectManagement({
-        filter,
-        skip,
-        take,
-    }: {
-        filter?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedRedirectUrlModel> {
+filter,
+skip,
+take,
+}: {
+filter?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRedirectUrlResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/redirect-management',
@@ -39,18 +39,18 @@ export class RedirectManagementResource {
     }
 
     /**
-     * @returns PagedRedirectUrlModel Success
+     * @returns PagedRedirectUrlResponseModel Success
      * @throws ApiError
      */
     public static getRedirectManagementByKey({
-        key,
-        skip,
-        take,
-    }: {
-        key: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedRedirectUrlModel> {
+key,
+skip,
+take,
+}: {
+key: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRedirectUrlResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/redirect-management/{key}',
@@ -69,10 +69,10 @@ export class RedirectManagementResource {
      * @throws ApiError
      */
     public static deleteRedirectManagementByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/redirect-management/{key}',
@@ -86,7 +86,7 @@ export class RedirectManagementResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getRedirectManagementStatus(): CancelablePromise<RedirectUrlStatusModel> {
+    public static getRedirectManagementStatus(): CancelablePromise<RedirectUrlStatusResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/redirect-management/status',
@@ -98,10 +98,10 @@ export class RedirectManagementResource {
      * @throws ApiError
      */
     public static postRedirectManagementStatus({
-        status,
-    }: {
-        status?: RedirectStatusModel,
-    }): CancelablePromise<any> {
+status,
+}: {
+status?: RedirectStatusModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/redirect-management/status',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationResource.ts
index df5460a1e4..69d6c06860 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedRelationModel } from '../models/PagedRelationModel';
-import type { RelationModel } from '../models/RelationModel';
+import type { PagedRelationResponseModel } from '../models/PagedRelationResponseModel';
+import type { RelationResponseModel } from '../models/RelationResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -15,10 +15,10 @@ export class RelationResource {
      * @throws ApiError
      */
     public static getRelationById({
-        id,
-    }: {
-        id: number,
-    }): CancelablePromise<RelationModel> {
+id,
+}: {
+id: number,
+}): CancelablePromise<RelationResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/relation/{id}',
@@ -32,20 +32,20 @@ export class RelationResource {
     }
 
     /**
-     * @returns PagedRelationModel Success
+     * @returns PagedRelationResponseModel Success
      * @throws ApiError
      */
     public static getRelationChildRelationByChildId({
-        childId,
-        skip,
-        take,
-        relationTypeAlias = '',
-    }: {
-        childId: number,
-        skip?: number,
-        take?: number,
-        relationTypeAlias?: string,
-    }): CancelablePromise<PagedRelationModel> {
+childId,
+skip,
+take,
+relationTypeAlias = '',
+}: {
+childId: number,
+skip?: number,
+take?: number,
+relationTypeAlias?: string,
+}): CancelablePromise<PagedRelationResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/relation/child-relation/{childId}',
@@ -60,4 +60,30 @@ export class RelationResource {
         });
     }
 
+    /**
+     * @returns PagedRelationResponseModel Success
+     * @throws ApiError
+     */
+    public static getRelationTypeByKey({
+key,
+skip,
+take = 100,
+}: {
+key: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedRelationResponseModel> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/relation/type/{key}',
+            path: {
+                'key': key,
+            },
+            query: {
+                'skip': skip,
+                'take': take,
+            },
+        });
+    }
+
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationTypeResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationTypeResource.ts
index 9d36d51255..1c9c7bb266 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationTypeResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/RelationTypeResource.ts
@@ -1,9 +1,12 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { PagedEntityTreeItemModel } from '../models/PagedEntityTreeItemModel';
+import type { CreateRelationTypeRequestModel } from '../models/CreateRelationTypeRequestModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { PagedEntityTreeItemResponseModel } from '../models/PagedEntityTreeItemResponseModel';
+import type { RelationTypeResponseModel } from '../models/RelationTypeResponseModel';
+import type { UpdateRelationTypeRequestModel } from '../models/UpdateRelationTypeRequestModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,15 +14,104 @@ import { request as __request } from '../core/request';
 
 export class RelationTypeResource {
 
+    /**
+     * @returns string Created
+     * @throws ApiError
+     */
+    public static postRelationType({
+requestBody,
+}: {
+requestBody?: CreateRelationTypeRequestModel,
+}): CancelablePromise<string> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/umbraco/management/api/v1/relation-type',
+            body: requestBody,
+            mediaType: 'application/json',
+            responseHeader: 'Location',
+            errors: {
+                400: `Bad Request`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static getRelationTypeByKey({
+key,
+}: {
+key: string,
+}): CancelablePromise<RelationTypeResponseModel> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/management/api/v1/relation-type/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static deleteRelationTypeByKey({
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/umbraco/management/api/v1/relation-type/{key}',
+            path: {
+                'key': key,
+            },
+            errors: {
+                404: `Not Found`,
+            },
+        });
+    }
+
+    /**
+     * @returns any Success
+     * @throws ApiError
+     */
+    public static putRelationTypeByKey({
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateRelationTypeRequestModel,
+}): CancelablePromise<RelationTypeResponseModel> {
+        return __request(OpenAPI, {
+            method: 'PUT',
+            url: '/umbraco/management/api/v1/relation-type/{key}',
+            path: {
+                'key': key,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+            errors: {
+                400: `Bad Request`,
+                404: `Not Found`,
+            },
+        });
+    }
+
     /**
      * @returns any Success
      * @throws ApiError
      */
     public static getTreeRelationTypeItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(FolderTreeItemModel | DocumentTypeTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(FolderTreeItemResponseModel | DocumentTypeTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/relation-type/item',
@@ -30,16 +122,16 @@ export class RelationTypeResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeRelationTypeRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/relation-type/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ScriptResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ScriptResource.ts
index 0b36985d82..db3cb6e256 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ScriptResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ScriptResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { FileSystemTreeItemModel } from '../models/FileSystemTreeItemModel';
-import type { PagedFileSystemTreeItemModel } from '../models/PagedFileSystemTreeItemModel';
+import type { FileSystemTreeItemPresentationModel } from '../models/FileSystemTreeItemPresentationModel';
+import type { PagedFileSystemTreeItemPresentationModel } from '../models/PagedFileSystemTreeItemPresentationModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,18 +11,18 @@ import { request as __request } from '../core/request';
 export class ScriptResource {
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreeScriptChildren({
-        path,
-        skip,
-        take = 100,
-    }: {
-        path?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+path,
+skip,
+take = 100,
+}: {
+path?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/script/children',
@@ -39,10 +39,10 @@ export class ScriptResource {
      * @throws ApiError
      */
     public static getTreeScriptItem({
-        path,
-    }: {
-        path?: Array<string>,
-    }): CancelablePromise<Array<FileSystemTreeItemModel>> {
+path,
+}: {
+path?: Array<string>,
+}): CancelablePromise<Array<FileSystemTreeItemPresentationModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/script/item',
@@ -53,16 +53,16 @@ export class ScriptResource {
     }
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreeScriptRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/script/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/SearcherResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/SearcherResource.ts
index 7792b73095..b284454529 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/SearcherResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/SearcherResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedSearcherModel } from '../models/PagedSearcherModel';
-import type { PagedSearchResultModel } from '../models/PagedSearchResultModel';
+import type { PagedSearcherResponseModel } from '../models/PagedSearcherResponseModel';
+import type { PagedSearchResultResponseModel } from '../models/PagedSearchResultResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,16 +11,16 @@ import { request as __request } from '../core/request';
 export class SearcherResource {
 
     /**
-     * @returns PagedSearcherModel Success
+     * @returns PagedSearcherResponseModel Success
      * @throws ApiError
      */
     public static getSearcher({
-        skip,
-        take,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedSearcherModel> {
+skip,
+take,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedSearcherResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/searcher',
@@ -32,20 +32,20 @@ export class SearcherResource {
     }
 
     /**
-     * @returns PagedSearchResultModel Success
+     * @returns PagedSearchResultResponseModel Success
      * @throws ApiError
      */
     public static getSearcherBySearcherNameQuery({
-        searcherName,
-        term,
-        skip,
-        take,
-    }: {
-        searcherName: string,
-        term?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedSearchResultModel> {
+searcherName,
+term,
+skip,
+take,
+}: {
+searcherName: string,
+term?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedSearchResultResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/searcher/{searcherName}/query',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ServerResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ServerResource.ts
index a2351ca654..364c15ac2a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ServerResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/ServerResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ServerStatusModel } from '../models/ServerStatusModel';
-import type { VersionModel } from '../models/VersionModel';
+import type { ServerStatusResponseModel } from '../models/ServerStatusResponseModel';
+import type { VersionResponseModel } from '../models/VersionResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -14,7 +14,7 @@ export class ServerResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getServerStatus(): CancelablePromise<ServerStatusModel> {
+    public static getServerStatus(): CancelablePromise<ServerStatusResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/server/status',
@@ -28,7 +28,7 @@ export class ServerResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getServerVersion(): CancelablePromise<VersionModel> {
+    public static getServerVersion(): CancelablePromise<VersionResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/server/version',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StaticFileResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StaticFileResource.ts
index 2ed706ee95..240af80ee8 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StaticFileResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StaticFileResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { FileSystemTreeItemModel } from '../models/FileSystemTreeItemModel';
-import type { PagedFileSystemTreeItemModel } from '../models/PagedFileSystemTreeItemModel';
+import type { FileSystemTreeItemPresentationModel } from '../models/FileSystemTreeItemPresentationModel';
+import type { PagedFileSystemTreeItemPresentationModel } from '../models/PagedFileSystemTreeItemPresentationModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,18 +11,18 @@ import { request as __request } from '../core/request';
 export class StaticFileResource {
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreeStaticFileChildren({
-        path,
-        skip,
-        take = 100,
-    }: {
-        path?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+path,
+skip,
+take = 100,
+}: {
+path?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/static-file/children',
@@ -39,10 +39,10 @@ export class StaticFileResource {
      * @throws ApiError
      */
     public static getTreeStaticFileItem({
-        path,
-    }: {
-        path?: Array<string>,
-    }): CancelablePromise<Array<FileSystemTreeItemModel>> {
+path,
+}: {
+path?: Array<string>,
+}): CancelablePromise<Array<FileSystemTreeItemPresentationModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/static-file/item',
@@ -53,16 +53,16 @@ export class StaticFileResource {
     }
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreeStaticFileRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/static-file/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StylesheetResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StylesheetResource.ts
index 1e48b59a58..b504ba6aab 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StylesheetResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/StylesheetResource.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { FileSystemTreeItemModel } from '../models/FileSystemTreeItemModel';
-import type { PagedFileSystemTreeItemModel } from '../models/PagedFileSystemTreeItemModel';
+import type { FileSystemTreeItemPresentationModel } from '../models/FileSystemTreeItemPresentationModel';
+import type { PagedFileSystemTreeItemPresentationModel } from '../models/PagedFileSystemTreeItemPresentationModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,18 +11,18 @@ import { request as __request } from '../core/request';
 export class StylesheetResource {
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreeStylesheetChildren({
-        path,
-        skip,
-        take = 100,
-    }: {
-        path?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+path,
+skip,
+take = 100,
+}: {
+path?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/stylesheet/children',
@@ -39,10 +39,10 @@ export class StylesheetResource {
      * @throws ApiError
      */
     public static getTreeStylesheetItem({
-        path,
-    }: {
-        path?: Array<string>,
-    }): CancelablePromise<Array<FileSystemTreeItemModel>> {
+path,
+}: {
+path?: Array<string>,
+}): CancelablePromise<Array<FileSystemTreeItemPresentationModel>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/stylesheet/item',
@@ -53,16 +53,16 @@ export class StylesheetResource {
     }
 
     /**
-     * @returns PagedFileSystemTreeItemModel Success
+     * @returns PagedFileSystemTreeItemPresentationModel Success
      * @throws ApiError
      */
     public static getTreeStylesheetRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedFileSystemTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedFileSystemTreeItemPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/stylesheet/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TelemetryResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TelemetryResource.ts
index 2c27fcfa93..289f0f8e46 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TelemetryResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TelemetryResource.ts
@@ -1,8 +1,9 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedTelemetryModel } from '../models/PagedTelemetryModel';
-import type { TelemetryModel } from '../models/TelemetryModel';
+import type { PagedTelemetryResponseModel } from '../models/PagedTelemetryResponseModel';
+import type { TelemetryRequestModel } from '../models/TelemetryRequestModel';
+import type { TelemetryResponseModel } from '../models/TelemetryResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -11,16 +12,16 @@ import { request as __request } from '../core/request';
 export class TelemetryResource {
 
     /**
-     * @returns PagedTelemetryModel Success
+     * @returns PagedTelemetryResponseModel Success
      * @throws ApiError
      */
     public static getTelemetry({
-        skip,
-        take,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedTelemetryModel> {
+skip,
+take,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedTelemetryResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/telemetry',
@@ -35,7 +36,7 @@ export class TelemetryResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getTelemetryLevel(): CancelablePromise<TelemetryModel> {
+    public static getTelemetryLevel(): CancelablePromise<TelemetryResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/telemetry/level',
@@ -47,10 +48,10 @@ export class TelemetryResource {
      * @throws ApiError
      */
     public static postTelemetryLevel({
-        requestBody,
-    }: {
-        requestBody?: TelemetryModel,
-    }): CancelablePromise<any> {
+requestBody,
+}: {
+requestBody?: TelemetryRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/telemetry/level',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TemplateResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TemplateResource.ts
index 32a9e49aae..d5133dc6a7 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TemplateResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TemplateResource.ts
@@ -1,20 +1,20 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ContentTreeItemModel } from '../models/ContentTreeItemModel';
-import type { DocumentBlueprintTreeItemModel } from '../models/DocumentBlueprintTreeItemModel';
-import type { DocumentTreeItemModel } from '../models/DocumentTreeItemModel';
-import type { DocumentTypeTreeItemModel } from '../models/DocumentTypeTreeItemModel';
-import type { EntityTreeItemModel } from '../models/EntityTreeItemModel';
-import type { FolderTreeItemModel } from '../models/FolderTreeItemModel';
-import type { PagedEntityTreeItemModel } from '../models/PagedEntityTreeItemModel';
-import type { TemplateCreateModel } from '../models/TemplateCreateModel';
-import type { TemplateModel } from '../models/TemplateModel';
+import type { ContentTreeItemResponseModel } from '../models/ContentTreeItemResponseModel';
+import type { CreateTemplateRequestModel } from '../models/CreateTemplateRequestModel';
+import type { DocumentBlueprintTreeItemResponseModel } from '../models/DocumentBlueprintTreeItemResponseModel';
+import type { DocumentTreeItemResponseModel } from '../models/DocumentTreeItemResponseModel';
+import type { DocumentTypeTreeItemResponseModel } from '../models/DocumentTypeTreeItemResponseModel';
+import type { EntityTreeItemResponseModel } from '../models/EntityTreeItemResponseModel';
+import type { FolderTreeItemResponseModel } from '../models/FolderTreeItemResponseModel';
+import type { PagedEntityTreeItemResponseModel } from '../models/PagedEntityTreeItemResponseModel';
 import type { TemplateQueryExecuteModel } from '../models/TemplateQueryExecuteModel';
-import type { TemplateQueryResultModel } from '../models/TemplateQueryResultModel';
-import type { TemplateQuerySettingsModel } from '../models/TemplateQuerySettingsModel';
-import type { TemplateScaffoldModel } from '../models/TemplateScaffoldModel';
-import type { TemplateUpdateModel } from '../models/TemplateUpdateModel';
+import type { TemplateQueryResultResponseModel } from '../models/TemplateQueryResultResponseModel';
+import type { TemplateQuerySettingsResponseModel } from '../models/TemplateQuerySettingsResponseModel';
+import type { TemplateResponseModel } from '../models/TemplateResponseModel';
+import type { TemplateScaffoldResponseModel } from '../models/TemplateScaffoldResponseModel';
+import type { UpdateTemplateRequestModel } from '../models/UpdateTemplateRequestModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -27,10 +27,10 @@ export class TemplateResource {
      * @throws ApiError
      */
     public static postTemplate({
-        requestBody,
-    }: {
-        requestBody?: TemplateCreateModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: CreateTemplateRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/template',
@@ -49,10 +49,10 @@ export class TemplateResource {
      * @throws ApiError
      */
     public static getTemplateByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<TemplateModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<TemplateResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/template/{key}',
@@ -70,10 +70,10 @@ export class TemplateResource {
      * @throws ApiError
      */
     public static deleteTemplateByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/template/{key}',
@@ -92,12 +92,12 @@ export class TemplateResource {
      * @throws ApiError
      */
     public static putTemplateByKey({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: TemplateUpdateModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateTemplateRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/template/{key}',
@@ -118,10 +118,10 @@ export class TemplateResource {
      * @throws ApiError
      */
     public static postTemplateQueryExecute({
-        requestBody,
-    }: {
-        requestBody?: TemplateQueryExecuteModel,
-    }): CancelablePromise<TemplateQueryResultModel> {
+requestBody,
+}: {
+requestBody?: TemplateQueryExecuteModel,
+}): CancelablePromise<TemplateQueryResultResponseModel> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/template/query/execute',
@@ -134,7 +134,7 @@ export class TemplateResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getTemplateQuerySettings(): CancelablePromise<TemplateQuerySettingsModel> {
+    public static getTemplateQuerySettings(): CancelablePromise<TemplateQuerySettingsResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/template/query/settings',
@@ -145,7 +145,7 @@ export class TemplateResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getTemplateScaffold(): CancelablePromise<TemplateScaffoldModel> {
+    public static getTemplateScaffold(): CancelablePromise<TemplateScaffoldResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/template/scaffold',
@@ -156,18 +156,18 @@ export class TemplateResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeTemplateChildren({
-        parentKey,
-        skip,
-        take = 100,
-    }: {
-        parentKey?: string,
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+parentKey,
+skip,
+take = 100,
+}: {
+parentKey?: string,
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/template/children',
@@ -184,10 +184,10 @@ export class TemplateResource {
      * @throws ApiError
      */
     public static getTreeTemplateItem({
-        key,
-    }: {
-        key?: Array<string>,
-    }): CancelablePromise<Array<(EntityTreeItemModel | ContentTreeItemModel | DocumentBlueprintTreeItemModel | DocumentTreeItemModel | DocumentTypeTreeItemModel | FolderTreeItemModel)>> {
+key,
+}: {
+key?: Array<string>,
+}): CancelablePromise<Array<(EntityTreeItemResponseModel | ContentTreeItemResponseModel | DocumentBlueprintTreeItemResponseModel | DocumentTreeItemResponseModel | DocumentTypeTreeItemResponseModel | FolderTreeItemResponseModel)>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/template/item',
@@ -198,16 +198,16 @@ export class TemplateResource {
     }
 
     /**
-     * @returns PagedEntityTreeItemModel Success
+     * @returns PagedEntityTreeItemResponseModel Success
      * @throws ApiError
      */
     public static getTreeTemplateRoot({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedEntityTreeItemModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedEntityTreeItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tree/template/root',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts
index e5637971a9..3c1a145658 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/TrackedReferenceResource.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedRelationItemModel } from '../models/PagedRelationItemModel';
+import type { PagedRelationItemResponseModel } from '../models/PagedRelationItemResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -10,20 +10,20 @@ import { request as __request } from '../core/request';
 export class TrackedReferenceResource {
 
     /**
-     * @returns PagedRelationItemModel Success
+     * @returns PagedRelationItemResponseModel Success
      * @throws ApiError
      */
     public static getTrackedReferenceByKey({
-        key,
-        skip,
-        take = 20,
-        filterMustBeIsDependency = false,
-    }: {
-        key: string,
-        skip?: number,
-        take?: number,
-        filterMustBeIsDependency?: boolean,
-    }): CancelablePromise<PagedRelationItemModel> {
+key,
+skip,
+take = 20,
+filterMustBeIsDependency = false,
+}: {
+key: string,
+skip?: number,
+take?: number,
+filterMustBeIsDependency?: boolean,
+}): CancelablePromise<PagedRelationItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tracked-reference/{key}',
@@ -39,20 +39,20 @@ export class TrackedReferenceResource {
     }
 
     /**
-     * @returns PagedRelationItemModel Success
+     * @returns PagedRelationItemResponseModel Success
      * @throws ApiError
      */
     public static getTrackedReferenceDescendantsByParentKey({
-        parentKey,
-        skip,
-        take,
-        filterMustBeIsDependency = true,
-    }: {
-        parentKey: string,
-        skip?: number,
-        take?: number,
-        filterMustBeIsDependency?: boolean,
-    }): CancelablePromise<PagedRelationItemModel> {
+parentKey,
+skip,
+take,
+filterMustBeIsDependency = true,
+}: {
+parentKey: string,
+skip?: number,
+take?: number,
+filterMustBeIsDependency?: boolean,
+}): CancelablePromise<PagedRelationItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tracked-reference/descendants/{parentKey}',
@@ -68,20 +68,20 @@ export class TrackedReferenceResource {
     }
 
     /**
-     * @returns PagedRelationItemModel Success
+     * @returns PagedRelationItemResponseModel Success
      * @throws ApiError
      */
     public static getTrackedReferenceItem({
-        key,
-        skip,
-        take = 20,
-        filterMustBeIsDependency = true,
-    }: {
-        key?: Array<string>,
-        skip?: number,
-        take?: number,
-        filterMustBeIsDependency?: boolean,
-    }): CancelablePromise<PagedRelationItemModel> {
+key,
+skip,
+take = 20,
+filterMustBeIsDependency = true,
+}: {
+key?: Array<string>,
+skip?: number,
+take?: number,
+filterMustBeIsDependency?: boolean,
+}): CancelablePromise<PagedRelationItemResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/tracked-reference/item',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UpgradeResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UpgradeResource.ts
index 472f46ea16..9ea941f41d 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UpgradeResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UpgradeResource.ts
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { UpgradeSettingsModel } from '../models/UpgradeSettingsModel';
+import type { UpgradeSettingsResponseModel } from '../models/UpgradeSettingsResponseModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -28,7 +28,7 @@ export class UpgradeResource {
      * @returns any Success
      * @throws ApiError
      */
-    public static getUpgradeSettings(): CancelablePromise<UpgradeSettingsModel> {
+    public static getUpgradeSettings(): CancelablePromise<UpgradeSettingsResponseModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/upgrade/settings',
diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UserGroupsResource.ts b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UserGroupsResource.ts
index eefa1fcb91..4c9f40614a 100644
--- a/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UserGroupsResource.ts
+++ b/src/Umbraco.Web.UI.Client/libs/backend-api/src/services/UserGroupsResource.ts
@@ -1,10 +1,10 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { PagedUserGroupModel } from '../models/PagedUserGroupModel';
-import type { UserGroupModel } from '../models/UserGroupModel';
-import type { UserGroupSaveModel } from '../models/UserGroupSaveModel';
-import type { UserGroupUpdateModel } from '../models/UserGroupUpdateModel';
+import type { PagedUserGroupPresentationModel } from '../models/PagedUserGroupPresentationModel';
+import type { SaveUserGroupRequestModel } from '../models/SaveUserGroupRequestModel';
+import type { UpdateUserGroupRequestModel } from '../models/UpdateUserGroupRequestModel';
+import type { UserGroupPresentationModel } from '../models/UserGroupPresentationModel';
 
 import type { CancelablePromise } from '../core/CancelablePromise';
 import { OpenAPI } from '../core/OpenAPI';
@@ -17,10 +17,10 @@ export class UserGroupsResource {
      * @throws ApiError
      */
     public static postUserGroups({
-        requestBody,
-    }: {
-        requestBody?: UserGroupSaveModel,
-    }): CancelablePromise<string> {
+requestBody,
+}: {
+requestBody?: SaveUserGroupRequestModel,
+}): CancelablePromise<string> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/umbraco/management/api/v1/user-groups',
@@ -34,16 +34,16 @@ export class UserGroupsResource {
     }
 
     /**
-     * @returns PagedUserGroupModel Success
+     * @returns PagedUserGroupPresentationModel Success
      * @throws ApiError
      */
     public static getUserGroups({
-        skip,
-        take = 100,
-    }: {
-        skip?: number,
-        take?: number,
-    }): CancelablePromise<PagedUserGroupModel> {
+skip,
+take = 100,
+}: {
+skip?: number,
+take?: number,
+}): CancelablePromise<PagedUserGroupPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/user-groups',
@@ -59,10 +59,10 @@ export class UserGroupsResource {
      * @throws ApiError
      */
     public static getUserGroupsByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<UserGroupModel> {
+key,
+}: {
+key: string,
+}): CancelablePromise<UserGroupPresentationModel> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/umbraco/management/api/v1/user-groups/{key}',
@@ -80,10 +80,10 @@ export class UserGroupsResource {
      * @throws ApiError
      */
     public static deleteUserGroupsByKey({
-        key,
-    }: {
-        key: string,
-    }): CancelablePromise<any> {
+key,
+}: {
+key: string,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/umbraco/management/api/v1/user-groups/{key}',
@@ -101,12 +101,12 @@ export class UserGroupsResource {
      * @throws ApiError
      */
     public static putUserGroupsByKey({
-        key,
-        requestBody,
-    }: {
-        key: string,
-        requestBody?: UserGroupUpdateModel,
-    }): CancelablePromise<any> {
+key,
+requestBody,
+}: {
+key: string,
+requestBody?: UpdateUserGroupRequestModel,
+}): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'PUT',
             url: '/umbraco/management/api/v1/user-groups/{key}',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts
index 9d2d06494d..7c50a77570 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts
@@ -5,7 +5,7 @@ import { ActiveVariant } from '../workspace-context/workspace-split-view-manager
 import { UmbContextConsumerController, UmbContextProviderController, UmbContextToken } from '@umbraco-cms/context-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { ClassState, NumberState, ObjectState, UmbObserverController } from '@umbraco-cms/observable-api';
-import { DocumentVariantModel } from '@umbraco-cms/backend-api';
+import { DocumentVariantResponseModel } from '@umbraco-cms/backend-api';
 
 //type EntityType = DocumentModel;
 
@@ -20,7 +20,7 @@ export class UmbWorkspaceVariantContext {
 	#index = new NumberState(undefined);
 	index = this.#index.asObservable();
 
-	#currentVariant = new ObjectState<DocumentVariantModel | undefined>(undefined);
+	#currentVariant = new ObjectState<DocumentVariantResponseModel | undefined>(undefined);
 	currentVariant = this.#currentVariant.asObservable();
 
 	name = this.#currentVariant.getObservablePart((x) => x?.name);
@@ -49,7 +49,7 @@ export class UmbWorkspaceVariantContext {
 		});
 	}
 
-	public switchVariant(variant: DocumentVariantModel) {
+	public switchVariant(variant: DocumentVariantResponseModel) {
 		const index = this.#index.value;
 		if (index === undefined) return;
 		this.#workspaceContext?.splitView.switchVariant(index, new UmbVariantId(variant));
@@ -61,7 +61,7 @@ export class UmbWorkspaceVariantContext {
 		this.#workspaceContext?.splitView.closeSplitView(index);
 	}
 
-	public openSplitView(variant: DocumentVariantModel) {
+	public openSplitView(variant: DocumentVariantResponseModel) {
 		this.#workspaceContext?.splitView.openSplitView(new UmbVariantId(variant));
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
index c46d39e441..17eecc2687 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
@@ -4,7 +4,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { UmbInputCheckboxListElement } from '../../../components/input-checkbox-list/input-checkbox-list.element';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-checkbox-list
@@ -23,7 +23,7 @@ export class UmbPropertyEditorUICheckboxListElement extends UmbLitElement implem
 	}
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const listData = config.find((x) => x.alias === 'items');
 
 		if (!listData) return;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts
index eb68421589..edd33f33d6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts
@@ -4,7 +4,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { UUIColorSwatchesEvent } from '@umbraco-ui/uui';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 import type { SwatchDetails } from '@umbraco-cms/models';
 
 /**
@@ -24,7 +24,7 @@ export class UmbPropertyEditorUIColorPickerElement extends UmbLitElement impleme
 	private _swatches: SwatchDetails[] = [];
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const useLabel = config.find((x) => x.alias === 'useLabel');
 		if (useLabel) this._showLabels = useLabel.value;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
index 96bb3ccbd2..dafc9c6cd3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
@@ -4,7 +4,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { UUIColorPickerChangeEvent } from '@umbraco-ui/uui';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-eye-dropper
@@ -23,7 +23,7 @@ export class UmbPropertyEditorUIEyeDropperElement extends UmbLitElement implemen
 	private _swatches: string[] = [];
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const showAlpha = config.find((x) => x.alias === 'showAlpha');
 		if (showAlpha) this._opacity = showAlpha.value;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
index a4228b08eb..680ce17e96 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts
@@ -3,7 +3,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { UmbInputMediaPickerElement } from '../../../../../backoffice/shared/components/input-media-picker/input-media-picker.element';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-media-picker
@@ -21,7 +21,7 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme
 	}
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const validationLimit = config.find((x) => x.alias === 'validationLimit');
 		if (!validationLimit) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
index 1d74448439..f770c86d23 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
@@ -6,7 +6,7 @@ import { UmbInputMultiUrlPickerElement } from '../../../../shared/components/inp
 import { UmbLinkPickerLink } from '../../../../shared/modals/link-picker';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-multi-url-picker
@@ -20,7 +20,7 @@ export class UmbPropertyEditorUIMultiUrlPickerElement extends UmbLitElement impl
 	value: UmbLinkPickerLink[] = [];
 
 	@property({ type: Array, attribute: false })
-	public set config(config: DataTypePropertyModel[]) {
+	public set config(config: DataTypePropertyPresentationModel[]) {
 		const overlaySize = config.find((x) => x.alias === 'overlaySize');
 		if (overlaySize) this._overlaySize = overlaySize.value;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
index da082889df..2a7d1897b7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
@@ -5,7 +5,7 @@ import '../../../components/input-radio-button-list/input-radio-button-list.elem
 import type { UmbInputRadioButtonListElement } from '../../../components/input-radio-button-list/input-radio-button-list.element';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-radio-button-list
@@ -24,7 +24,7 @@ export class UmbPropertyEditorUIRadioButtonListElement extends UmbLitElement imp
 	}
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const listData = config.find((x) => x.alias === 'items');
 
 		if (!listData) return;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts
index 6e81051161..b6e38081fe 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts
@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import UmbInputSliderElement from '../../../../shared/components/input-slider/input-slider.element';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-slider
@@ -38,7 +38,7 @@ export class UmbPropertyEditorUISliderElement extends UmbLitElement implements U
 	_max?: number;
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const enableRange = config.find((x) => x.alias === 'enableRange');
 		if (enableRange) this._enableRange = enableRange.value as boolean;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
index 7c942602c3..42f49b8b7b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts
@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { UmbInputToggleElement } from '../../../components/input-toggle/input-toggle.element';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-property-editor-ui-toggle
@@ -26,7 +26,7 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U
 	_showLabels?: boolean;
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const defaultValue = config.find((x) => x.alias === 'default');
 		if (defaultValue) this.value = defaultValue.value as boolean;
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/template.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/template.handlers.ts
index 6b159c625e..38bb5d16cb 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/template.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/template.handlers.ts
@@ -1,7 +1,7 @@
 import { rest } from 'msw';
 import { umbTemplateData } from '../data/template.data';
 import { umbracoPath } from '@umbraco-cms/utils';
-import { TemplateCreateModel, TemplateUpdateModel } from '@umbraco-cms/backend-api';
+import { TemplateModelBaseModel } from '@umbraco-cms/backend-api';
 
 // TODO: add schema
 export const handlers = [
@@ -42,7 +42,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(response));
 	}),
 
-	rest.put<TemplateUpdateModel>(umbracoPath('/template/:key'), async (req, res, ctx) => {
+	rest.put<TemplateModelBaseModel>(umbracoPath('/template/:key'), async (req, res, ctx) => {
 		const key = req.params.key as string;
 		const data = await req.json();
 		if (!key) return;
@@ -51,7 +51,7 @@ export const handlers = [
 		return res(ctx.status(200));
 	}),
 
-	rest.post<TemplateCreateModel>(umbracoPath('/template'), async (req, res, ctx) => {
+	rest.post<TemplateModelBaseModel>(umbracoPath('/template'), async (req, res, ctx) => {
 		const data = await req.json();
 		if (!data) return;
 

From e7961af9d373fbbc61bad98a1bc1cd35098301f0 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 16 Mar 2023 18:02:40 +1000
Subject: [PATCH 2/2] fixes model changes

---
 .../e2e/installer.spec.ts                     |  4 +-
 .../e2e/upgrader.spec.ts                      |  4 +-
 .../libs/models/index.ts                      | 24 ++---
 .../libs/property-editor/index.ts             |  4 +-
 .../repository-tree-data-source.interface.ts  |  8 +-
 .../repository/tree-repository.interface.ts   | 20 ++---
 .../libs/store/tree-store-base.ts             |  8 +-
 .../dashboard-redirect-management.element.ts  |  8 +-
 .../repository/document-type.repository.ts    |  4 +-
 .../repository/document-type.store.ts         | 10 +--
 .../sources/document-type.server.data.ts      | 16 ++--
 .../document-type-workspace.context.ts        |  4 +-
 .../document-type-workspace.element.ts        |  4 +-
 ...space-view-document-type-design.element.ts |  4 +-
 .../document-table-collection-view.element.ts |  8 +-
 .../repository/document.repository.ts         |  4 +-
 .../documents/repository/document.store.ts    | 10 +--
 .../sources/document.server.data.ts           | 16 ++--
 .../documents/repository/sources/index.ts     |  6 +-
 .../workspace/document-workspace.context.ts   |  4 +-
 .../workspace/document-workspace.element.ts   |  6 +-
 ...-workspace-view-edit-properties.element.ts |  8 +-
 ...ocument-workspace-view-edit-tab.element.ts |  8 +-
 .../document-workspace-view-edit.element.ts   |  4 +-
 .../media/repository/media.tree.store.ts      |  4 +-
 .../members/repository/sources/index.ts       |  6 +-
 .../workspace-package-builder.element.ts      |  8 +-
 .../packages-created-overview.element.ts      | 10 +--
 .../packages/repository/package.store.ts      |  6 +-
 .../cultures/repository/sources/index.ts      |  4 +-
 .../modal-views/fields-viewer.element.ts      |  4 +-
 .../views/section-view-examine-indexers.ts    |  4 +-
 .../views/section-view-examine-overview.ts    |  8 +-
 .../views/section-view-examine-searchers.ts   |  8 +-
 .../dashboard-health-check.element.ts         |  4 +-
 .../health-check/health-check.context.ts      | 10 ++-
 .../views/health-check-action.element.ts      |  4 +-
 ...health-check-group-box-overview.element.ts |  4 +-
 .../views/health-check-group.element.ts       | 14 +--
 .../dashboard-models-builder.element.ts       |  4 +-
 .../telemetry/dashboard-telemetry.element.ts  |  4 +-
 .../repository/data-type.repository.ts        |  4 +-
 .../data-types/repository/data-type.store.ts  | 10 +--
 .../sources/data-type.server.data.ts          | 27 +++---
 .../workspace/data-type-workspace.context.ts  | 10 +--
 .../data-type-workspace-view-edit.element.ts  |  8 +-
 .../workspace-view-data-type-info.element.ts  |  4 +-
 .../app-language-select.element.ts            |  6 +-
 .../app-language.context.ts                   |  6 +-
 .../languages/modals/language-picker/index.ts |  4 +-
 .../language-picker-modal.element.ts          |  6 +-
 .../repository/language.repository.ts         |  6 +-
 .../languages/repository/language.store.ts    |  6 +-
 .../languages/repository/sources/index.ts     | 12 +--
 .../sources/language.server.data.ts           | 12 +--
 ...root-table-delete-column-layout.element.ts |  4 +-
 .../language-root-workspace.element.ts        |  4 +-
 .../language/language-workspace.context.ts    |  4 +-
 .../language/language-workspace.element.ts    |  4 +-
 .../edit-language-workspace-view.element.ts   |  6 +-
 .../logviewer/repository/sources/index.ts     | 26 +++---
 .../sources/log-viewer.server.data.ts         |  4 +-
 .../logviewer/workspace/logviewer.context.ts  | 20 ++---
 .../log-viewer-log-level-overview.element.ts  |  4 +-
 .../log-viewer-log-types-chart.element.ts     |  5 +-
 ...ewer-message-templates-overview.element.ts |  6 +-
 ...-viewer-saved-searches-overview.element.ts |  6 +-
 .../overview/log-overview-view.element.ts     |  4 +-
 .../components/log-viewer-message.element.ts  |  6 +-
 .../log-viewer-messages-list.element.ts       |  4 +-
 .../log-viewer-search-input.element.ts        |  4 +-
 .../shared/collection/collection.context.ts   |  8 +-
 .../dashboard-collection.element.ts           |  4 +-
 .../collection-view-media-grid.element.ts     | 16 ++--
 .../collection-view-media-table.element.ts    |  4 +-
 .../input-culture-select.element.ts           |  4 +-
 .../input-document-picker.element.ts          | 12 +--
 .../input-language-picker.element.ts          | 12 +--
 .../input-media-picker.element.ts             | 12 +--
 .../property-type-based-property.element.ts   | 14 +--
 .../variant-selector.element.ts               |  8 +-
 .../variantable-property.element.ts           |  8 +-
 .../workspace-property.context.ts             |  4 +-
 .../workspace-property.element.ts             |  4 +-
 .../workspace-view-collection.element.ts      |  4 +-
 .../workspace-view-content-info.element.ts    |  6 +-
 .../entity-manager-controller.ts              |  4 +-
 ...-invariantable-entity-context.interface.ts |  4 +-
 ...kspace-property-structure-manager.class.ts | 14 +--
 ...space-variable-entity-context.interface.ts |  8 +-
 ...perty-editor-ui-document-picker.element.ts |  4 +-
 .../templates/repository/sources/index.ts     |  8 +-
 .../sources/template.detail.server.data.ts    | 16 ++--
 .../repository/template.repository.ts         |  8 +-
 .../templates/repository/template.store.ts    |  6 +-
 .../workspace/template-workspace.context.ts   |  4 +-
 ...ashboard-translation-dictionary.element.ts | 11 +--
 .../import-dictionary-modal-layout.element.ts |  4 +-
 .../sources/dictionary.detail.server.data.ts  |  4 +-
 ...ictionary.details.server.data.interface.ts | 20 ++---
 .../workspace-view-dictionary-edit.element.ts |  8 +-
 .../src/core/mocks/data/culture.data.ts       |  6 +-
 .../src/core/mocks/data/data-type.data.ts     | 88 +++++++++----------
 .../src/core/mocks/data/dictionary.data.ts    |  8 +-
 .../src/core/mocks/data/document-type.data.ts | 16 ++--
 .../src/core/mocks/data/document.data.ts      | 75 ++++++++++++++--
 .../src/core/mocks/data/examine.data.ts       | 10 +--
 .../src/core/mocks/data/health-check.data.ts  |  8 +-
 .../src/core/mocks/data/languages.data.ts     | 16 ++--
 .../src/core/mocks/data/log-viewer.data.ts    | 24 ++---
 .../src/core/mocks/data/logs.data.ts          |  4 +-
 .../src/core/mocks/data/media-type.data.ts    |  8 +-
 .../src/core/mocks/data/media.data.ts         |  8 +-
 .../src/core/mocks/data/member-group.data.ts  |  8 +-
 .../src/core/mocks/data/member-type.data.ts   |  8 +-
 .../src/core/mocks/data/member.data.ts        |  8 +-
 .../src/core/mocks/data/template.data.ts      | 28 +++---
 .../src/core/mocks/data/utils.ts              | 24 ++---
 .../core/mocks/domains/dictionary.handlers.ts |  6 +-
 .../mocks/domains/document-type.handlers.ts   |  6 +-
 .../core/mocks/domains/document.handlers.ts   |  4 +-
 .../domains/examine-management.handlers.ts    | 10 +--
 .../mocks/domains/health-check.handlers.ts    | 22 ++---
 .../core/mocks/domains/install.handlers.ts    | 12 +--
 .../core/mocks/domains/language.handlers.ts   |  6 +-
 .../core/mocks/domains/log-viewer.handlers.ts |  4 +-
 .../mocks/domains/modelsbuilder.handlers.ts   | 10 +--
 .../core/mocks/domains/package.handlers.ts    | 24 ++---
 .../domains/performance-profiling.handlers.ts |  4 +-
 .../domains/redirect-management.handlers.ts   | 30 +++----
 .../src/core/mocks/domains/server.handlers.ts | 10 +--
 .../core/mocks/domains/telemetry.handlers.ts  | 10 +--
 .../core/mocks/domains/upgrade.handlers.ts    |  4 +-
 .../consent/installer-consent.element.ts      |  6 +-
 .../database/installer-database.element.ts    | 20 ++---
 .../database/installer-database.stories.ts    |  4 +-
 .../src/installer/installer.context.ts        | 12 +--
 .../src/upgrader/upgrader-view.element.ts     |  4 +-
 .../src/upgrader/upgrader.element.ts          |  4 +-
 139 files changed, 696 insertions(+), 640 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
index 82ff532414..1de975d7c8 100644
--- a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
@@ -1,7 +1,7 @@
 import { rest } from 'msw';
 
 import { umbracoPath } from '@umbraco-cms/utils';
-import { ProblemDetailsModel, RuntimeLevelModel, ServerStatusModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, RuntimeLevelModel, ServerStatusResponseModel } from '@umbraco-cms/backend-api';
 import { expect, test } from './test';
 
 test.describe('installer tests', () => {
@@ -12,7 +12,7 @@ test.describe('installer tests', () => {
 				return res(
 					// Respond with a 200 status code
 					ctx.status(200),
-					ctx.json<ServerStatusModel>({
+					ctx.json<ServerStatusResponseModel>({
 						serverStatus: RuntimeLevelModel.INSTALL,
 					})
 				);
diff --git a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
index debb44f6cd..646f1811b5 100644
--- a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
+++ b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
@@ -1,6 +1,6 @@
 import { rest } from 'msw';
 import { umbracoPath } from '@umbraco-cms/utils';
-import { ProblemDetailsModel, RuntimeLevelModel, ServerStatusModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, RuntimeLevelModel, ServerStatusResponseModel } from '@umbraco-cms/backend-api';
 import { expect, test } from './test';
 
 test.describe('upgrader tests', () => {
@@ -11,7 +11,7 @@ test.describe('upgrader tests', () => {
 				return res(
 					// Respond with a 200 status code
 					ctx.status(200),
-					ctx.json<ServerStatusModel>({
+					ctx.json<ServerStatusResponseModel>({
 						serverStatus: RuntimeLevelModel.UPGRADE,
 					})
 				);
diff --git a/src/Umbraco.Web.UI.Client/libs/models/index.ts b/src/Umbraco.Web.UI.Client/libs/models/index.ts
index 6a677de13d..9a0da3170f 100644
--- a/src/Umbraco.Web.UI.Client/libs/models/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/models/index.ts
@@ -1,9 +1,9 @@
 import {
-	ContentTreeItemModel,
+	ContentTreeItemResponseModel,
 	DictionaryItemTranslationModel,
-	EntityTreeItemModel,
-	FolderTreeItemModel,
-	PackageManifestModel,
+	EntityTreeItemResponseModel,
+	FolderTreeItemResponseModel,
+	PackageManifestResponseModel,
 	ProblemDetailsModel,
 } from '@umbraco-cms/backend-api';
 
@@ -26,7 +26,7 @@ export interface Entity {
 	parentKey: string | null;
 }
 
-export interface ContentDetails extends ContentTreeItemModel {
+export interface ContentDetails extends ContentTreeItemResponseModel {
 	isTrashed: boolean; // TODO: remove only temp part of refactor
 	properties: Array<ContentProperty>;
 	//data: Array<ContentPropertyData>;
@@ -80,7 +80,7 @@ export interface DataTypeProperty {
 */
 
 // TODO: Make sure Entity Type/interface.
-export interface MemberTypeDetails extends EntityTreeItemModel {
+export interface MemberTypeDetails extends EntityTreeItemResponseModel {
 	key: string; // TODO: Remove this when the backend is fixed
 	alias: string;
 	properties: [];
@@ -100,7 +100,7 @@ export interface ContentPropertyData {
 }
 
 // Media
-export interface MediaDetails extends ContentTreeItemModel {
+export interface MediaDetails extends ContentTreeItemResponseModel {
 	key: string; // TODO: Remove this when the backend is fixed
 	isTrashed: boolean; // TODO: remove only temp part of refactor
 	properties: Array<ContentProperty>;
@@ -111,23 +111,23 @@ export interface MediaDetails extends ContentTreeItemModel {
 
 // Media Types
 
-export interface MediaTypeDetails extends FolderTreeItemModel {
+export interface MediaTypeDetails extends FolderTreeItemResponseModel {
 	key: string; // TODO: Remove this when the backend is fixed
 	alias: string;
 	properties: [];
 }
 
 // Member Groups
-export interface MemberGroupDetails extends EntityTreeItemModel {
+export interface MemberGroupDetails extends EntityTreeItemResponseModel {
 	key: string; // TODO: Remove this when the backend is fixed
 }
 
-export interface MemberDetails extends EntityTreeItemModel {
+export interface MemberDetails extends EntityTreeItemResponseModel {
 	key: string; // TODO: Remove this when the backend is fixed
 }
 
 // Dictionary
-export interface DictionaryDetails extends EntityTreeItemModel {
+export interface DictionaryDetails extends EntityTreeItemResponseModel {
 	key: string; // TODO: Remove this when the backend is fixed
 	translations: DictionaryItemTranslationModel[];
 }
@@ -153,7 +153,7 @@ export interface SwatchDetails {
 	value: string;
 }
 
-export type UmbPackage = PackageManifestModel;
+export type UmbPackage = PackageManifestResponseModel;
 
 export type PackageManifestResponse = UmbPackage[];
 
diff --git a/src/Umbraco.Web.UI.Client/libs/property-editor/index.ts b/src/Umbraco.Web.UI.Client/libs/property-editor/index.ts
index e2a222e019..61b6a23c04 100644
--- a/src/Umbraco.Web.UI.Client/libs/property-editor/index.ts
+++ b/src/Umbraco.Web.UI.Client/libs/property-editor/index.ts
@@ -1,6 +1,6 @@
-import { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 export interface UmbPropertyEditorElement extends HTMLElement {
 	value: unknown;
-	config: DataTypePropertyModel[];
+	config: DataTypePropertyPresentationModel[];
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts b/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts
index aff4ec4451..7e51e5a566 100644
--- a/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts
+++ b/src/Umbraco.Web.UI.Client/libs/repository/repository-tree-data-source.interface.ts
@@ -1,8 +1,8 @@
-import { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { DataSourceResponse } from '@umbraco-cms/models';
 
 export interface RepositoryTreeDataSource {
-	getRootItems(): Promise<DataSourceResponse<PagedEntityTreeItemModel>>;
-	getChildrenOf(parentKey: string): Promise<DataSourceResponse<PagedEntityTreeItemModel>>;
-	getItems(key: Array<string>): Promise<DataSourceResponse<EntityTreeItemModel[]>>;
+	getRootItems(): Promise<DataSourceResponse<PagedEntityTreeItemResponseModel>>;
+	getChildrenOf(parentKey: string): Promise<DataSourceResponse<PagedEntityTreeItemResponseModel>>;
+	getItems(key: Array<string>): Promise<DataSourceResponse<EntityTreeItemResponseModel[]>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/repository/tree-repository.interface.ts b/src/Umbraco.Web.UI.Client/libs/repository/tree-repository.interface.ts
index 2ef082005f..b702adaaec 100644
--- a/src/Umbraco.Web.UI.Client/libs/repository/tree-repository.interface.ts
+++ b/src/Umbraco.Web.UI.Client/libs/repository/tree-repository.interface.ts
@@ -1,24 +1,24 @@
 import type { Observable } from 'rxjs';
-import { EntityTreeItemModel, PagedEntityTreeItemModel, ProblemDetailsModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, ProblemDetailsModel } from '@umbraco-cms/backend-api';
 
 export interface UmbTreeRepository {
 	requestRootTreeItems: () => Promise<{
-		data: PagedEntityTreeItemModel | undefined;
+		data: PagedEntityTreeItemResponseModel | undefined;
 		error: ProblemDetailsModel | undefined;
-		asObservable?: () => Observable<EntityTreeItemModel[]>;
+		asObservable?: () => Observable<EntityTreeItemResponseModel[]>;
 	}>;
 	requestTreeItemsOf: (parentKey: string | null) => Promise<{
-		data: PagedEntityTreeItemModel | undefined;
+		data: PagedEntityTreeItemResponseModel | undefined;
 		error: ProblemDetailsModel | undefined;
-		asObservable?: () => Observable<EntityTreeItemModel[]>;
+		asObservable?: () => Observable<EntityTreeItemResponseModel[]>;
 	}>;
 	requestTreeItems: (keys: string[]) => Promise<{
-		data: Array<EntityTreeItemModel> | undefined;
+		data: Array<EntityTreeItemResponseModel> | undefined;
 		error: ProblemDetailsModel | undefined;
-		asObservable?: () => Observable<EntityTreeItemModel[]>;
+		asObservable?: () => Observable<EntityTreeItemResponseModel[]>;
 	}>;
 
-	rootTreeItems: () => Promise<Observable<EntityTreeItemModel[]>>;
-	treeItemsOf: (parentKey: string | null) => Promise<Observable<EntityTreeItemModel[]>>;
-	treeItems: (keys: string[]) => Promise<Observable<EntityTreeItemModel[]>>;
+	rootTreeItems: () => Promise<Observable<EntityTreeItemResponseModel[]>>;
+	treeItemsOf: (parentKey: string | null) => Promise<Observable<EntityTreeItemResponseModel[]>>;
+	treeItems: (keys: string[]) => Promise<Observable<EntityTreeItemResponseModel[]>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/libs/store/tree-store-base.ts b/src/Umbraco.Web.UI.Client/libs/store/tree-store-base.ts
index feab80cb01..0f199a1f3b 100644
--- a/src/Umbraco.Web.UI.Client/libs/store/tree-store-base.ts
+++ b/src/Umbraco.Web.UI.Client/libs/store/tree-store-base.ts
@@ -1,4 +1,4 @@
-import { EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import { ArrayState, partialUpdateFrozenArray } from '@umbraco-cms/observable-api';
 import { UmbStoreBase } from '@umbraco-cms/store';
 
@@ -10,14 +10,14 @@ import { UmbStoreBase } from '@umbraco-cms/store';
  */
 // TODO: consider if tree store could be turned into a general EntityTreeStore class?
 export class UmbTreeStoreBase extends UmbStoreBase {
-	#data = new ArrayState<EntityTreeItemModel>([], (x) => x.key);
+	#data = new ArrayState<EntityTreeItemResponseModel>([], (x) => x.key);
 
 	/**
 	 * Appends items to the store
 	 * @param {Array<EntityTreeItemModel>} items
 	 * @memberof UmbTreeStoreBase
 	 */
-	appendItems(items: Array<EntityTreeItemModel>) {
+	appendItems(items: Array<EntityTreeItemResponseModel>) {
 		this.#data.append(items);
 	}
 
@@ -27,7 +27,7 @@ export class UmbTreeStoreBase extends UmbStoreBase {
 	 * @param {Partial<EntityTreeItemModel>} data
 	 * @memberof UmbTreeStoreBase
 	 */
-	updateItem(key: string, data: Partial<EntityTreeItemModel>) {
+	updateItem(key: string, data: Partial<EntityTreeItemResponseModel>) {
 		this.#data.next(partialUpdateFrozenArray(this.#data.getValue(), data, (entry) => entry.key === key));
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
index cff6bf9108..45e447f840 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
@@ -5,7 +5,7 @@ import { UUIButtonState, UUIPaginationElement, UUIPaginationEvent } from '@umbra
 import { UMB_CONFIRM_MODAL_TOKEN } from '../../../shared/modals/confirm';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { RedirectManagementResource, RedirectStatusModel, RedirectUrlModel } from '@umbraco-cms/backend-api';
+import { RedirectManagementResource, RedirectStatusModel, RedirectUrlResponseModel } from '@umbraco-cms/backend-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
 @customElement('umb-dashboard-redirect-management')
@@ -83,7 +83,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
 	itemsPerPage = 20;
 
 	@state()
-	private _redirectData?: RedirectUrlModel[];
+	private _redirectData?: RedirectUrlResponseModel[];
 
 	@state()
 	private _trackerStatus = true;
@@ -126,7 +126,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
 		if (data && data.status) this._trackerStatus = data.status === RedirectStatusModel.ENABLED ? true : false;
 	}
 
-	private _removeRedirectHandler(data: RedirectUrlModel) {
+	private _removeRedirectHandler(data: RedirectUrlResponseModel) {
 		const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
 			headline: 'Delete',
 			content: html`
@@ -145,7 +145,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
 		});
 	}
 
-	private async _removeRedirect(r: RedirectUrlModel) {
+	private async _removeRedirect(r: RedirectUrlResponseModel) {
 		if (!r.key) return;
 		const res = await tryExecuteAndNotify(
 			this,
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.repository.ts
index 683880d36e..e8792df3ea 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.repository.ts
@@ -5,12 +5,12 @@ import { UmbDocumentTypeTreeStore, UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT_TOKEN }
 import { UmbDocumentTypeStore, UMB_DOCUMENT_TYPE_STORE_CONTEXT_TOKEN } from './document-type.store';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextConsumerController } from '@umbraco-cms/context-api';
-import { ProblemDetailsModel, DocumentTypeModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbTreeRepository } from 'libs/repository/tree-repository.interface';
 import { UmbDetailRepository } from '@umbraco-cms/repository';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/notification';
 
-type ItemType = DocumentTypeModel;
+type ItemType = DocumentTypeResponseModel;
 
 // Move to documentation / JSdoc
 /* We need to create a new instance of the repository from within the element context. We want the notifications to be displayed in the right context. */
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.store.ts
index 7b38c47233..b1ff1f9bea 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/document-type.store.ts
@@ -1,4 +1,4 @@
-import { DocumentTypeModel } from '@umbraco-cms/backend-api';
+import { DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 import { UmbContextToken } from '@umbraco-cms/context-api';
 import { ArrayState } from '@umbraco-cms/observable-api';
 import { UmbStoreBase } from '@umbraco-cms/store';
@@ -11,7 +11,7 @@ import { UmbControllerHostInterface } from '@umbraco-cms/controller';
  * @description - Data Store for Document Types
  */
 export class UmbDocumentTypeStore extends UmbStoreBase {
-	#data = new ArrayState<DocumentTypeModel>([], (x) => x.key);
+	#data = new ArrayState<DocumentTypeResponseModel>([], (x) => x.key);
 
 	/**
 	 * Creates an instance of UmbDocumentTypeStore.
@@ -27,7 +27,7 @@ export class UmbDocumentTypeStore extends UmbStoreBase {
 	 * @param {DocumentTypeModel} document
 	 * @memberof UmbDocumentTypeStore
 	 */
-	append(document: DocumentTypeModel) {
+	append(document: DocumentTypeResponseModel) {
 		this.#data.append([document]);
 	}
 
@@ -36,7 +36,7 @@ export class UmbDocumentTypeStore extends UmbStoreBase {
 	 * @param {DocumentTypeModel} document
 	 * @memberof UmbDocumentTypeStore
 	 */
-	byKey(key: DocumentTypeModel['key']) {
+	byKey(key: DocumentTypeResponseModel['key']) {
 		return this.#data.getObservablePart((x) => x.find((y) => y.key === key));
 	}
 
@@ -45,7 +45,7 @@ export class UmbDocumentTypeStore extends UmbStoreBase {
 	 * @param {string[]} uniques
 	 * @memberof UmbDocumentTypeStore
 	 */
-	remove(uniques: Array<DocumentTypeModel['key']>) {
+	remove(uniques: Array<DocumentTypeResponseModel['key']>) {
 		this.#data.remove(uniques);
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts
index 5f1a282ed4..52439fe784 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts
@@ -1,5 +1,5 @@
 import { RepositoryDetailDataSource } from '@umbraco-cms/repository';
-import { DocumentTypeResource, ProblemDetailsModel, DocumentTypeModel } from '@umbraco-cms/backend-api';
+import { DocumentTypeResource, ProblemDetailsModel, DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -9,7 +9,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/resources';
  * @class UmbDocumentTypeServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSource<DocumentTypeModel> {
+export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSource<DocumentTypeResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**
@@ -48,7 +48,7 @@ export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSour
 	 * @memberof UmbDocumentTypeServerDataSource
 	 */
 	async createScaffold(parentKey: string | null) {
-		const data: DocumentTypeModel = {
+		const data: DocumentTypeResponseModel = {
 			properties: [],
 		};
 
@@ -61,7 +61,7 @@ export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSour
 	 * @return {*}
 	 * @memberof UmbDocumentTypeServerDataSource
 	 */
-	async insert(document: DocumentTypeModel) {
+	async insert(document: DocumentTypeResponseModel) {
 		if (!document.key) {
 			//const error: ProblemDetails = { title: 'Document key is missing' };
 			return Promise.reject();
@@ -78,7 +78,7 @@ export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSour
 		}
 		//return tryExecuteAndNotify(this.#host, DocumentTypeResource.postDocument(payload));
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentTypeModel>(
+		return tryExecuteAndNotify<DocumentTypeResponseModel>(
 			this.#host,
 			fetch('/umbraco/management/api/v1/document-type', {
 				method: 'POST',
@@ -97,7 +97,7 @@ export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSour
 	 * @memberof UmbDocumentTypeServerDataSource
 	 */
 	// TODO: Error mistake in this:
-	async update(document: DocumentTypeModel) {
+	async update(document: DocumentTypeResponseModel) {
 		if (!document.key) {
 			const error: ProblemDetailsModel = { title: 'Document key is missing' };
 			return { error };
@@ -114,7 +114,7 @@ export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSour
 		}
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentTypeModel>(
+		return tryExecuteAndNotify<DocumentTypeResponseModel>(
 			this.#host,
 			fetch(`/umbraco/management/api/v1/document-type/${document.key}`, {
 				method: 'PUT',
@@ -139,7 +139,7 @@ export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSour
 		}
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentTypeModel>(
+		return tryExecuteAndNotify<DocumentTypeResponseModel>(
 			this.#host,
 			fetch(`/umbraco/management/api/v1/document-type/${key}`, {
 				method: 'DELETE',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.context.ts
index 4fcef85092..638545389c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.context.ts
@@ -1,11 +1,11 @@
 import { UmbWorkspaceContext } from '../../../shared/components/workspace/workspace-context/workspace-context';
 import { UmbWorkspaceEntityContextInterface } from '../../../shared/components/workspace/workspace-context/workspace-entity-context.interface';
 import { UmbDocumentTypeRepository } from '../repository/document-type.repository';
-import type { DocumentTypeModel } from '@umbraco-cms/backend-api';
+import type { DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { ObjectState } from '@umbraco-cms/observable-api';
 
-type EntityType = DocumentTypeModel;
+type EntityType = DocumentTypeResponseModel;
 export class UmbWorkspaceDocumentTypeContext
 	extends UmbWorkspaceContext<UmbDocumentTypeRepository>
 	implements UmbWorkspaceEntityContextInterface<EntityType | undefined>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts
index 5e5a660c77..c2faf5e302 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts
@@ -5,7 +5,7 @@ import { customElement, state } from 'lit/decorators.js';
 import type { UmbWorkspaceEntityElement } from '../../../shared/components/workspace/workspace-entity-element.interface';
 import { UMB_ICON_PICKER_MODAL_TOKEN } from '../../../shared/modals/icon-picker';
 import { UmbWorkspaceDocumentTypeContext } from './document-type-workspace.context';
-import type { DocumentTypeModel } from '@umbraco-cms/backend-api';
+import type { DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 
@@ -50,7 +50,7 @@ export class UmbDocumentTypeWorkspaceElement extends UmbLitElement implements Um
 	private _workspaceContext: UmbWorkspaceDocumentTypeContext = new UmbWorkspaceDocumentTypeContext(this);
 
 	@state()
-	private _documentType?: DocumentTypeModel;
+	private _documentType?: DocumentTypeResponseModel;
 
 	private _modalContext?: UmbModalContext;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts
index 3e48456f2d..2e453ded63 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbWorkspaceDocumentTypeContext } from '../../document-type-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DocumentTypeModel } from '@umbraco-cms/backend-api';
+import type { DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 import '../../../../../shared/property-creator/property-creator.element.ts';
 
 @customElement('umb-workspace-view-document-type-design')
@@ -20,7 +20,7 @@ export class UmbWorkspaceViewDocumentTypeDesignElement extends UmbLitElement {
 	];
 
 	@state()
-	_documentType?: DocumentTypeModel;
+	_documentType?: DocumentTypeResponseModel;
 
 	private _workspaceContext?: UmbWorkspaceDocumentTypeContext;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts
index e669b51c40..18c642313e 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts
@@ -15,11 +15,11 @@ import {
 	UmbTableSelectedEvent,
 } from '../../../../../shared/components/table';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DocumentTreeItemModel, EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { DocumentTreeItemResponseModel, EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 import './column-layouts/document-table-actions-column-layout.element';
 
-type EntityType = DocumentTreeItemModel;
+type EntityType = DocumentTreeItemResponseModel;
 
 @customElement('umb-document-table-collection-view')
 export class UmbDocumentTableCollectionViewElement extends UmbLitElement {
@@ -42,7 +42,7 @@ export class UmbDocumentTableCollectionViewElement extends UmbLitElement {
 	];
 
 	@state()
-	private _items?: Array<EntityTreeItemModel>;
+	private _items?: Array<EntityTreeItemResponseModel>;
 
 	@state()
 	private _tableConfig: UmbTableConfig = {
@@ -94,7 +94,7 @@ export class UmbDocumentTableCollectionViewElement extends UmbLitElement {
 		});
 	}
 
-	private _createTableItems(items: Array<EntityTreeItemModel>) {
+	private _createTableItems(items: Array<EntityTreeItemResponseModel>) {
 		this._tableItems = items.map((item) => {
 			// TODO: use unique instead of key
 			if (!item.key) throw new Error('Item key is missing.');
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.repository.ts
index 104b9092df..6d514ccc28 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.repository.ts
@@ -5,12 +5,12 @@ import { UmbDocumentStore, UMB_DOCUMENT_STORE_CONTEXT_TOKEN } from './document.s
 import { UmbDocumentServerDataSource } from './sources/document.server.data';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextConsumerController } from '@umbraco-cms/context-api';
-import { ProblemDetailsModel, DocumentModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, DocumentResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbTreeRepository } from 'libs/repository/tree-repository.interface';
 import { UmbDetailRepository } from '@umbraco-cms/repository';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/notification';
 
-type ItemType = DocumentModel;
+type ItemType = DocumentResponseModel;
 
 // Move to documentation / JSdoc
 /* We need to create a new instance of the repository from within the element context. We want the notifications to be displayed in the right context. */
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.store.ts
index 0dfd392794..2fb2a87fe4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/document.store.ts
@@ -1,4 +1,4 @@
-import { DocumentModel } from '@umbraco-cms/backend-api';
+import { DocumentResponseModel } from '@umbraco-cms/backend-api';
 import { UmbContextToken } from '@umbraco-cms/context-api';
 import { ArrayState } from '@umbraco-cms/observable-api';
 import { UmbStoreBase } from '@umbraco-cms/store';
@@ -11,7 +11,7 @@ import { UmbControllerHostInterface } from '@umbraco-cms/controller';
  * @description - Data Store for Template Details
  */
 export class UmbDocumentStore extends UmbStoreBase {
-	#data = new ArrayState<DocumentModel>([], (x) => x.key);
+	#data = new ArrayState<DocumentResponseModel>([], (x) => x.key);
 
 	/**
 	 * Creates an instance of UmbDocumentDetailStore.
@@ -27,7 +27,7 @@ export class UmbDocumentStore extends UmbStoreBase {
 	 * @param {DocumentDetails} document
 	 * @memberof UmbDocumentDetailStore
 	 */
-	append(document: DocumentModel) {
+	append(document: DocumentResponseModel) {
 		this.#data.append([document]);
 	}
 
@@ -36,7 +36,7 @@ export class UmbDocumentStore extends UmbStoreBase {
 	 * @param {DocumentModel} document
 	 * @memberof UmbDocumentStore
 	 */
-	byKey(key: DocumentModel['key']) {
+	byKey(key: DocumentResponseModel['key']) {
 		return this.#data.getObservablePart((x) => x.find((y) => y.key === key));
 	}
 
@@ -45,7 +45,7 @@ export class UmbDocumentStore extends UmbStoreBase {
 	 * @param {string[]} uniques
 	 * @memberof UmbDocumentDetailStore
 	 */
-	remove(uniques: Array<DocumentModel['key']>) {
+	remove(uniques: Array<DocumentResponseModel['key']>) {
 		this.#data.remove(uniques);
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts
index 5fe01e86d2..9f2cd5c191 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts
@@ -1,5 +1,5 @@
 import { RepositoryDetailDataSource } from '@umbraco-cms/repository';
-import { DocumentResource, ProblemDetailsModel, DocumentModel } from '@umbraco-cms/backend-api';
+import { DocumentResource, ProblemDetailsModel, DocumentResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -9,7 +9,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/resources';
  * @class UmbDocumentServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<DocumentModel> {
+export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<DocumentResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**
@@ -48,7 +48,7 @@ export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<D
 	 * @memberof UmbDocumentServerDataSource
 	 */
 	async createScaffold(parentKey: string | null) {
-		const data: DocumentModel = {
+		const data: DocumentResponseModel = {
 			values: [],
 			variants: [],
 		};
@@ -62,7 +62,7 @@ export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<D
 	 * @return {*}
 	 * @memberof UmbDocumentServerDataSource
 	 */
-	async insert(document: DocumentModel) {
+	async insert(document: DocumentResponseModel) {
 		if (!document.key) {
 			//const error: ProblemDetails = { title: 'Document key is missing' };
 			return Promise.reject();
@@ -79,7 +79,7 @@ export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<D
 		}
 		//return tryExecuteAndNotify(this.#host, DocumentResource.postDocument(payload));
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentModel>(
+		return tryExecuteAndNotify<DocumentResponseModel>(
 			this.#host,
 			fetch('/umbraco/management/api/v1/document/save', {
 				method: 'POST',
@@ -98,7 +98,7 @@ export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<D
 	 * @memberof UmbDocumentServerDataSource
 	 */
 	// TODO: Error mistake in this:
-	async update(document: DocumentModel) {
+	async update(document: DocumentResponseModel) {
 		if (!document.key) {
 			const error: ProblemDetailsModel = { title: 'Document key is missing' };
 			return { error };
@@ -115,7 +115,7 @@ export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<D
 		}
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentModel>(
+		return tryExecuteAndNotify<DocumentResponseModel>(
 			this.#host,
 			fetch('/umbraco/management/api/v1/document/save', {
 				method: 'POST',
@@ -140,7 +140,7 @@ export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<D
 		}
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DocumentModel>(
+		return tryExecuteAndNotify<DocumentResponseModel>(
 			this.#host,
 			fetch('/umbraco/management/api/v1/document/trash', {
 				method: 'POST',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts
index c7cc44fc92..04b7b1ee75 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts
@@ -1,7 +1,7 @@
-import { DocumentModel } from '@umbraco-cms/backend-api';
+import { DocumentResponseModel } from '@umbraco-cms/backend-api';
 import type { DataSourceResponse } from '@umbraco-cms/models';
 import { RepositoryDetailDataSource } from '@umbraco-cms/repository';
 
-export interface UmbDocumentDataSource extends RepositoryDetailDataSource<DocumentModel> {
-	trash(key: string): Promise<DataSourceResponse<DocumentModel>>;
+export interface UmbDocumentDataSource extends RepositoryDetailDataSource<DocumentResponseModel> {
+	trash(key: string): Promise<DataSourceResponse<DocumentResponseModel>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts
index f62c5943fc..52bb67d842 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts
@@ -5,14 +5,14 @@ import { UmbWorkspaceVariableEntityContextInterface } from '../../../shared/comp
 import { UmbVariantId } from '../../../shared/variants/variant-id.class';
 import { UmbWorkspacePropertyStructureManager } from '../../../shared/components/workspace/workspace-context/workspace-property-structure-manager.class';
 import { UmbWorkspaceSplitViewManager } from '../../../shared/components/workspace/workspace-context/workspace-split-view-manager.class';
-import type { DocumentModel } from '@umbraco-cms/backend-api';
+import type { DocumentResponseModel } from '@umbraco-cms/backend-api';
 import { partialUpdateFrozenArray, ObjectState, UmbObserverController } from '@umbraco-cms/observable-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
 // TODO: should this context be called DocumentDraft instead of workspace? or should the draft be part of this?
 // TODO: Should we have a DocumentStructureContext and maybe even a DocumentDraftContext?
 
-type EntityType = DocumentModel;
+type EntityType = DocumentResponseModel;
 export class UmbDocumentWorkspaceContext
 	extends UmbWorkspaceContext<UmbDocumentRepository>
 	implements UmbWorkspaceVariableEntityContextInterface<EntityType | undefined>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts
index d2f69c3f86..9dd5949e91 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts
@@ -9,7 +9,7 @@ import { UmbDocumentWorkspaceContext } from './document-workspace.context';
 import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split-view.element';
 import { UmbLitElement } from '@umbraco-cms/element';
 import '../../../shared/components/workspace/workspace-variant/workspace-variant.element';
-import { DocumentModel, VariantViewModelBaseModel } from '@umbraco-cms/backend-api';
+import { DocumentResponseModel, VariantModelBaseModel } from '@umbraco-cms/backend-api';
 import { UmbRouterSlotInitEvent } from '@umbraco-cms/router';
 
 @customElement('umb-document-workspace')
@@ -36,7 +36,7 @@ export class UmbDocumentWorkspaceElement extends UmbLitElement implements UmbWor
 	_routes?: Array<IRoute>;
 
 	@state()
-	_availableVariants: Array<VariantViewModelBaseModel> = [];
+	_availableVariants: Array<VariantModelBaseModel> = [];
 
 	@state()
 	_workspaceSplitViews: Array<ActiveVariant> = [];
@@ -63,7 +63,7 @@ export class UmbDocumentWorkspaceElement extends UmbLitElement implements UmbWor
 		this._gotDocumentData(data);
 	}
 
-	private _gotDocumentData(data: DocumentModel | undefined) {
+	private _gotDocumentData(data: DocumentResponseModel | undefined) {
 		if (data && data.variants && data.variants.length > 0) {
 			//this._defaultVariant = data.variants[0];
 			this._unique = data.key;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts
index 6bd3840d8a..e9bfd39eec 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts
@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentWorkspaceContext } from '../document-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DocumentTypePropertyTypeModel, PropertyTypeContainerViewModelBaseModel } from '@umbraco-cms/backend-api';
+import { DocumentTypePropertyTypeResponseModel, PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-document-workspace-view-edit-properties')
 export class UmbDocumentWorkspaceViewEditPropertiesElement extends UmbLitElement {
@@ -45,10 +45,10 @@ export class UmbDocumentWorkspaceViewEditPropertiesElement extends UmbLitElement
 	}
 
 	@state()
-	_groupContainers: Array<PropertyTypeContainerViewModelBaseModel> = [];
+	_groupContainers: Array<PropertyTypeContainerResponseModelBaseModel> = [];
 
 	@state()
-	_propertyStructure: Array<DocumentTypePropertyTypeModel> = [];
+	_propertyStructure: Array<DocumentTypePropertyTypeResponseModel> = [];
 
 	private _workspaceContext?: UmbDocumentWorkspaceContext;
 
@@ -81,7 +81,7 @@ export class UmbDocumentWorkspaceViewEditPropertiesElement extends UmbLitElement
 		);
 	}
 
-	private _observePropertyStructureOfGroup(group: PropertyTypeContainerViewModelBaseModel) {
+	private _observePropertyStructureOfGroup(group: PropertyTypeContainerResponseModelBaseModel) {
 		if (!this._workspaceContext || !group.key) return;
 
 		// TODO: Should be no need to update this observable if its already there.
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-tab.element.ts
index 9f1f88145d..8992495248 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-tab.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-tab.element.ts
@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentWorkspaceContext } from '../document-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { PropertyTypeContainerViewModelBaseModel } from '@umbraco-cms/backend-api';
+import { PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backend-api';
 import './document-workspace-view-edit-properties.element';
 
 @customElement('umb-document-workspace-view-edit-tab')
@@ -55,13 +55,13 @@ export class UmbDocumentWorkspaceViewEditTabElement extends UmbLitElement {
 	}
 
 	@state()
-	_tabContainers: PropertyTypeContainerViewModelBaseModel[] = [];
+	_tabContainers: PropertyTypeContainerResponseModelBaseModel[] = [];
 
 	@state()
 	_hasTabProperties = false;
 
 	@state()
-	_groups: Array<PropertyTypeContainerViewModelBaseModel> = [];
+	_groups: Array<PropertyTypeContainerResponseModelBaseModel> = [];
 
 	private _workspaceContext?: UmbDocumentWorkspaceContext;
 
@@ -134,7 +134,7 @@ export class UmbDocumentWorkspaceViewEditTabElement extends UmbLitElement {
 		);
 	}
 
-	private _insertGroupContainers = (groupContainers: PropertyTypeContainerViewModelBaseModel[]) => {
+	private _insertGroupContainers = (groupContainers: PropertyTypeContainerResponseModelBaseModel[]) => {
 		groupContainers.forEach((group) => {
 			if (group.name) {
 				if (!this._groups.find((x) => x.name === group.name)) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit.element.ts
index 6dfc9ca79b..36032110ec 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit.element.ts
@@ -5,7 +5,7 @@ import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentWorkspaceContext } from '../document-workspace.context';
 import type { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent, IRoute } from '@umbraco-cms/router';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { PropertyTypeContainerViewModelBaseModel } from '@umbraco-cms/backend-api';
+import { PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-document-workspace-view-edit')
 export class UmbDocumentWorkspaceViewEditElement extends UmbLitElement {
@@ -26,7 +26,7 @@ export class UmbDocumentWorkspaceViewEditElement extends UmbLitElement {
 	private _routes: IRoute[] = [];
 
 	@state()
-	_tabs: Array<PropertyTypeContainerViewModelBaseModel> = [];
+	_tabs: Array<PropertyTypeContainerResponseModelBaseModel> = [];
 
 	@state()
 	private _routerPath?: string;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.tree.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.tree.store.ts
index a070665602..9028802a8d 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.tree.store.ts
@@ -1,4 +1,4 @@
-import { EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import { UmbContextToken } from '@umbraco-cms/context-api';
 import { ArrayState } from '@umbraco-cms/observable-api';
 import { UmbTreeStoreBase } from '@umbraco-cms/store';
@@ -13,7 +13,7 @@ export const UMB_MEDIA_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbMediaTr
  * @description - Tree Data Store for Media
  */
 export class UmbMediaTreeStore extends UmbTreeStoreBase {
-	#data = new ArrayState<EntityTreeItemModel>([], (x) => x.key);
+	#data = new ArrayState<EntityTreeItemResponseModel>([], (x) => x.key);
 
 	/**
 	 * Creates an instance of UmbMediaTreeStore.
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts
index 66a63ad20d..8659bec685 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/repository/sources/index.ts
@@ -1,7 +1,7 @@
 import type { DataSourceResponse } from '@umbraco-cms/models';
-import type { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/backend-api';
+import type { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 export interface MemberTreeDataSource {
-	getRootItems(): Promise<DataSourceResponse<PagedEntityTreeItemModel>>;
-	getItems(key: Array<string>): Promise<DataSourceResponse<EntityTreeItemModel[]>>;
+	getRootItems(): Promise<DataSourceResponse<PagedEntityTreeItemResponseModel>>;
+	getItems(key: Array<string>): Promise<DataSourceResponse<EntityTreeItemResponseModel[]>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts
index 26b897a91b..4023dfd261 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts
@@ -7,7 +7,7 @@ import { UmbInputDocumentPickerElement } from '../../../shared/components/input-
 import { UmbInputMediaPickerElement } from '../../../shared/components/input-media-picker/input-media-picker.element';
 import { UmbInputLanguagePickerElement } from '../../../shared/components/input-language-picker/input-language-picker.element';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { PackageDefinitionModel, PackageResource } from '@umbraco-cms/backend-api';
+import { PackageDefinitionResponseModel, PackageResource } from '@umbraco-cms/backend-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/notification';
 
@@ -41,7 +41,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 	entityKey?: string;
 
 	@state()
-	private _package: PackageDefinitionModel = {};
+	private _package: PackageDefinitionResponseModel = {};
 
 	@query('#package-name-input')
 	private _packageNameInput!: UUIInputElement;
@@ -64,7 +64,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 		if (!this.entityKey) return;
 		const { data } = await tryExecuteAndNotify(this, PackageResource.getPackageCreatedByKey({ key: this.entityKey }));
 		if (!data) return;
-		this._package = data as PackageDefinitionModel;
+		this._package = data as PackageDefinitionResponseModel;
 	}
 
 	async #download() {
@@ -88,7 +88,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 			PackageResource.postPackageCreated({ requestBody: this._package })
 		);
 		if (!response.data || response.error) return;
-		this._package = response.data as PackageDefinitionModel;
+		this._package = response.data as PackageDefinitionResponseModel;
 		this.#navigateBack();
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts
index 5d85638acc..02af893cbd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts
@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UUIPaginationEvent } from '@umbraco-ui/uui';
 import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../shared/modals/confirm';
-import { PackageDefinitionModel, PackageResource } from '@umbraco-cms/backend-api';
+import { PackageDefinitionResponseModel, PackageResource } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
@@ -44,7 +44,7 @@ export class UmbPackagesCreatedOverviewElement extends UmbLitElement {
 	private _loading = true;
 
 	@state()
-	private _createdPackages: PackageDefinitionModel[] = [];
+	private _createdPackages: PackageDefinitionResponseModel[] = [];
 
 	@state()
 	private _currentPage = 1;
@@ -103,7 +103,7 @@ export class UmbPackagesCreatedOverviewElement extends UmbLitElement {
 		</uui-box>`;
 	}
 
-	#renderPackageItem(p: PackageDefinitionModel) {
+	#renderPackageItem(p: PackageDefinitionResponseModel) {
 		return html`<uui-ref-node-package name=${ifDefined(p.name)} @open="${() => this.#packageBuilder(p)}">
 			<uui-action-bar slot="actions">
 				<uui-button @click=${() => this.#deletePackage(p)} label="Delete package">
@@ -113,7 +113,7 @@ export class UmbPackagesCreatedOverviewElement extends UmbLitElement {
 		</uui-ref-node-package>`;
 	}
 
-	#packageBuilder(p: PackageDefinitionModel) {
+	#packageBuilder(p: PackageDefinitionResponseModel) {
 		if (!p.key) return;
 		window.history.pushState({}, '', `/section/packages/view/created/package-builder/${p.key}`);
 	}
@@ -133,7 +133,7 @@ export class UmbPackagesCreatedOverviewElement extends UmbLitElement {
 		this.#getPackages();
 	}
 
-	async #deletePackage(p: PackageDefinitionModel) {
+	async #deletePackage(p: PackageDefinitionResponseModel) {
 		if (!p.key) return;
 		const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
 			color: 'danger',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/repository/package.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/repository/package.store.ts
index 18120d46a9..f7bcfc0b11 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/repository/package.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/repository/package.store.ts
@@ -3,7 +3,7 @@ import { UmbContextToken } from '@umbraco-cms/context-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbStoreBase } from '@umbraco-cms/store';
 import type { ManifestBase, UmbPackage } from '@umbraco-cms/models';
-import type { PackageMigrationStatusModel } from '@umbraco-cms/backend-api';
+import type { PackageMigrationStatusResponseModel } from '@umbraco-cms/backend-api';
 import { ArrayState } from '@umbraco-cms/observable-api';
 
 export const UMB_PACKAGE_STORE_TOKEN = new UmbContextToken<UmbPackageStore>('UmbPackageStore');
@@ -22,7 +22,7 @@ export class UmbPackageStore extends UmbStoreBase {
 
 	#extensions = new ArrayState<ManifestBase>([], (e) => e.alias);
 
-	#migrations = new ArrayState<PackageMigrationStatusModel>([], (e) => e.packageName);
+	#migrations = new ArrayState<PackageMigrationStatusResponseModel>([], (e) => e.packageName);
 
 	/**
 	 * Observable of packages with extensions
@@ -56,7 +56,7 @@ export class UmbPackageStore extends UmbStoreBase {
 		this.#extensions.append(extensions);
 	}
 
-	appendMigrations(migrations: PackageMigrationStatusModel[]) {
+	appendMigrations(migrations: PackageMigrationStatusResponseModel[]) {
 		this.#migrations.append(migrations);
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts
index 8b3555ed3f..3abfe139d2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/cultures/repository/sources/index.ts
@@ -1,4 +1,4 @@
-import { PagedCultureModel } from '@umbraco-cms/backend-api';
+import { PagedCultureReponseModel } from '@umbraco-cms/backend-api';
 import type { DataSourceResponse } from '@umbraco-cms/models';
 
 // TODO: This is a temporary solution until we have a proper paging interface
@@ -8,5 +8,5 @@ type paging = {
 };
 
 export interface UmbCultureDataSource {
-	getCollection(paging: paging): Promise<DataSourceResponse<PagedCultureModel>>;
+	getCollection(paging: paging): Promise<DataSourceResponse<PagedCultureReponseModel>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
index 9ef00638de..84f319ab80 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts
@@ -2,10 +2,10 @@ import { html, css, nothing } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement } from 'lit/decorators.js';
 import { UmbModalBaseElement } from '@umbraco-cms/modal';
-import type { SearchResultModel } from '@umbraco-cms/backend-api';
+import type { SearchResultResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-modal-element-fields-viewer')
-export class UmbModalElementFieldsViewerElement extends UmbModalBaseElement<SearchResultModel & { name: string }> {
+export class UmbModalElementFieldsViewerElement extends UmbModalBaseElement<SearchResultResponseModel & { name: string }> {
 	static styles = [
 		UUITextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts
index 99d08ebf41..05ff3cf331 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts
@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { UUIButtonState } from '@umbraco-ui/uui-button';
 import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../shared/modals/confirm';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
-import { HealthStatusModel, IndexModel, IndexerResource } from '@umbraco-cms/backend-api';
+import { HealthStatusModel, IndexResponseModel, IndexerResource } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -85,7 +85,7 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement {
 	private _buttonState?: UUIButtonState = undefined;
 
 	@state()
-	private _indexData?: IndexModel;
+	private _indexData?: IndexResponseModel;
 
 	@state()
 	private _loading = true;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts
index 3ac9fb989b..beb5218eed 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts
@@ -4,9 +4,9 @@ import { customElement, state } from 'lit/decorators.js';
 
 import {
 	HealthStatusModel,
-	IndexModel,
+	IndexResponseModel,
 	IndexerResource,
-	SearcherModel,
+	SearcherResponseModel,
 	SearcherResource,
 } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
@@ -58,10 +58,10 @@ export class UmbDashboardExamineOverviewElement extends UmbLitElement {
 	];
 
 	@state()
-	private _indexers?: IndexModel[];
+	private _indexers?: IndexResponseModel[];
 
 	@state()
-	private _searchers?: SearcherModel[];
+	private _searchers?: SearcherResponseModel[];
 
 	@state()
 	private _loadingIndexers = false;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts
index fd7f1b6f14..62c8d2280d 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts
@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, nothing } from 'lit';
 import { customElement, state, query, property } from 'lit/decorators.js';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
-import { SearchResultModel, SearcherResource, FieldModel } from '@umbraco-cms/backend-api';
+import { SearchResultResponseModel, SearcherResource, FieldPresentationModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -106,7 +106,7 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement {
 	searcherName!: string;
 
 	@state()
-	private _searchResults?: SearchResultModel[];
+	private _searchResults?: SearchResultResponseModel[];
 
 	@state()
 	private _exposedFields?: ExposedSearchResultField[];
@@ -202,7 +202,7 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement {
 	}
 
 	// Find the field named 'nodeName' and return its value if it exists in the fields array
-	private getSearchResultNodeName(searchResult: SearchResultModel): string {
+	private getSearchResultNodeName(searchResult: SearchResultResponseModel): string {
 		const nodeNameField = searchResult.fields?.find((field) => field.name?.toUpperCase() === 'NODENAME');
 		return nodeNameField?.values?.join(', ') ?? '';
 	}
@@ -284,7 +284,7 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement {
 		})}`;
 	}
 
-	renderBodyCells(cellData: FieldModel[]) {
+	renderBodyCells(cellData: FieldPresentationModel[]) {
 		return html`${this._exposedFields?.map((slot) => {
 			return cellData.map((field) => {
 				return slot.exposed && field.name == slot.name
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/dashboard-health-check.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/dashboard-health-check.element.ts
index ce95990d04..486f315d04 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/dashboard-health-check.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/dashboard-health-check.element.ts
@@ -11,7 +11,7 @@ import { UmbLitElement } from '@umbraco-cms/element';
 import { ManifestHealthCheck } from '@umbraco-cms/extensions-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
-import { HealthCheckGroupModel, HealthCheckResource } from '@umbraco-cms/backend-api';
+import { HealthCheckGroupResponseModel, HealthCheckResource } from '@umbraco-cms/backend-api';
 
 @customElement('umb-dashboard-health-check')
 export class UmbDashboardHealthCheckElement extends UmbLitElement {
@@ -53,7 +53,7 @@ export class UmbDashboardHealthCheckElement extends UmbLitElement {
 		this.#register(manifests);
 	};
 
-	#createManifests(groups: HealthCheckGroupModel[]): Array<ManifestHealthCheck> {
+	#createManifests(groups: HealthCheckGroupResponseModel[]): Array<ManifestHealthCheck> {
 		return groups.map((group) => {
 			return {
 				type: 'healthCheck',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/health-check.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/health-check.context.ts
index 920af65be7..70cdf9d5bb 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/health-check.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/health-check.context.ts
@@ -1,14 +1,18 @@
 import { BehaviorSubject } from 'rxjs';
-import { HealthCheckGroupModel, HealthCheckGroupWithResultModel, HealthCheckResource } from '@umbraco-cms/backend-api';
+import {
+	HealthCheckGroupPresentationModel,
+	HealthCheckGroupWithResultResponseModel,
+	HealthCheckResource,
+} from '@umbraco-cms/backend-api';
 import { UmbContextToken } from '@umbraco-cms/context-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
 export class UmbHealthCheckContext {
-	private _checks = new BehaviorSubject<HealthCheckGroupModel | undefined>(undefined);
+	private _checks = new BehaviorSubject<HealthCheckGroupPresentationModel | undefined>(undefined);
 	public readonly checks = this._checks.asObservable();
 
-	private _results = new BehaviorSubject<HealthCheckGroupWithResultModel | undefined>(undefined);
+	private _results = new BehaviorSubject<HealthCheckGroupWithResultResponseModel | undefined>(undefined);
 	public readonly results = this._results.asObservable();
 
 	public host: UmbControllerHostInterface;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-action.element.ts
index 606c606c4e..00958c21c4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-action.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-action.element.ts
@@ -4,7 +4,7 @@ import { css, html, nothing } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 
-import { HealthCheckActionModel, HealthCheckResource } from '@umbraco-cms/backend-api';
+import { HealthCheckActionRequestModel, HealthCheckResource } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -54,7 +54,7 @@ export class UmbDashboardHealthCheckActionElement extends UmbLitElement {
 	];
 
 	@property({ reflect: true })
-	action!: HealthCheckActionModel;
+	action!: HealthCheckActionRequestModel;
 
 	@state()
 	private _buttonState?: UUIButtonState;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group-box-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group-box-overview.element.ts
index 31fa419b08..3f880f186a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group-box-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group-box-overview.element.ts
@@ -8,7 +8,7 @@ import {
 } from '../health-check-dashboard.context';
 import { ensureSlash, path } from '@umbraco-cms/router';
 import type { ManifestHealthCheck } from '@umbraco-cms/models';
-import { HealthCheckGroupWithResultModel, StatusResultTypeModel } from '@umbraco-cms/backend-api';
+import { HealthCheckGroupWithResultResponseModel, StatusResultTypeModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 @customElement('umb-health-check-group-box-overview')
@@ -64,7 +64,7 @@ export class UmbHealthCheckGroupBoxOverviewElement extends UmbLitElement {
 	private _tagResults?: any = [];
 
 	@state()
-	private _keyResults?: HealthCheckGroupWithResultModel;
+	private _keyResults?: HealthCheckGroupWithResultResponseModel;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group.element.ts
index 45f503dd59..0b9467d1e4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/health-check/views/health-check-group.element.ts
@@ -10,11 +10,11 @@ import {
 	UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN,
 } from '../health-check-dashboard.context';
 import {
-	HealthCheckActionModel,
-	HealthCheckGroupModel,
+	HealthCheckActionRequestModel,
+	HealthCheckGroupPresentationModel,
 	HealthCheckModel,
 	HealthCheckResource,
-	HealthCheckWithResultModel,
+	HealthCheckWithResultPresentationModel,
 	StatusResultTypeModel,
 } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
@@ -74,7 +74,7 @@ export class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
 	private _buttonState: UUIButtonState;
 
 	@state()
-	private _group?: HealthCheckGroupModel;
+	private _group?: HealthCheckGroupPresentationModel;
 
 	private _healthCheckContext?: UmbHealthCheckDashboardContext;
 
@@ -82,7 +82,7 @@ export class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
 	private _checks?: HealthCheckModel[];
 
 	@state()
-	private _keyResults?: HealthCheckWithResultModel[];
+	private _keyResults?: HealthCheckWithResultPresentationModel[];
 
 	private _api?: UmbHealthCheckContext;
 
@@ -112,7 +112,7 @@ export class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
 		this._buttonState = 'success';
 	}
 
-	private _onActionClick(action: HealthCheckActionModel) {
+	private _onActionClick(action: HealthCheckActionRequestModel) {
 		return tryExecuteAndNotify(this, HealthCheckResource.postHealthCheckExecuteAction({ requestBody: action }));
 	}
 
@@ -197,7 +197,7 @@ export class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
 		}
 	}
 
-	private renderActions(actions: HealthCheckActionModel[]) {
+	private renderActions(actions: HealthCheckActionRequestModel[]) {
 		if (actions.length)
 			return html` <div class="action-wrapper">
 				${actions.map(
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts
index a9f60aa0c8..6caa76d8bf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, nothing } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 
-import { ModelsBuilderModel, ModelsBuilderResource, ModelsModeModel } from '@umbraco-cms/backend-api';
+import { ModelsBuilderResponseModel, ModelsBuilderResource, ModelsModeModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -41,7 +41,7 @@ export class UmbDashboardModelsBuilderElement extends UmbLitElement {
 	];
 
 	@state()
-	private _modelsBuilder?: ModelsBuilderModel;
+	private _modelsBuilder?: ModelsBuilderResponseModel;
 
 	@state()
 	private _buttonStateBuild: UUIButtonState = undefined;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts
index 71a89c4b72..ee02adaf77 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts
@@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { UUIButtonState } from '@umbraco-ui/uui';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
-import { TelemetryModel, TelemetryLevelModel, TelemetryResource } from '@umbraco-cms/backend-api';
+import { TelemetryResponseModel, TelemetryLevelModel, TelemetryResource } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -22,7 +22,7 @@ export class UmbDashboardTelemetryElement extends UmbLitElement {
 	private _telemetryFormData = TelemetryLevelModel.BASIC;
 
 	@state()
-	private _telemetryLevels: TelemetryModel[] = [];
+	private _telemetryLevels: TelemetryResponseModel[] = [];
 
 	@state()
 	private _errorMessage = '';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.repository.ts
index e440812256..d69e722a9b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.repository.ts
@@ -5,12 +5,12 @@ import { UmbDataTypeStore, UMB_DATA_TYPE_STORE_CONTEXT_TOKEN } from './data-type
 import { DataTypeTreeServerDataSource } from './sources/data-type.tree.server.data';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextConsumerController } from '@umbraco-cms/context-api';
-import { ProblemDetailsModel, DataTypeModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, DataTypeResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbTreeRepository } from 'libs/repository/tree-repository.interface';
 import { UmbDetailRepository } from '@umbraco-cms/repository';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/notification';
 
-type ItemType = DataTypeModel;
+type ItemType = DataTypeResponseModel;
 
 // Move to documentation / JSdoc
 /* We need to create a new instance of the repository from within the element context. We want the notifications to be displayed in the right context. */
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.store.ts
index d6d8ef2d94..169e7499e7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/data-type.store.ts
@@ -1,4 +1,4 @@
-import type { DataTypeModel } from '@umbraco-cms/backend-api';
+import type { DataTypeResponseModel } from '@umbraco-cms/backend-api';
 import { UmbContextToken } from '@umbraco-cms/context-api';
 import { ArrayState } from '@umbraco-cms/observable-api';
 import { UmbStoreBase } from '@umbraco-cms/store';
@@ -13,7 +13,7 @@ export const UMB_DATA_TYPE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDataType
  * @description - Data Store for Template Details
  */
 export class UmbDataTypeStore extends UmbStoreBase {
-	#data = new ArrayState<DataTypeModel>([], (x) => x.key);
+	#data = new ArrayState<DataTypeResponseModel>([], (x) => x.key);
 
 	/**
 	 * Creates an instance of UmbDataTypeStore.
@@ -29,7 +29,7 @@ export class UmbDataTypeStore extends UmbStoreBase {
 	 * @param {DataTypeModel} dataType
 	 * @memberof UmbDataTypeStore
 	 */
-	append(dataType: DataTypeModel) {
+	append(dataType: DataTypeResponseModel) {
 		this.#data.append([dataType]);
 	}
 
@@ -38,7 +38,7 @@ export class UmbDataTypeStore extends UmbStoreBase {
 	 * @param {key} DataTypeModel key.
 	 * @memberof UmbDataTypeStore
 	 */
-	byKey(key: DataTypeModel['key']) {
+	byKey(key: DataTypeResponseModel['key']) {
 		return this.#data.getObservablePart((x) => x.find((y) => y.key === key));
 	}
 
@@ -47,7 +47,7 @@ export class UmbDataTypeStore extends UmbStoreBase {
 	 * @param {string[]} uniques
 	 * @memberof UmbDataTypeStore
 	 */
-	remove(uniques: Array<DataTypeModel['key']>) {
+	remove(uniques: Array<DataTypeResponseModel['key']>) {
 		this.#data.remove(uniques);
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts
index 2af70e06fe..88ac8bd9e3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts
@@ -2,9 +2,8 @@ import { RepositoryDetailDataSource } from '@umbraco-cms/repository';
 import {
 	ProblemDetailsModel,
 	DataTypeResource,
-	DataTypeModel,
-	DataTypeCreateModel,
-	DataTypeUpdateModel,
+	DataTypeResponseModel,
+	DataTypeModelBaseModel,
 } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
@@ -15,7 +14,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/resources';
  * @class UmbDataTypeServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<DataTypeModel> {
+export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<DataTypeResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**
@@ -54,7 +53,7 @@ export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<D
 	 * @memberof UmbDataTypeServerDataSource
 	 */
 	async createScaffold(parentKey: string | null) {
-		const data: DataTypeModel = {
+		const data: DataTypeResponseModel = {
 			$type: '',
 			parentKey: parentKey,
 		};
@@ -68,15 +67,15 @@ export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<D
 	 * @return {*}
 	 * @memberof UmbDataTypeServerDataSource
 	 */
-	async insert(dataType: DataTypeModel) {
+	async insert(dataType: DataTypeResponseModel) {
 		if (!dataType.key) {
 			const error: ProblemDetailsModel = { title: 'DataType key is missing' };
 			return { error };
 		}
-		const requestBody: DataTypeCreateModel = { ...dataType };
+		const requestBody: DataTypeModelBaseModel = { ...dataType };
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DataTypeModel>(
+		return tryExecuteAndNotify<DataTypeResponseModel>(
 			this.#host,
 			// TODO: avoid this any?..
 			tryExecuteAndNotify(
@@ -90,21 +89,21 @@ export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<D
 
 	/**
 	 * Updates a DataType on the server
-	 * @param {DataTypeModel} DataType
+	 * @param {DataTypeResponseModel} DataType
 	 * @return {*}
 	 * @memberof UmbDataTypeServerDataSource
 	 */
 	// TODO: Error mistake in this:
-	async update(dataType: DataTypeModel) {
+	async update(dataType: DataTypeResponseModel) {
 		if (!dataType.key) {
 			const error: ProblemDetailsModel = { title: 'DataType key is missing' };
 			return { error };
 		}
 
-		const requestBody: DataTypeUpdateModel = { ...dataType };
+		const requestBody: DataTypeModelBaseModel = { ...dataType };
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DataTypeModel>(
+		return tryExecuteAndNotify<DataTypeResponseModel>(
 			this.#host,
 			DataTypeResource.putDataTypeByKey({
 				key: dataType.key,
@@ -126,7 +125,7 @@ export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<D
 		}
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DataTypeModel>(
+		return tryExecuteAndNotify<DataTypeResponseModel>(
 			this.#host,
 			DataTypeResource.deleteDataTypeByKey({
 				key,
@@ -147,7 +146,7 @@ export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<D
 		}
 
 		// TODO: use resources when end point is ready:
-		return tryExecuteAndNotify<DataTypeModel>(
+		return tryExecuteAndNotify<DataTypeResponseModel>(
 			this.#host,
 			DataTypeResource.deleteDataTypeByKey({
 				key,
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.context.ts
index 531531c39d..5912694028 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.context.ts
@@ -1,15 +1,15 @@
 import { UmbWorkspaceContext } from '../../../shared/components/workspace/workspace-context/workspace-context';
 import { UmbWorkspaceEntityContextInterface } from '../../../shared/components/workspace/workspace-context/workspace-entity-context.interface';
 import { UmbDataTypeRepository } from '../repository/data-type.repository';
-import type { DataTypeModel } from '@umbraco-cms/backend-api';
+import type { DataTypeResponseModel } from '@umbraco-cms/backend-api';
 import { appendToFrozenArray, ObjectState } from '@umbraco-cms/observable-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
 export class UmbDataTypeWorkspaceContext
 	extends UmbWorkspaceContext<UmbDataTypeRepository>
-	implements UmbWorkspaceEntityContextInterface<DataTypeModel | undefined>
+	implements UmbWorkspaceEntityContextInterface<DataTypeResponseModel | undefined>
 {
-	#data = new ObjectState<DataTypeModel | undefined>(undefined);
+	#data = new ObjectState<DataTypeResponseModel | undefined>(undefined);
 	data = this.#data.asObservable();
 	name = this.#data.getObservablePart((data) => data?.name);
 	key = this.#data.getObservablePart((data) => data?.key);
@@ -63,8 +63,8 @@ export class UmbDataTypeWorkspaceContext
 		const currentData = this.#data.value;
 		if (currentData) {
 			// TODO: make a partial update method for array of data, (idea/concept, use if this case is getting common)
-			const newDataSet = appendToFrozenArray(currentData.data || [], entry, (x) => x.alias);
-			this.#data.update({ data: newDataSet });
+			const newDataSet = appendToFrozenArray(currentData.values || [], entry, (x) => x.alias);
+			this.#data.update({ values: newDataSet });
 		}
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts
index fd12cca7b2..4ad2a0b687 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts
@@ -5,7 +5,7 @@ import { UmbDataTypeWorkspaceContext } from '../../data-type-workspace.context';
 import { UMB_PROPERTY_EDITOR_UI_PICKER_MODAL_TOKEN } from '../../../../../shared/property-editors/modals/property-editor-ui-picker';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DataTypeModel } from '@umbraco-cms/backend-api';
+import type { DataTypeResponseModel } from '@umbraco-cms/backend-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-api';
 
 import '../../../../../shared/property-editors/shared/property-editor-config/property-editor-config.element';
@@ -24,7 +24,7 @@ export class UmbDataTypeWorkspaceViewEditElement extends UmbLitElement {
 	];
 
 	@state()
-	_dataType?: DataTypeModel;
+	_dataType?: DataTypeResponseModel;
 
 	@state()
 	private _propertyEditorUIIcon = '';
@@ -73,8 +73,8 @@ export class UmbDataTypeWorkspaceViewEditElement extends UmbLitElement {
 				this._observePropertyEditorUI(this._dataType.propertyEditorUiAlias || undefined);
 			}
 
-			if (this._dataType.data && this._dataType.data !== this._data) {
-				this._data = this._dataType.data;
+			if (this._dataType.values && this._dataType.values !== this._data) {
+				this._data = this._dataType.values;
 			}
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts
index d7e9f35ac5..7ea6345d41 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts
@@ -4,14 +4,14 @@ import { customElement, state } from 'lit/decorators.js';
 import { UmbDataTypeWorkspaceContext } from '../../data-type-workspace.context';
 
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DataTypeModel } from '@umbraco-cms/backend-api';
+import { DataTypeResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-workspace-view-data-type-info')
 export class UmbWorkspaceViewDataTypeInfoElement extends UmbLitElement {
 	static styles = [UUITextStyles, css``];
 
 	@state()
-	_dataType?: DataTypeModel;
+	_dataType?: DataTypeResponseModel;
 
 	private _workspaceContext?: UmbDataTypeWorkspaceContext;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language-select.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language-select.element.ts
index a69f693017..9c4c8165fb 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language-select.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language-select.element.ts
@@ -7,7 +7,7 @@ import { UUIMenuItemEvent } from '@umbraco-ui/uui';
 import { UmbLanguageRepository } from '../repository/language.repository';
 import { UMB_APP_LANGUAGE_CONTEXT_TOKEN, UmbAppLanguageContext } from './app-language.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-app-language-select')
 export class UmbAppLanguageSelectElement extends UmbLitElement {
@@ -43,10 +43,10 @@ export class UmbAppLanguageSelectElement extends UmbLitElement {
 	];
 
 	@state()
-	private _languages: Array<LanguageModel> = [];
+	private _languages: Array<LanguageResponseModel> = [];
 
 	@state()
-	private _appLanguage?: LanguageModel;
+	private _appLanguage?: LanguageResponseModel;
 
 	@state()
 	private _isOpen = false;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language.context.ts
index 867f876579..bd9686fe99 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/app-language-select/app-language.context.ts
@@ -2,15 +2,15 @@ import { UmbLanguageRepository } from '../repository/language.repository';
 import { ObjectState, UmbObserverController } from '@umbraco-cms/observable-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextToken } from '@umbraco-cms/context-api';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 export class UmbAppLanguageContext {
 	#host: UmbControllerHostInterface;
 	#languageRepository: UmbLanguageRepository;
 
-	#languages: Array<LanguageModel> = [];
+	#languages: Array<LanguageResponseModel> = [];
 
-	#appLanguage = new ObjectState<LanguageModel | undefined>(undefined);
+	#appLanguage = new ObjectState<LanguageResponseModel | undefined>(undefined);
 	appLanguage = this.#appLanguage.asObservable();
 
 	constructor(host: UmbControllerHostInterface) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/index.ts
index 5f551178ad..f057aa3800 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/index.ts
@@ -1,10 +1,10 @@
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 import { UmbModalToken } from '@umbraco-cms/modal';
 
 export interface UmbLanguagePickerModalData {
 	multiple?: boolean;
 	selection?: Array<string>;
-	filter?: (language: LanguageModel) => boolean;
+	filter?: (language: LanguageResponseModel) => boolean;
 }
 
 export interface UmbLanguagePickerModalResult {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
index 98a4407e97..53bf09acbd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
@@ -6,14 +6,14 @@ import { UUIMenuItemElement, UUIMenuItemEvent } from '@umbraco-ui/uui';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbLanguageRepository } from '../../repository/language.repository';
 import { UmbModalElementPickerBase } from '@umbraco-cms/modal';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-language-picker-modal')
-export class UmbLanguagePickerModalElement extends UmbModalElementPickerBase<LanguageModel> {
+export class UmbLanguagePickerModalElement extends UmbModalElementPickerBase<LanguageResponseModel> {
 	static styles = [UUITextStyles, css``];
 
 	@state()
-	private _languages: Array<LanguageModel> = [];
+	private _languages: Array<LanguageResponseModel> = [];
 
 	private _languageRepository = new UmbLanguageRepository(this);
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.repository.ts
index ef87ea9abe..6339112735 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.repository.ts
@@ -3,7 +3,7 @@ import { UmbLanguageStore, UMB_LANGUAGE_STORE_CONTEXT_TOKEN } from './language.s
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextConsumerController } from '@umbraco-cms/context-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/notification';
-import { LanguageModel, ProblemDetailsModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel, ProblemDetailsModel } from '@umbraco-cms/backend-api';
 
 export class UmbLanguageRepository {
 	#init!: Promise<unknown>;
@@ -84,7 +84,7 @@ export class UmbLanguageRepository {
 		return this.#dataSource.createScaffold();
 	}
 
-	async create(language: LanguageModel) {
+	async create(language: LanguageResponseModel) {
 		await this.#init;
 
 		const { error } = await this.#dataSource.insert(language);
@@ -104,7 +104,7 @@ export class UmbLanguageRepository {
 	 * @return {*}
 	 * @memberof UmbLanguageRepository
 	 */
-	async save(language: LanguageModel) {
+	async save(language: LanguageResponseModel) {
 		await this.#init;
 
 		const { error } = await this.#dataSource.update(language);
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.store.ts
index 3da9a5a38a..18f10bc156 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/language.store.ts
@@ -2,7 +2,7 @@ import { UmbContextToken } from '@umbraco-cms/context-api';
 import { UmbStoreBase } from '@umbraco-cms/store';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { ArrayState } from '@umbraco-cms/observable-api';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 export const UMB_LANGUAGE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbLanguageStore>('UmbLanguageStore');
 
@@ -13,14 +13,14 @@ export const UMB_LANGUAGE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbLanguageS
  * @description - Details Data Store for Languages
  */
 export class UmbLanguageStore extends UmbStoreBase {
-	#data = new ArrayState<LanguageModel>([], (x) => x.isoCode);
+	#data = new ArrayState<LanguageResponseModel>([], (x) => x.isoCode);
 	data = this.#data.asObservable();
 
 	constructor(host: UmbControllerHostInterface) {
 		super(host, UMB_LANGUAGE_STORE_CONTEXT_TOKEN.toString());
 	}
 
-	append(language: LanguageModel) {
+	append(language: LanguageResponseModel) {
 		this.#data.append([language]);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts
index 81efc0303f..449c07448b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts
@@ -1,4 +1,4 @@
-import { LanguageModel, PagedLanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel, PagedLanguageResponseModel } from '@umbraco-cms/backend-api';
 import type { DataSourceResponse } from '@umbraco-cms/models';
 import { RepositoryDetailDataSource } from '@umbraco-cms/repository';
 
@@ -8,9 +8,9 @@ type paging = {
 	take: number;
 };
 
-export interface UmbLanguageDataSource extends RepositoryDetailDataSource<LanguageModel> {
-	createScaffold(): Promise<DataSourceResponse<LanguageModel>>;
-	get(isoCode: string): Promise<DataSourceResponse<LanguageModel>>;
-	delete(isoCode: string): Promise<DataSourceResponse<LanguageModel>>;
-	getCollection(paging: paging): Promise<DataSourceResponse<PagedLanguageModel>>;
+export interface UmbLanguageDataSource extends RepositoryDetailDataSource<LanguageResponseModel> {
+	createScaffold(): Promise<DataSourceResponse<LanguageResponseModel>>;
+	get(isoCode: string): Promise<DataSourceResponse<LanguageResponseModel>>;
+	delete(isoCode: string): Promise<DataSourceResponse<LanguageResponseModel>>;
+	getCollection(paging: paging): Promise<DataSourceResponse<PagedLanguageResponseModel>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/language.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/language.server.data.ts
index cca5af2960..98653be2ed 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/language.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/language.server.data.ts
@@ -1,4 +1,4 @@
-import { ProblemDetailsModel, LanguageResource, LanguageModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, LanguageResource, LanguageResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -47,7 +47,7 @@ export class UmbLanguageServerDataSource implements UmbLanguageServerDataSource
 	 * @memberof UmbLanguageServerDataSource
 	 */
 	async createScaffold() {
-		const data: LanguageModel = {
+		const data: LanguageResponseModel = {
 			name: '',
 			isDefault: false,
 			isMandatory: false,
@@ -60,11 +60,11 @@ export class UmbLanguageServerDataSource implements UmbLanguageServerDataSource
 
 	/**
 	 * Inserts a new Language on the server
-	 * @param {LanguageModel} language
+	 * @param {LanguageResponseModel} language
 	 * @return {*}
 	 * @memberof UmbLanguageServerDataSource
 	 */
-	async insert(language: LanguageModel) {
+	async insert(language: LanguageResponseModel) {
 		if (!language.isoCode) {
 			const error: ProblemDetailsModel = { title: 'Language iso code is missing' };
 			return { error };
@@ -75,11 +75,11 @@ export class UmbLanguageServerDataSource implements UmbLanguageServerDataSource
 
 	/**
 	 * Updates a Language on the server
-	 * @param {LanguageModel} language
+	 * @param {LanguageResponseModel} language
 	 * @return {*}
 	 * @memberof UmbLanguageServerDataSource
 	 */
-	async update(language: LanguageModel) {
+	async update(language: LanguageResponseModel) {
 		if (!language.isoCode) {
 			const error: ProblemDetailsModel = { title: 'Language iso code is missing' };
 			return { error };
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-table-delete-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-table-delete-column-layout.element.ts
index d318a967fa..081addf7c2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-table-delete-column-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-table-delete-column-layout.element.ts
@@ -3,14 +3,14 @@ import { css, html, nothing } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-language-root-table-delete-column-layout')
 export class UmbLanguageRootTableDeleteColumnLayoutElement extends UmbLitElement {
 	static styles = [UUITextStyles, css``];
 
 	@property({ attribute: false })
-	value!: LanguageModel;
+	value!: LanguageResponseModel;
 
 	@state()
 	_isOpen = false;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
index aba3ffb008..ceaeae0e15 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts
@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { UmbTableColumn, UmbTableConfig, UmbTableItem } from '../../../../shared/components/table';
 import { UmbLanguageRepository } from '../../repository/language.repository';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 import './language-root-table-delete-column-layout.element';
 import './language-root-table-name-column-layout.element';
@@ -79,7 +79,7 @@ export class UmbLanguageRootWorkspaceElement extends UmbLitElement {
 		}
 	}
 
-	#createTableItems(languages: Array<LanguageModel>) {
+	#createTableItems(languages: Array<LanguageResponseModel>) {
 		this._tableItems = languages.map((language) => {
 			return {
 				key: language.isoCode ?? '',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.context.ts
index a31db582a7..4e17f440b1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.context.ts
@@ -1,11 +1,11 @@
 import { UmbLanguageRepository } from '../../repository/language.repository';
 import { UmbWorkspaceContext } from '../../../../shared/components/workspace/workspace-context/workspace-context';
-import type { LanguageModel } from '@umbraco-cms/backend-api';
+import type { LanguageResponseModel } from '@umbraco-cms/backend-api';
 import { ObjectState } from '@umbraco-cms/observable-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
 export class UmbLanguageWorkspaceContext extends UmbWorkspaceContext<UmbLanguageRepository> {
-	#data = new ObjectState<LanguageModel | undefined>(undefined);
+	#data = new ObjectState<LanguageResponseModel | undefined>(undefined);
 	data = this.#data.asObservable();
 
 	// TODO: this is a temp solution to bubble validation errors to the UI
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts
index 409d475777..3ab601abf7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts
@@ -6,7 +6,7 @@ import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbWorkspaceEntityElement } from '../../../../shared/components/workspace/workspace-entity-element.interface';
 import { UmbLanguageWorkspaceContext } from './language-workspace.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-language-workspace')
 export class UmbLanguageWorkspaceElement extends UmbLitElement implements UmbWorkspaceEntityElement {
@@ -26,7 +26,7 @@ export class UmbLanguageWorkspaceElement extends UmbLitElement implements UmbWor
 	];
 
 	@state()
-	_language?: LanguageModel;
+	_language?: LanguageResponseModel;
 
 	#languageWorkspaceContext = new UmbLanguageWorkspaceContext(this);
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/views/edit/edit-language-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/views/edit/edit-language-workspace-view.element.ts
index 0c27e84f7d..53ed1c8b14 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/views/edit/edit-language-workspace-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/views/edit/edit-language-workspace-view.element.ts
@@ -8,7 +8,7 @@ import UmbInputCultureSelectElement from '../../../../../../shared/components/in
 import UmbInputLanguagePickerElement from '../../../../../../shared/components/input-language-picker/input-language-picker.element';
 import { UmbChangeEvent } from '@umbraco-cms/events';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-edit-language-workspace-view')
 export class UmbEditLanguageWorkspaceViewElement extends UmbLitElement {
@@ -45,7 +45,7 @@ export class UmbEditLanguageWorkspaceViewElement extends UmbLitElement {
 	];
 
 	@state()
-	_language?: LanguageModel;
+	_language?: LanguageResponseModel;
 
 	@state()
 	_isDefaultLanguage = false;
@@ -201,7 +201,7 @@ export class UmbEditLanguageWorkspaceViewElement extends UmbLitElement {
 						slot="editor"
 						max="1"
 						@change=${this.#handleFallbackChange}
-						.filter=${(language: LanguageModel) =>
+						.filter=${(language: LanguageResponseModel) =>
 							language.isoCode !== this._language?.isoCode}></umb-input-language-picker>
 				</umb-workspace-property-layout>
 			</uui-box>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts
index 518a5e18af..5b70410caf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/index.ts
@@ -1,12 +1,12 @@
 import {
 	DirectionModel,
-	LogLevelCountsModel,
+	LogLevelCountsReponseModel,
 	LogLevelModel,
-	PagedLoggerModel,
-	PagedLogMessageModel,
-	PagedLogTemplateModel,
-	PagedSavedLogSearchModel,
-	SavedLogSearchModel,
+	PagedLoggerResponseModel,
+	PagedLogMessageResponseModel,
+	PagedLogTemplateResponseModel,
+	PagedSavedLogSearchResponseModel,
+	SavedLogSearchResponseModel,
 } from '@umbraco-cms/backend-api';
 import type { DataSourceResponse } from '@umbraco-cms/models';
 
@@ -19,25 +19,25 @@ export interface LogSearchDataSource {
 	}: {
 		skip?: number;
 		take?: number;
-	}): Promise<DataSourceResponse<PagedSavedLogSearchModel>>;
-	getSavedSearchByName({ name }: { name: string }): Promise<DataSourceResponse<SavedLogSearchModel>>;
+	}): Promise<DataSourceResponse<PagedSavedLogSearchResponseModel>>;
+	getSavedSearchByName({ name }: { name: string }): Promise<DataSourceResponse<SavedLogSearchResponseModel>>;
 	deleteSavedSearchByName({ name }: { name: string }): Promise<DataSourceResponse<unknown>>;
 	postLogViewerSavedSearch({
 		requestBody,
 	}: {
-		requestBody?: SavedLogSearchModel;
+		requestBody?: SavedLogSearchResponseModel;
 	}): Promise<DataSourceResponse<unknown>>;
 }
 
 export interface LogMessagesDataSource {
-	getLogViewerLevel({ skip, take }: { skip?: number; take?: number }): Promise<DataSourceResponse<PagedLoggerModel>>;
+	getLogViewerLevel({ skip, take }: { skip?: number; take?: number }): Promise<DataSourceResponse<PagedLoggerResponseModel>>;
 	getLogViewerLevelCount({
 		startDate,
 		endDate,
 	}: {
 		startDate?: string;
 		endDate?: string;
-	}): Promise<DataSourceResponse<LogLevelCountsModel>>;
+	}): Promise<DataSourceResponse<LogLevelCountsReponseModel>>;
 	getLogViewerLogs({
 		skip,
 		take = 100,
@@ -54,7 +54,7 @@ export interface LogMessagesDataSource {
 		logLevel?: Array<LogLevelModel>;
 		startDate?: string;
 		endDate?: string;
-	}): Promise<DataSourceResponse<PagedLogMessageModel>>;
+	}): Promise<DataSourceResponse<PagedLogMessageResponseModel>>;
 	getLogViewerMessageTemplate({
 		skip,
 		take = 100,
@@ -65,5 +65,5 @@ export interface LogMessagesDataSource {
 		take?: number;
 		startDate?: string;
 		endDate?: string;
-	}): Promise<DataSourceResponse<PagedLogTemplateModel>>;
+	}): Promise<DataSourceResponse<PagedLogTemplateResponseModel>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/log-viewer.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/log-viewer.server.data.ts
index ebdf1264e5..822f63f8e4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/log-viewer.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/repository/sources/log-viewer.server.data.ts
@@ -1,5 +1,5 @@
 import { LogMessagesDataSource, LogSearchDataSource } from '.';
-import { DirectionModel, LogLevelModel, LogViewerResource, SavedLogSearchModel } from '@umbraco-cms/backend-api';
+import { DirectionModel, LogLevelModel, LogViewerResource, SavedLogSearchResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 
@@ -49,7 +49,7 @@ export class UmbLogSearchesServerDataSource implements LogSearchDataSource {
 	 * @return {*}
 	 * @memberof UmbLogSearchesServerDataSource
 	 */
-	async postLogViewerSavedSearch({ requestBody }: { requestBody?: SavedLogSearchModel }) {
+	async postLogViewerSavedSearch({ requestBody }: { requestBody?: SavedLogSearchResponseModel }) {
 		return await tryExecuteAndNotify(this.#host, LogViewerResource.postLogViewerSavedSearch({ requestBody }));
 	}
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
index 93d7896cc6..57539c9aa4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer.context.ts
@@ -2,12 +2,12 @@ import { UmbLogViewerRepository } from '../repository/log-viewer.repository';
 import { ArrayState, createObservablePart, DeepState, ObjectState, StringState } from '@umbraco-cms/observable-api';
 import {
 	DirectionModel,
-	LogLevelCountsModel,
+	LogLevelCountsReponseModel,
 	LogLevelModel,
-	PagedLoggerModel,
-	PagedLogMessageModel,
-	PagedLogTemplateModel,
-	PagedSavedLogSearchModel,
+	PagedLoggerResponseModel,
+	PagedLogMessageResponseModel,
+	PagedLogTemplateResponseModel,
+	PagedSavedLogSearchResponseModel,
 } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextToken } from '@umbraco-cms/context-api';
@@ -50,16 +50,16 @@ export class UmbLogViewerWorkspaceContext {
 		endDate: this.today,
 	};
 
-	#savedSearches = new DeepState<PagedSavedLogSearchModel | undefined>(undefined);
+	#savedSearches = new DeepState<PagedSavedLogSearchResponseModel | undefined>(undefined);
 	savedSearches = createObservablePart(this.#savedSearches, (data) => data?.items);
 
-	#logCount = new DeepState<LogLevelCountsModel | null>(null);
+	#logCount = new DeepState<LogLevelCountsReponseModel | null>(null);
 	logCount = createObservablePart(this.#logCount, (data) => data);
 
 	#dateRange = new DeepState<LogViewerDateRange>(this.defaultDateRange);
 	dateRange = createObservablePart(this.#dateRange, (data) => data);
 
-	#loggers = new DeepState<PagedLoggerModel | null>(null);
+	#loggers = new DeepState<PagedLoggerResponseModel | null>(null);
 	loggers = createObservablePart(this.#loggers, (data) => data?.items);
 
 	#canShowLogs = new BasicState<boolean | null>(null);
@@ -68,13 +68,13 @@ export class UmbLogViewerWorkspaceContext {
 	#filterExpression = new StringState<string>('');
 	filterExpression = createObservablePart(this.#filterExpression, (data) => data);
 
-	#messageTemplates = new DeepState<PagedLogTemplateModel | null>(null);
+	#messageTemplates = new DeepState<PagedLogTemplateResponseModel | null>(null);
 	messageTemplates = createObservablePart(this.#messageTemplates, (data) => data);
 
 	#logLevelsFilter = new ArrayState<LogLevelModel>([]);
 	logLevelsFilter = createObservablePart(this.#logLevelsFilter, (data) => data);
 
-	#logs = new DeepState<PagedLogMessageModel | null>(null);
+	#logs = new DeepState<PagedLogMessageResponseModel | null>(null);
 	logs = createObservablePart(this.#logs, (data) => data?.items);
 	logsTotal = createObservablePart(this.#logs, (data) => data?.total);
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts
index 2aeafb27fa..4cce6a35ec 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts
@@ -2,7 +2,7 @@ import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LoggerModel } from '@umbraco-cms/backend-api';
+import { LoggerResponseModel } from '@umbraco-cms/backend-api';
 
 //TODO: implement the saved searches pagination when the API total bug is fixed
 @customElement('umb-log-viewer-log-level-overview')
@@ -18,7 +18,7 @@ export class UmbLogViewerLogLevelOverviewElement extends UmbLitElement {
 	}
 
 	@state()
-	private _loggers: LoggerModel[] = [];
+	private _loggers: LoggerResponseModel[] = [];
 	/**
 	 * The name of the logger to get the level for. Defaults to 'Global'.
 	 *
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts
index 1c7ec7a927..051d554f90 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts
@@ -1,9 +1,8 @@
-import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { LogLevelCountsModel } from '@umbraco-cms/backend-api';
+import { LogLevelCountsReponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-log-viewer-log-types-chart')
 export class UmbLogViewerLogTypesChartElement extends UmbLitElement {
@@ -80,7 +79,7 @@ export class UmbLogViewerLogTypesChartElement extends UmbLitElement {
 	}
 
 	@state()
-	private _logLevelCount: LogLevelCountsModel | null = null;
+	private _logLevelCount: LogLevelCountsReponseModel | null = null;
 
 	@state()
 	private logLevelCount: [string, number][] = [];
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts
index 5c9cd6f754..4b71250eb3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts
@@ -3,7 +3,7 @@ import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { PagedLogTemplateModel, SavedLogSearchModel } from '@umbraco-cms/backend-api';
+import { PagedLogTemplateResponseModel, SavedLogSearchResponseModel } from '@umbraco-cms/backend-api';
 
 //TODO: fix pagination bug when API is fixed
 @customElement('umb-log-viewer-message-templates-overview')
@@ -39,7 +39,7 @@ export class UmbLogViewerMessageTemplatesOverviewElement extends UmbLitElement {
 	];
 
 	@state()
-	private _messageTemplates: PagedLogTemplateModel | null = null;
+	private _messageTemplates: PagedLogTemplateResponseModel | null = null;
 
 	#logViewerContext?: UmbLogViewerWorkspaceContext;
 	constructor() {
@@ -63,7 +63,7 @@ export class UmbLogViewerMessageTemplatesOverviewElement extends UmbLitElement {
 		this.#logViewerContext?.getMessageTemplates(0, take + 10);
 	}
 
-	#renderSearchItem = (searchListItem: SavedLogSearchModel) => {
+	#renderSearchItem = (searchListItem: SavedLogSearchResponseModel) => {
 		return html` <li>
 			<uui-button
 				@click=${() => {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
index 588e51bd9f..205c5d0626 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts
@@ -3,7 +3,7 @@ import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { SavedLogSearchModel } from '@umbraco-cms/backend-api';
+import { SavedLogSearchResponseModel } from '@umbraco-cms/backend-api';
 
 //TODO: implement the saved searches pagination when the API total bug is fixed
 @customElement('umb-log-viewer-saved-searches-overview')
@@ -37,7 +37,7 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 	];
 
 	@state()
-	private _savedSearches: SavedLogSearchModel[] = [];
+	private _savedSearches: SavedLogSearchResponseModel[] = [];
 
 	#logViewerContext?: UmbLogViewerWorkspaceContext;
 	constructor() {
@@ -60,7 +60,7 @@ export class UmbLogViewerSavedSearchesOverviewElement extends UmbLitElement {
 		this.#logViewerContext?.setFilterExpression(query);
 	}
 
-	#renderSearchItem = (searchListItem: SavedLogSearchModel) => {
+	#renderSearchItem = (searchListItem: SavedLogSearchResponseModel) => {
 		return html` <li>
 			<uui-button
 				@click=${() => {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
index 38191cf274..c4c3be8e8b 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/overview/log-overview-view.element.ts
@@ -1,7 +1,7 @@
 import { css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../logviewer.context';
-import { LogLevelCountsModel } from '@umbraco-cms/backend-api';
+import { LogLevelCountsReponseModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 //TODO: add a disabled attribute to the show more button when the total number of items is correctly returned from the endpoint
@@ -88,7 +88,7 @@ export class UmbLogViewerOverviewViewElement extends UmbLitElement {
 	private _errorCount = 0;
 
 	@state()
-	private _logLevelCount: LogLevelCountsModel | null = null;
+	private _logLevelCount: LogLevelCountsReponseModel | null = null;
 
 	@state()
 	private _canShowLogs = false;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
index 8bc5edb9c6..c0adf422c3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-message.element.ts
@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html, PropertyValueMap } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
-import { LogLevelModel, LogMessagePropertyModel } from '@umbraco-cms/backend-api';
+import { LogLevelModel, LogMessagePropertyPresentationModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 //TODO: check how to display EventId field in the message properties
@@ -132,7 +132,7 @@ export class UmbLogViewerMessageElement extends UmbLitElement {
 	renderedMessage = '';
 
 	@property({ attribute: false })
-	properties: Array<LogMessagePropertyModel> = [];
+	properties: Array<LogMessagePropertyPresentationModel> = [];
 
 	@property({ type: Boolean })
 	open = false;
@@ -210,7 +210,7 @@ export class UmbLogViewerMessageElement extends UmbLitElement {
 
 	private _propertiesWithSearchMenu: Array<string> = ['HttpRequestNumber', 'SourceContext', 'MachineName'];
 
-	private _findLogsWithProperty({ name, value }: LogMessagePropertyModel) {
+	private _findLogsWithProperty({ name, value }: LogMessagePropertyPresentationModel) {
 		let queryString = '';
 
 		if (isNaN(+(value ?? ''))) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
index 1fc81d55fa..aca5bcf552 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-messages-list.element.ts
@@ -4,7 +4,7 @@ import { css, html } from 'lit';
 import { customElement, query, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DirectionModel, LogMessageModel } from '@umbraco-cms/backend-api';
+import { DirectionModel, LogMessageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-log-viewer-messages-list')
 export class UmbLogViewerMessagesListElement extends UmbLitElement {
@@ -56,7 +56,7 @@ export class UmbLogViewerMessagesListElement extends UmbLitElement {
 	private _sortingDirection: DirectionModel = DirectionModel.ASCENDING;
 
 	@state()
-	private _logs: LogMessageModel[] = [];
+	private _logs: LogMessageResponseModel[] = [];
 
 	@state()
 	private _logsTotal = 0;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
index c4ca1a8ffa..445127aefd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css';
 import { css, html } from 'lit';
 import { customElement, query, state } from 'lit/decorators.js';
 import { UmbLogViewerWorkspaceContext, UMB_APP_LOG_VIEWER_CONTEXT_TOKEN } from '../../../logviewer.context';
-import { SavedLogSearchModel } from '@umbraco-cms/backend-api';
+import { SavedLogSearchResponseModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 @customElement('umb-log-viewer-search-input')
@@ -87,7 +87,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
 	private _savedSearchesExpandSymbol!: UUISymbolExpandElement;
 
 	@state()
-	private _savedSearches: SavedLogSearchModel[] = [];
+	private _savedSearches: SavedLogSearchResponseModel[] = [];
 
 	@state()
 	private _inputQuery = '';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts
index 7ad8352aa4..5335a14efe 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts
@@ -1,4 +1,4 @@
-import type { ContentTreeItemModel, EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import type { ContentTreeItemResponseModel, EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbTreeStore } from '@umbraco-cms/store';
 import type { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbContextToken, UmbContextConsumerController } from '@umbraco-cms/context-api';
@@ -9,7 +9,7 @@ import { UmbTreeRepository } from '@umbraco-cms/repository';
 
 // TODO: Clean up the need for store as Media has switched to use Repositories(repository).
 export class UmbCollectionContext<
-	DataType extends ContentTreeItemModel,
+	DataType extends ContentTreeItemResponseModel,
 	StoreType extends UmbTreeStore<DataType> = UmbTreeStore<DataType>
 > {
 	private _host: UmbControllerHostInterface;
@@ -19,9 +19,9 @@ export class UmbCollectionContext<
 	#repository?: UmbTreeRepository;
 
 	private _store?: StoreType;
-	protected _dataObserver?: UmbObserverController<EntityTreeItemModel[]>;
+	protected _dataObserver?: UmbObserverController<EntityTreeItemResponseModel[]>;
 
-	#data = new ArrayState(<Array<EntityTreeItemModel>>[]);
+	#data = new ArrayState(<Array<EntityTreeItemResponseModel>>[]);
 	public readonly data = this.#data.asObservable();
 
 	#selection = new ArrayState(<Array<string>>[]);
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts
index d34573e22e..79dba7cc90 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts
@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../../../shared/collection/collection.context';
 import type { ManifestDashboardCollection } from '@umbraco-cms/models';
-import type { FolderTreeItemModel } from '@umbraco-cms/backend-api';
+import type { FolderTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 import '../collection.element';
@@ -25,7 +25,7 @@ export class UmbDashboardCollectionElement extends UmbLitElement {
 	];
 
 	// TODO: Use the right type here:
-	private _collectionContext?: UmbCollectionContext<FolderTreeItemModel, any>;
+	private _collectionContext?: UmbCollectionContext<FolderTreeItemResponseModel, any>;
 
 	public manifest!: ManifestDashboardCollection;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts
index 722d32d8fc..dd3c39e2af 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts
@@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../collection.context';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-collection-view-media-grid')
 export class UmbCollectionViewsMediaGridElement extends UmbLitElement {
@@ -65,12 +65,12 @@ export class UmbCollectionViewsMediaGridElement extends UmbLitElement {
 	];
 
 	@state()
-	private _mediaItems?: Array<EntityTreeItemModel>;
+	private _mediaItems?: Array<EntityTreeItemResponseModel>;
 
 	@state()
 	private _selection: Array<string> = [];
 
-	private _collectionContext?: UmbCollectionContext<EntityTreeItemModel>;
+	private _collectionContext?: UmbCollectionContext<EntityTreeItemResponseModel>;
 
 	constructor() {
 		super();
@@ -115,31 +115,31 @@ export class UmbCollectionViewsMediaGridElement extends UmbLitElement {
 		});
 	}
 
-	private _handleOpenItem(mediaItem: EntityTreeItemModel) {
+	private _handleOpenItem(mediaItem: EntityTreeItemResponseModel) {
 		//TODO: Fix when we have dynamic routing
 		history.pushState(null, '', 'section/media/media/edit/' + mediaItem.key);
 	}
 
-	private _handleSelect(mediaItem: EntityTreeItemModel) {
+	private _handleSelect(mediaItem: EntityTreeItemResponseModel) {
 		if (mediaItem.key) {
 			this._collectionContext?.select(mediaItem.key);
 		}
 	}
 
-	private _handleDeselect(mediaItem: EntityTreeItemModel) {
+	private _handleDeselect(mediaItem: EntityTreeItemResponseModel) {
 		if (mediaItem.key) {
 			this._collectionContext?.deselect(mediaItem.key);
 		}
 	}
 
-	private _isSelected(mediaItem: EntityTreeItemModel) {
+	private _isSelected(mediaItem: EntityTreeItemResponseModel) {
 		if (mediaItem.key) {
 			return this._selection.includes(mediaItem.key);
 		}
 		return false;
 	}
 
-	private _renderMediaItem(item: EntityTreeItemModel) {
+	private _renderMediaItem(item: EntityTreeItemResponseModel) {
 		const name = item.name || '';
 		//TODO: fix the file extension when media items have a file extension.
 		return html`<uui-card-media
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts
index 7b3d0be363..f225d490b4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts
@@ -13,7 +13,7 @@ import {
 } from '../../components/table';
 import type { MediaDetails } from '@umbraco-cms/models';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-collection-view-media-table')
 export class UmbCollectionViewMediaTableElement extends UmbLitElement {
@@ -36,7 +36,7 @@ export class UmbCollectionViewMediaTableElement extends UmbLitElement {
 	];
 
 	@state()
-	private _mediaItems?: Array<EntityTreeItemModel>;
+	private _mediaItems?: Array<EntityTreeItemResponseModel>;
 
 	@state()
 	private _tableConfig: UmbTableConfig = {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-culture-select/input-culture-select.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-culture-select/input-culture-select.element.ts
index bdcf53b259..ed3f11f018 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-culture-select/input-culture-select.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-culture-select/input-culture-select.element.ts
@@ -8,7 +8,7 @@ import { UUIComboboxElement, UUIComboboxEvent } from '@umbraco-ui/uui';
 import { UmbCultureRepository } from '../../../settings/cultures/repository/culture.repository';
 import { UmbChangeEvent } from '@umbraco-cms/events';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { CultureModel } from '@umbraco-cms/backend-api';
+import { CultureReponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-input-culture-select')
 export class UmbInputCultureSelectElement extends FormControlMixin(UmbLitElement) {
@@ -33,7 +33,7 @@ export class UmbInputCultureSelectElement extends FormControlMixin(UmbLitElement
 	readonly = false;
 
 	@state()
-	private _cultures: CultureModel[] = [];
+	private _cultures: CultureReponseModel[] = [];
 
 	@state()
 	private _search = '';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts
index b7a16996bc..a2a287ab6f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts
@@ -9,7 +9,7 @@ import { UMB_CONFIRM_MODAL_TOKEN } from '../../modals/confirm';
 import { UMB_DOCUMENT_PICKER_MODAL_TOKEN } from '../../../documents/documents/modals/document-picker';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DocumentTreeItemModel, FolderTreeItemModel } from '@umbraco-cms/backend-api';
+import type { DocumentTreeItemResponseModel, FolderTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbObserverController } from '@umbraco-cms/observable-api';
 
 @customElement('umb-input-document-picker')
@@ -77,11 +77,11 @@ export class UmbInputDocumentPickerElement extends FormControlMixin(UmbLitElemen
 	}
 
 	@state()
-	private _items?: Array<DocumentTreeItemModel>;
+	private _items?: Array<DocumentTreeItemResponseModel>;
 
 	private _modalContext?: UmbModalContext;
 	private _documentStore?: UmbDocumentTreeStore;
-	private _pickedItemsObserver?: UmbObserverController<FolderTreeItemModel>;
+	private _pickedItemsObserver?: UmbObserverController<FolderTreeItemResponseModel>;
 
 	constructor() {
 		super();
@@ -133,7 +133,7 @@ export class UmbInputDocumentPickerElement extends FormControlMixin(UmbLitElemen
 		});
 	}
 
-	private async _removeItem(item: FolderTreeItemModel) {
+	private async _removeItem(item: FolderTreeItemResponseModel) {
 		const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
 			color: 'danger',
 			headline: `Remove ${item.name}?`,
@@ -158,9 +158,9 @@ export class UmbInputDocumentPickerElement extends FormControlMixin(UmbLitElemen
 		`;
 	}
 
-	private _renderItem(item: FolderTreeItemModel) {
+	private _renderItem(item: FolderTreeItemResponseModel) {
 		// TODO: remove when we have a way to handle trashed items
-		const tempItem = item as FolderTreeItemModel & { isTrashed: boolean };
+		const tempItem = item as FolderTreeItemResponseModel & { isTrashed: boolean };
 
 		return html`
 			<uui-ref-node name=${ifDefined(item.name === null ? undefined : item.name)} detail=${ifDefined(item.key)}>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
index c9eb2bd3ca..512cf9d4bd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
@@ -9,7 +9,7 @@ import { UMB_LANGUAGE_PICKER_MODAL_TOKEN } from '../../../settings/languages/mod
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 import { UmbChangeEvent } from '@umbraco-cms/events';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { LanguageModel } from '@umbraco-cms/backend-api';
+import type { LanguageResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbObserverController } from '@umbraco-cms/observable-api';
 
 @customElement('umb-input-language-picker')
@@ -59,7 +59,7 @@ export class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElemen
 	maxMessage = 'This field exceeds the allowed amount of items';
 
 	@property({ type: Object, attribute: false })
-	public filter: (language: LanguageModel) => boolean = () => true;
+	public filter: (language: LanguageResponseModel) => boolean = () => true;
 
 	private _selectedIsoCodes: Array<string> = [];
 	public get selectedIsoCodes(): Array<string> {
@@ -79,11 +79,11 @@ export class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElemen
 	}
 
 	@state()
-	private _items?: Array<LanguageModel>;
+	private _items?: Array<LanguageResponseModel>;
 
 	private _modalContext?: UmbModalContext;
 	private _repository = new UmbLanguageRepository(this);
-	private _pickedItemsObserver?: UmbObserverController<LanguageModel>;
+	private _pickedItemsObserver?: UmbObserverController<LanguageResponseModel>;
 
 	constructor() {
 		super();
@@ -132,7 +132,7 @@ export class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElemen
 		});
 	}
 
-	private _removeItem(item: LanguageModel) {
+	private _removeItem(item: LanguageResponseModel) {
 		const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
 			color: 'danger',
 			headline: `Remove ${item.name}?`,
@@ -165,7 +165,7 @@ export class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElemen
 		`;
 	}
 
-	private _renderItem(item: LanguageModel) {
+	private _renderItem(item: LanguageResponseModel) {
 		return html`
 			<!-- TODO: add language ref element -->
 			<uui-ref-node name=${ifDefined(item.name === null ? undefined : item.name)} detail=${ifDefined(item.isoCode)}>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts
index 8778092f1c..165e02f077 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts
@@ -8,7 +8,7 @@ import { UMB_CONFIRM_MODAL_TOKEN } from '../../modals/confirm';
 import { UMB_MEDIA_PICKER_MODAL_TOKEN } from '../../../media/media/modals/media-picker';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { EntityTreeItemModel, FolderTreeItemModel } from '@umbraco-cms/backend-api';
+import type { EntityTreeItemResponseModel, FolderTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbObserverController } from '@umbraco-cms/observable-api';
 
 @customElement('umb-input-media-picker')
@@ -88,10 +88,10 @@ export class UmbInputMediaPickerElement extends FormControlMixin(UmbLitElement)
 	}
 
 	@state()
-	private _items?: Array<EntityTreeItemModel>;
+	private _items?: Array<EntityTreeItemResponseModel>;
 
 	private _modalContext?: UmbModalContext;
-	private _pickedItemsObserver?: UmbObserverController<FolderTreeItemModel>;
+	private _pickedItemsObserver?: UmbObserverController<FolderTreeItemResponseModel>;
 	private _repository = new UmbMediaRepository(this);
 
 	constructor() {
@@ -147,7 +147,7 @@ export class UmbInputMediaPickerElement extends FormControlMixin(UmbLitElement)
 		});
 	}
 
-	private _removeItem(item: FolderTreeItemModel) {
+	private _removeItem(item: FolderTreeItemResponseModel) {
 		const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
 			color: 'danger',
 			headline: `Remove ${item.name}?`,
@@ -177,9 +177,9 @@ export class UmbInputMediaPickerElement extends FormControlMixin(UmbLitElement)
 		</uui-button>`;
 	}
 
-	private _renderItem(item: FolderTreeItemModel) {
+	private _renderItem(item: FolderTreeItemResponseModel) {
 		// TODO: remove when we have a way to handle trashed items
-		const tempItem = item as FolderTreeItemModel & { isTrashed: boolean };
+		const tempItem = item as FolderTreeItemResponseModel & { isTrashed: boolean };
 
 		return html`
 			<uui-card-media
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property-type-based-property/property-type-based-property.element.ts
index 2e26102210..049588af6a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property-type-based-property/property-type-based-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property-type-based-property/property-type-based-property.element.ts
@@ -5,7 +5,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { UmbDataTypeRepository } from '../../../settings/data-types/repository/data-type.repository';
 import { UmbVariantId } from '../../variants/variant-id.class';
 import { UmbDocumentWorkspaceContext } from '../../../documents/documents/workspace/document-workspace.context';
-import type { DataTypeModel, DataTypePropertyModel, PropertyTypeViewModelBaseModel } from '@umbraco-cms/backend-api';
+import type { DataTypeResponseModel, DataTypePropertyPresentationModel, PropertyTypeResponseModelBaseModel } from '@umbraco-cms/backend-api';
 import '../workspace-property/workspace-property.element';
 import { UmbLitElement } from '@umbraco-cms/element';
 import { UmbObserverController } from '@umbraco-cms/observable-api';
@@ -22,10 +22,10 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 	];
 
 	@property({ type: Object, attribute: false })
-	public get property(): PropertyTypeViewModelBaseModel | undefined {
+	public get property(): PropertyTypeResponseModelBaseModel | undefined {
 		return this._property;
 	}
-	public set property(value: PropertyTypeViewModelBaseModel | undefined) {
+	public set property(value: PropertyTypeResponseModelBaseModel | undefined) {
 		const oldProperty = this._property;
 		this._property = value;
 		if (this._property?.dataTypeKey !== oldProperty?.dataTypeKey) {
@@ -33,16 +33,16 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 			this._observeProperty();
 		}
 	}
-	private _property?: PropertyTypeViewModelBaseModel;
+	private _property?: PropertyTypeResponseModelBaseModel;
 
 	@state()
 	private _propertyEditorUiAlias?: string;
 
 	@state()
-	private _dataTypeData: DataTypePropertyModel[] = [];
+	private _dataTypeData: DataTypePropertyPresentationModel[] = [];
 
 	private _dataTypeRepository: UmbDataTypeRepository = new UmbDataTypeRepository(this);
-	private _dataTypeObserver?: UmbObserverController<DataTypeModel | null>;
+	private _dataTypeObserver?: UmbObserverController<DataTypeResponseModel | null>;
 
 	@state()
 	private _value?: unknown;
@@ -98,7 +98,7 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 			this._dataTypeObserver = this.observe(
 				await this._dataTypeRepository.byKey(dataTypeKey),
 				(dataType) => {
-					this._dataTypeData = dataType?.data || [];
+					this._dataTypeData = dataType?.values || [];
 					this._propertyEditorUiAlias = dataType?.propertyEditorUiAlias || undefined;
 				},
 				'observeDataType'
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
index 6baa96b9c7..9d8d713690 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts
@@ -9,7 +9,7 @@ import {
 } from '../workspace/workspace-variant/workspace-variant.context';
 import { ActiveVariant } from '../workspace/workspace-context/workspace-split-view-manager.class';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { DocumentVariantModel } from '@umbraco-cms/backend-api';
+import type { DocumentVariantResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-variant-selector')
 export class UmbVariantSelectorElement extends UmbLitElement {
@@ -50,7 +50,7 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 	alias!: string;
 
 	@state()
-	_variants: Array<DocumentVariantModel> = [];
+	_variants: Array<DocumentVariantResponseModel> = [];
 
 	// TODO: Stop using document context specific ActiveVariant type.
 	@state()
@@ -178,12 +178,12 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 		this._variantSelectorIsOpen = false;
 	}
 
-	private _switchVariant(variant: DocumentVariantModel) {
+	private _switchVariant(variant: DocumentVariantResponseModel) {
 		this._variantContext?.switchVariant(variant);
 		this._close();
 	}
 
-	private _openSplitView(variant: DocumentVariantModel) {
+	private _openSplitView(variant: DocumentVariantResponseModel) {
 		this._variantContext?.openSplitView(variant);
 		this._close();
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.element.ts
index 35cd55ba18..1441bd9fc0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variantable-property/variantable-property.element.ts
@@ -3,7 +3,7 @@ import { css, html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { UmbVariantId } from '../../variants/variant-id.class';
 import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../workspace/workspace-variant/workspace-variant.context';
-import type { PropertyTypeViewModelBaseModel } from '@umbraco-cms/backend-api';
+import type { PropertyTypeResponseModelBaseModel } from '@umbraco-cms/backend-api';
 import '../workspace-property/workspace-property.element';
 import { UmbLitElement } from '@umbraco-cms/element';
 
@@ -18,12 +18,12 @@ export class UmbVariantablePropertyElement extends UmbLitElement {
 		`,
 	];
 
-	private _property?: PropertyTypeViewModelBaseModel | undefined;
+	private _property?: PropertyTypeResponseModelBaseModel | undefined;
 	@property({ type: Object, attribute: false })
-	public get property(): PropertyTypeViewModelBaseModel | undefined {
+	public get property(): PropertyTypeResponseModelBaseModel | undefined {
 		return this._property;
 	}
-	public set property(property: PropertyTypeViewModelBaseModel | undefined) {
+	public set property(property: PropertyTypeResponseModelBaseModel | undefined) {
 		this._property = property;
 		this._updatePropertyVariantId();
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts
index 5474e323a9..7f6cf7aa62 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts
@@ -1,7 +1,7 @@
 import { UmbVariantId } from '../../variants/variant-id.class';
 import { UmbWorkspaceVariableEntityContextInterface } from '../workspace/workspace-context/workspace-variable-entity-context.interface';
 import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../workspace/workspace-variant/workspace-variant.context';
-import type { DataTypeModel } from '@umbraco-cms/backend-api';
+import type { DataTypeResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { ObjectState, StringState, UmbObserverController } from '@umbraco-cms/observable-api';
 import { UmbContextConsumerController, UmbContextProviderController } from '@umbraco-cms/context-api';
@@ -12,7 +12,7 @@ export type WorkspacePropertyData<ValueType> = {
 	label?: string;
 	description?: string;
 	value?: ValueType | null;
-	config?: DataTypeModel['data']; // This could potentially then come from hardcoded JS object and not the DataType store.
+	config?: DataTypeResponseModel['values']; // This could potentially then come from hardcoded JS object and not the DataType store.
 };
 
 export class UmbWorkspacePropertyContext<ValueType = unknown> {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts
index 634b4a8d7c..e670c5d8e8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts
@@ -11,7 +11,7 @@ import '../../property-actions/shared/property-action-menu/property-action-menu.
 import '../../../../backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.element';
 import { UmbObserverController } from '@umbraco-cms/observable-api';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 
 /**
@@ -114,7 +114,7 @@ export class UmbWorkspacePropertyElement extends UmbLitElement {
 	 * @default ''
 	 */
 	@property({ type: Object, attribute: false })
-	public set config(value: DataTypePropertyModel[]) {
+	public set config(value: DataTypePropertyPresentationModel[]) {
 		this._propertyContext.setConfig(value);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
index c171c79007..08036ec074 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
@@ -10,7 +10,7 @@ import {
 import '../../../../../../shared/collection/dashboards/dashboard-collection.element';
 import type { UmbWorkspaceEntityContextInterface } from '../../../workspace-context/workspace-entity-context.interface';
 import { UmbLitElement } from '@umbraco-cms/element';
-import type { FolderTreeItemModel } from '@umbraco-cms/backend-api';
+import type { FolderTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import { ManifestWorkspaceViewCollection } from '@umbraco-cms/extensions-registry';
 
 @customElement('umb-workspace-view-collection')
@@ -30,7 +30,7 @@ export class UmbWorkspaceViewCollectionElement extends UmbLitElement {
 	private _workspaceContext?: UmbWorkspaceEntityContextInterface;
 
 	// TODO: add type for the collection context.
-	private _collectionContext?: UmbCollectionContext<FolderTreeItemModel, any>;
+	private _collectionContext?: UmbCollectionContext<FolderTreeItemResponseModel, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts
index 3a884755fb..a5ad8372e2 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts
@@ -4,7 +4,7 @@ import { repeat } from 'lit/directives/repeat.js';
 import { customElement, state } from 'lit/decorators.js';
 import { UUIPaginationEvent } from '@umbraco-ui/uui';
 import { UmbWorkspaceEntityContextInterface } from '../../../workspace-context/workspace-entity-context.interface';
-import type { DocumentModel } from '@umbraco-cms/backend-api';
+import type { DocumentResponseModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 interface HistoryNode {
@@ -184,14 +184,14 @@ export class UmbWorkspaceViewContentInfoElement extends UmbLitElement {
 	@state()
 	private _nodeName = '';
 
-	private _workspaceContext?: UmbWorkspaceEntityContextInterface<DocumentModel>;
+	private _workspaceContext?: UmbWorkspaceEntityContextInterface<DocumentResponseModel>;
 	private itemsPerPage = 10;
 
 	constructor() {
 		super();
 
 		// TODO: Figure out how to get the magic string for the workspace context.
-		this.consumeContext<UmbWorkspaceEntityContextInterface<DocumentModel>>('umbWorkspaceContext', (nodeContext) => {
+		this.consumeContext<UmbWorkspaceEntityContextInterface<DocumentResponseModel>>('umbWorkspaceContext', (nodeContext) => {
 			this._workspaceContext = nodeContext;
 			this._observeContent();
 		});
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/entity-manager-controller.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/entity-manager-controller.ts
index 62c920a95a..08137a4d6f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/entity-manager-controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/entity-manager-controller.ts
@@ -7,14 +7,14 @@ import {
 	UMB_NOTIFICATION_CONTEXT_TOKEN,
 } from '@umbraco-cms/notification';
 import { ObjectState, UmbObserverController } from '@umbraco-cms/observable-api';
-import type { EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import type { EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import { UmbEntityDetailStore } from '@umbraco-cms/store';
 
 // Extend entityType base type?, so we are sure to have parentKey?
 // TODO: switch to use EntityDetailItem ? if we can have such type?
 export class UmbEntityWorkspaceManager<
 	StoreType extends UmbEntityDetailStore<EntityDetailsType>,
-	EntityDetailsType extends EntityTreeItemModel = ReturnType<StoreType['getScaffold']>
+	EntityDetailsType extends EntityTreeItemResponseModel = ReturnType<StoreType['getScaffold']>
 > {
 	private _host;
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts
index 85bfff1251..3229482494 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-invariantable-entity-context.interface.ts
@@ -1,13 +1,13 @@
 import type { Observable } from 'rxjs';
 import type { UmbWorkspaceEntityContextInterface } from './workspace-entity-context.interface';
-import type { ValueViewModelBaseModel } from '@umbraco-cms/backend-api';
+import type { ValueModelBaseModel } from '@umbraco-cms/backend-api';
 
 export interface UmbWorkspaceInvariantableEntityContextInterface<T = unknown>
 	extends UmbWorkspaceEntityContextInterface<T> {
 	getName(): void;
 	setName(name: string): void;
 
-	propertyDataByAlias(alias: string): Observable<ValueViewModelBaseModel | undefined>;
+	propertyDataByAlias(alias: string): Observable<ValueModelBaseModel | undefined>;
 	propertyValueByAlias(alias: string): Observable<any | undefined>;
 	getPropertyValue(alias: string): void;
 	setPropertyValue(alias: string, value: unknown): void;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-property-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-property-structure-manager.class.ts
index 96a9c72b21..f067de9822 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-property-structure-manager.class.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-property-structure-manager.class.ts
@@ -1,8 +1,8 @@
 import { UmbDocumentTypeRepository } from '../../../../documents/document-types/repository/document-type.repository';
 import {
-	DocumentTypeModel,
-	DocumentTypePropertyTypeModel,
-	PropertyTypeContainerViewModelBaseModel,
+	DocumentTypeResponseModel,
+	DocumentTypePropertyTypeResponseModel,
+	PropertyTypeContainerResponseModelBaseModel,
 } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { ArrayState, UmbObserverController } from '@umbraco-cms/observable-api';
@@ -10,7 +10,7 @@ import { ArrayState, UmbObserverController } from '@umbraco-cms/observable-api';
 export type PropertyContainerTypes = 'Group' | 'Tab';
 
 // TODO: get this type from the repository, or use some generic type.
-type T = DocumentTypeModel;
+type T = DocumentTypeResponseModel;
 
 // TODO: make general interface for NodeTypeRepository, to replace UmbDocumentTypeRepository:
 export class UmbWorkspacePropertyStructureManager<R extends UmbDocumentTypeRepository = UmbDocumentTypeRepository> {
@@ -20,7 +20,7 @@ export class UmbWorkspacePropertyStructureManager<R extends UmbDocumentTypeRepos
 
 	#documentTypes = new ArrayState<T>([], (x) => x.key);
 
-	#containers = new ArrayState<PropertyTypeContainerViewModelBaseModel>([], (x) => x.key);
+	#containers = new ArrayState<PropertyTypeContainerResponseModelBaseModel>([], (x) => x.key);
 
 	constructor(host: UmbControllerHostInterface, typeRepository: R) {
 		this.#host = host;
@@ -85,7 +85,7 @@ export class UmbWorkspacePropertyStructureManager<R extends UmbDocumentTypeRepos
 	}
 	propertyStructuresOf(containerKey: string | null) {
 		return this.#documentTypes.getObservablePart((docTypes) => {
-			const props: DocumentTypePropertyTypeModel[] = [];
+			const props: DocumentTypePropertyTypeResponseModel[] = [];
 			docTypes.forEach((docType) => {
 				docType.properties?.forEach((property) => {
 					if (property.containerKey === containerKey) {
@@ -110,7 +110,7 @@ export class UmbWorkspacePropertyStructureManager<R extends UmbDocumentTypeRepos
 	}
 
 	containersOfParentKey(
-		parentKey: PropertyTypeContainerViewModelBaseModel['parentKey'],
+		parentKey: PropertyTypeContainerResponseModelBaseModel['parentKey'],
 		containerType: PropertyContainerTypes
 	) {
 		return this.#containers.getObservablePart((data) => {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts
index 7167156eea..1eb88c1aea 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts
@@ -2,19 +2,19 @@ import type { Observable } from 'rxjs';
 import { UmbVariantId } from '../../../variants/variant-id.class';
 import type { UmbWorkspaceEntityContextInterface } from './workspace-entity-context.interface';
 import { UmbWorkspaceSplitViewManager } from './workspace-split-view-manager.class';
-import type { ValueViewModelBaseModel, VariantViewModelBaseModel } from '@umbraco-cms/backend-api';
+import type { ValueModelBaseModel, VariantResponseModelBaseModel } from '@umbraco-cms/backend-api';
 
 export interface UmbWorkspaceVariableEntityContextInterface<T = unknown> extends UmbWorkspaceEntityContextInterface<T> {
-	variants: Observable<Array<VariantViewModelBaseModel>>;
+	variants: Observable<Array<VariantResponseModelBaseModel>>;
 
 	splitView: UmbWorkspaceSplitViewManager;
 
 	getName(variantId?: UmbVariantId): void;
 	setName(name: string, variantId?: UmbVariantId): void;
 
-	getVariant(variantId: UmbVariantId): VariantViewModelBaseModel | undefined;
+	getVariant(variantId: UmbVariantId): VariantResponseModelBaseModel | undefined;
 
-	propertyDataByAlias(alias: string, variantId?: UmbVariantId): Observable<ValueViewModelBaseModel | undefined>;
+	propertyDataByAlias(alias: string, variantId?: UmbVariantId): Observable<ValueModelBaseModel | undefined>;
 	propertyValueByAlias(alias: string, variantId?: UmbVariantId): Observable<any | undefined>;
 	getPropertyValue(alias: string, variantId?: UmbVariantId): void;
 	setPropertyValue(alias: string, value: unknown, variantId?: UmbVariantId): void;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts
index 1247db88b2..028f6239a8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts
@@ -4,7 +4,7 @@ import type { UmbInputDocumentPickerElement } from '../../../components/input-do
 import { UmbPropertyEditorElement } from '@umbraco-cms/property-editor';
 import { UmbLitElement } from '@umbraco-cms/element';
 import '../../../components/input-document-picker/input-document-picker.element';
-import type { DataTypePropertyModel } from '@umbraco-cms/backend-api';
+import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-property-editor-ui-document-picker')
 export class UmbPropertyEditorUIContentPickerElement extends UmbLitElement implements UmbPropertyEditorElement {
@@ -19,7 +19,7 @@ export class UmbPropertyEditorUIContentPickerElement extends UmbLitElement imple
 	}
 
 	@property({ type: Array, attribute: false })
-	public set config(config: Array<DataTypePropertyModel>) {
+	public set config(config: Array<DataTypePropertyPresentationModel>) {
 		const validationLimit = config.find((x) => x.alias === 'validationLimit');
 
 		this._limitMin = (validationLimit?.value as any).min;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts
index 35c6f99794..f1aedc8712 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/index.ts
@@ -1,8 +1,8 @@
 import type { DataSourceResponse } from '@umbraco-cms/models';
-import type { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/backend-api';
+import type { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 export interface TemplateTreeDataSource {
-	getRootItems(): Promise<DataSourceResponse<PagedEntityTreeItemModel>>;
-	getChildrenOf(parentKey: string): Promise<DataSourceResponse<PagedEntityTreeItemModel>>;
-	getItems(key: Array<string>): Promise<DataSourceResponse<EntityTreeItemModel[]>>;
+	getRootItems(): Promise<DataSourceResponse<PagedEntityTreeItemResponseModel>>;
+	getChildrenOf(parentKey: string): Promise<DataSourceResponse<PagedEntityTreeItemResponseModel>>;
+	getItems(key: Array<string>): Promise<DataSourceResponse<EntityTreeItemResponseModel[]>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts
index 0d6f39e347..f689c80083 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/sources/template.detail.server.data.ts
@@ -1,14 +1,14 @@
 import { v4 as uuid } from 'uuid';
-import { ProblemDetailsModel, TemplateModel, TemplateResource } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, TemplateResponseModel, TemplateResource } from '@umbraco-cms/backend-api';
 import type { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 import type { DataSourceResponse } from '@umbraco-cms/models';
 
 export interface TemplateDetailDataSource {
-	createScaffold(): Promise<DataSourceResponse<TemplateModel>>;
-	get(key: string): Promise<DataSourceResponse<TemplateModel>>;
-	insert(template: TemplateModel): Promise<DataSourceResponse>;
-	update(template: TemplateModel): Promise<DataSourceResponse>;
+	createScaffold(): Promise<DataSourceResponse<TemplateResponseModel>>;
+	get(key: string): Promise<DataSourceResponse<TemplateResponseModel>>;
+	insert(template: TemplateResponseModel): Promise<DataSourceResponse>;
+	update(template: TemplateResponseModel): Promise<DataSourceResponse>;
 	delete(key: string): Promise<DataSourceResponse>;
 }
 
@@ -48,7 +48,7 @@ export class UmbTemplateDetailServerDataSource implements TemplateDetailDataSour
 	 */
 	async createScaffold() {
 		const error = undefined;
-		const data: TemplateModel = {
+		const data: TemplateResponseModel = {
 			$type: '',
 			key: uuid(),
 			name: '',
@@ -77,7 +77,7 @@ export class UmbTemplateDetailServerDataSource implements TemplateDetailDataSour
 	 * @return {*}
 	 * @memberof UmbTemplateDetailServerDataSource
 	 */
-	async insert(template: TemplateModel) {
+	async insert(template: TemplateResponseModel) {
 		const payload = { requestBody: template };
 		// TODO: fix type mismatch
 		return tryExecuteAndNotify(
@@ -92,7 +92,7 @@ export class UmbTemplateDetailServerDataSource implements TemplateDetailDataSour
 	 * @return {*}
 	 * @memberof UmbTemplateDetailServerDataSource
 	 */
-	async update(template: TemplateModel) {
+	async update(template: TemplateResponseModel) {
 		if (!template.key) {
 			const error: ProblemDetailsModel = { title: 'Template key is missing' };
 			return { error };
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.repository.ts
index 3c8cf551b1..ceab20906a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.repository.ts
@@ -5,11 +5,11 @@ import { UmbTemplateTreeStore, UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN } from './t
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/notification';
 import { UmbContextConsumerController } from '@umbraco-cms/context-api';
-import { ProblemDetailsModel, TemplateModel } from '@umbraco-cms/backend-api';
+import { ProblemDetailsModel, TemplateResponseModel } from '@umbraco-cms/backend-api';
 import { UmbDetailRepository } from 'libs/repository/detail-repository.interface';
 import { UmbTreeRepository } from 'libs/repository/tree-repository.interface';
 
-export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailRepository<TemplateModel> {
+export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailRepository<TemplateResponseModel> {
 	#init;
 	#host: UmbControllerHostInterface;
 
@@ -135,7 +135,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
 
 	// Could potentially be general methods:
 
-	async create(template: TemplateModel) {
+	async create(template: TemplateResponseModel) {
 		await this.#init;
 
 		if (!template || !template.key) {
@@ -157,7 +157,7 @@ export class UmbTemplateRepository implements UmbTreeRepository, UmbDetailReposi
 		return { error };
 	}
 
-	async save(template: TemplateModel) {
+	async save(template: TemplateResponseModel) {
 		await this.#init;
 
 		if (!template || !template.key) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.store.ts
index 0051164f79..516c846430 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/repository/template.store.ts
@@ -1,7 +1,7 @@
 import { UmbContextToken } from '@umbraco-cms/context-api';
 import { ArrayState } from '@umbraco-cms/observable-api';
 import { UmbStoreBase } from '@umbraco-cms/store';
-import type { TemplateModel } from '@umbraco-cms/backend-api';
+import type { TemplateResponseModel } from '@umbraco-cms/backend-api';
 import type { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
 /**
@@ -11,7 +11,7 @@ import type { UmbControllerHostInterface } from '@umbraco-cms/controller';
  * @description - Data Store for Templates
  */
 export class UmbTemplateStore extends UmbStoreBase {
-	#data = new ArrayState<TemplateModel>([], (x) => x.key);
+	#data = new ArrayState<TemplateResponseModel>([], (x) => x.key);
 
 	/**
 	 * Creates an instance of UmbTemplateStore.
@@ -27,7 +27,7 @@ export class UmbTemplateStore extends UmbStoreBase {
 	 * @param {Template} template
 	 * @memberof UmbTemplateStore
 	 */
-	append(template: TemplateModel) {
+	append(template: TemplateResponseModel) {
 		this.#data.append([template]);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.context.ts
index 16886f30de..8677e10898 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.context.ts
@@ -1,11 +1,11 @@
 import { UmbTemplateRepository } from '../repository/template.repository';
 import { UmbWorkspaceContext } from '../../../shared/components/workspace/workspace-context/workspace-context';
 import { createObservablePart, DeepState } from '@umbraco-cms/observable-api';
-import { TemplateModel } from '@umbraco-cms/backend-api';
+import { TemplateResponseModel } from '@umbraco-cms/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 
 export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext<UmbTemplateRepository> {
-	#data = new DeepState<TemplateModel | undefined>(undefined);
+	#data = new DeepState<TemplateResponseModel | undefined>(undefined);
 	data = this.#data.asObservable();
 	name = createObservablePart(this.#data, (data) => data?.name);
 	content = createObservablePart(this.#data, (data) => data?.content);
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts
index 38b5625580..57136031c7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts
@@ -4,12 +4,9 @@ import { customElement, state } from 'lit/decorators.js';
 import { when } from 'lit-html/directives/when.js';
 import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '../../../../backoffice/shared/components/table';
 import { UmbDictionaryRepository } from '../../dictionary/repository/dictionary.repository';
-import {
-	UmbCreateDictionaryModalResult,
-	UMB_CREATE_DICTIONARY_MODAL_TOKEN,
-} from '../../dictionary/entity-actions/create/';
+import { UMB_CREATE_DICTIONARY_MODAL_TOKEN } from '../../dictionary/entity-actions/create/';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DictionaryOverviewModel, LanguageModel } from '@umbraco-cms/backend-api';
+import { DictionaryOverviewResponseModel, LanguageResponseModel } from '@umbraco-cms/backend-api';
 import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal';
 import { UmbContextConsumerController } from '@umbraco-cms/context-api';
 
@@ -50,7 +47,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 	@state()
 	private _tableItemsFiltered: Array<UmbTableItem> = [];
 
-	#dictionaryItems: DictionaryOverviewModel[] = [];
+	#dictionaryItems: DictionaryOverviewResponseModel[] = [];
 
 	#repo!: UmbDictionaryRepository;
 
@@ -60,7 +57,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 
 	#tableColumns: Array<UmbTableColumn> = [];
 
-	#languages: Array<LanguageModel> = [];
+	#languages: Array<LanguageResponseModel> = [];
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts
index b178a42ac3..4eba5b2679 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts
@@ -6,7 +6,7 @@ import { repeat } from 'lit/directives/repeat.js';
 import { UmbTreeElement } from '../../../../shared/components/tree/tree.element';
 import { UmbDictionaryRepository } from '../../repository/dictionary.repository';
 import { UmbImportDictionaryModalData, UmbImportDictionaryModalResult } from '.';
-import { DictionaryUploadModel } from '@umbraco-cms/backend-api';
+import { UploadDictionaryResponseModel } from '@umbraco-cms/backend-api';
 import { UmbModalBaseElement } from '@umbraco-cms/modal';
 
 @customElement('umb-import-dictionary-modal-layout')
@@ -27,7 +27,7 @@ export class UmbImportDictionaryModalLayoutElement extends UmbModalBaseElement<
 	private _form!: HTMLFormElement;
 
 	@state()
-	private _uploadedDictionary?: DictionaryUploadModel;
+	private _uploadedDictionary?: UploadDictionaryResponseModel;
 
 	@state()
 	private _showUploadView = true;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.detail.server.data.ts
index 8606fa42fe..98fe5572d1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.detail.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.detail.server.data.ts
@@ -2,7 +2,7 @@ import { DictionaryDetailDataSource } from './dictionary.details.server.data.int
 import { UmbControllerHostInterface } from '@umbraco-cms/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/resources';
 import {
-	DictionaryItemCreateModel,
+	CreateDictionaryItemRequestModel,
 	DictionaryResource,
 	LanguageResource,
 	ProblemDetailsModel,
@@ -80,7 +80,7 @@ export class UmbDictionaryDetailServerDataSource implements DictionaryDetailData
 	 * @memberof UmbDictionaryDetailServerDataSource
 	 */
 	async insert(data: DictionaryDetails) {
-		const requestBody: DictionaryItemCreateModel = {
+		const requestBody: CreateDictionaryItemRequestModel = {
 			parentKey: data.parentKey,
 			name: data.name,
 		};
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts
index 238702d0bc..df4bb03087 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/repository/sources/dictionary.details.server.data.interface.ts
@@ -1,21 +1,21 @@
 import {
-	DictionaryItemModel,
-	DictionaryUploadModel,
-	PagedDictionaryOverviewModel,
-	PagedLanguageModel,
+	DictionaryItemResponseModel,
+	UploadDictionaryResponseModel,
+	PagedDictionaryOverviewResponseModel,
+	PagedLanguageResponseModel,
 } from '@umbraco-cms/backend-api';
 import type { DataSourceResponse, DictionaryDetails } from '@umbraco-cms/models';
 
 export interface DictionaryDetailDataSource {
-	createScaffold(parentKey: string): Promise<DataSourceResponse<DictionaryItemModel>>;
-	list(skip?: number, take?: number): Promise<DataSourceResponse<PagedDictionaryOverviewModel>>;
-	get(key: string): Promise<DataSourceResponse<DictionaryItemModel>>;
+	createScaffold(parentKey: string): Promise<DataSourceResponse<DictionaryItemResponseModel>>;
+	list(skip?: number, take?: number): Promise<DataSourceResponse<PagedDictionaryOverviewResponseModel>>;
+	get(key: string): Promise<DataSourceResponse<DictionaryItemResponseModel>>;
 	insert(data: DictionaryDetails): Promise<DataSourceResponse>;
-	update(dictionary: DictionaryItemModel): Promise<DataSourceResponse>;
+	update(dictionary: DictionaryItemResponseModel): Promise<DataSourceResponse>;
 	delete(key: string): Promise<DataSourceResponse>;
 	export(key: string, includeChildren: boolean): Promise<DataSourceResponse<Blob>>;
 	import(fileName: string, parentKey?: string): Promise<DataSourceResponse<any>>;
-	upload(formData: FormData): Promise<DataSourceResponse<DictionaryUploadModel>>;
+	upload(formData: FormData): Promise<DataSourceResponse<UploadDictionaryResponseModel>>;
 	// TODO - temp only
-	getLanguages(): Promise<DataSourceResponse<PagedLanguageModel>>;
+	getLanguages(): Promise<DataSourceResponse<PagedLanguageResponseModel>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/views/edit/workspace-view-dictionary-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/views/edit/workspace-view-dictionary-edit.element.ts
index 7ca550a636..0fab1050ed 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/views/edit/workspace-view-dictionary-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/views/edit/workspace-view-dictionary-edit.element.ts
@@ -7,7 +7,7 @@ import { UUITextareaElement, UUITextareaEvent } from '@umbraco-ui/uui';
 import { UmbWorkspaceDictionaryContext } from '../../dictionary-workspace.context';
 import { UmbDictionaryRepository } from '../../../repository/dictionary.repository';
 import { UmbLitElement } from '@umbraco-cms/element';
-import { DictionaryItemModel, LanguageModel } from '@umbraco-cms/backend-api';
+import { DictionaryItemResponseModel, LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 @customElement('umb-workspace-view-dictionary-edit')
 export class UmbWorkspaceViewDictionaryEditElement extends UmbLitElement {
@@ -22,12 +22,12 @@ export class UmbWorkspaceViewDictionaryEditElement extends UmbLitElement {
 	];
 
 	@state()
-	private _dictionary?: DictionaryItemModel;
+	private _dictionary?: DictionaryItemResponseModel;
 
 	#repo!: UmbDictionaryRepository;
 
 	@state()
-	private _languages: Array<LanguageModel> = [];
+	private _languages: Array<LanguageResponseModel> = [];
 
 	#workspaceContext!: UmbWorkspaceDictionaryContext;
 
@@ -49,7 +49,7 @@ export class UmbWorkspaceViewDictionaryEditElement extends UmbLitElement {
 		});
 	}
 
-	#renderTranslation(language: LanguageModel) {
+	#renderTranslation(language: LanguageResponseModel) {
 		if (!language.isoCode) return;
 
 		const translation = this._dictionary?.translations?.find((x) => x.isoCode === language.isoCode);
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/culture.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/culture.data.ts
index 87d0f3904d..8d8bbc82b6 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/culture.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/culture.data.ts
@@ -1,12 +1,12 @@
-import type { CultureModel, PagedCultureModel } from '@umbraco-cms/backend-api';
+import type { CultureReponseModel, PagedCultureReponseModel } from '@umbraco-cms/backend-api';
 
 class UmbCulturesData {
-	get(): PagedCultureModel {
+	get(): PagedCultureReponseModel {
 		return { total: culturesMock.length, items: culturesMock };
 	}
 }
 
-export const culturesMock: Array<CultureModel> = [
+export const culturesMock: Array<CultureReponseModel> = [
 	{
 		name: 'af',
 		englishName: 'Afrikaans',
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
index fd0b0b01c0..f3d7a0071c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
@@ -1,9 +1,9 @@
 import { UmbEntityData } from './entity.data';
 import { createFolderTreeItem } from './utils';
-import type { FolderTreeItemModel, DataTypeModel } from '@umbraco-cms/backend-api';
+import type { FolderTreeItemResponseModel, DataTypeResponseModel } from '@umbraco-cms/backend-api';
 
 // TODO: investigate why we don't get an entity type as part of the DataTypeModel
-export const data: Array<DataTypeModel & { type: 'data-type' }> = [
+export const data: Array<DataTypeResponseModel & { type: 'data-type' }> = [
 	{
 		$type: 'data-type',
 		type: 'data-type',
@@ -12,7 +12,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		name: 'Textstring',
 		propertyEditorAlias: 'Umbraco.TextBox',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.TextBox',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -22,7 +22,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.TextBox',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.TextBox',
-		data: [
+		values: [
 			{
 				alias: 'maxChars',
 				value: 10,
@@ -37,7 +37,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.TextArea',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.TextArea',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -47,7 +47,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.JSON',
 		propertyEditorUiAlias: 'My.PropertyEditorUI.Custom',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -57,7 +57,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.ColorPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.ColorPicker',
-		data: [
+		values: [
 			{
 				alias: 'useLabel',
 				value: true,
@@ -113,7 +113,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.ContentPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.DocumentPicker',
-		data: [
+		values: [
 			{
 				alias: 'validationLimit',
 				value: { min: 2, max: 4 },
@@ -128,7 +128,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.ColorPicker.EyeDropper',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.EyeDropper',
-		data: [
+		values: [
 			{
 				//showPalette
 				alias: 'palette',
@@ -165,7 +165,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MultiUrlPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.MultiUrlPicker',
-		data: [
+		values: [
 			{
 				alias: 'overlaySize',
 				value: 'small',
@@ -196,7 +196,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MultiNodeTreePicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.TreePicker',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -206,7 +206,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.DateTime',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.DatePicker',
-		data: [
+		values: [
 			{
 				alias: 'format',
 				value: 'YYYY-MM-DD',
@@ -225,7 +225,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.DateTime',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.DatePicker',
-		data: [
+		values: [
 			{
 				alias: 'format',
 				value: 'YYYY-MM-DD HH:mm:ss',
@@ -244,7 +244,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.DateTime',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.DatePicker',
-		data: [
+		values: [
 			{
 				alias: 'format',
 				value: 'HH:mm:ss',
@@ -263,7 +263,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.EmailAddress',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Email',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -273,7 +273,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MultipleTextString',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.MultipleTextString',
-		data: [
+		values: [
 			{
 				alias: 'minNumber',
 				value: 2,
@@ -292,7 +292,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.DropDown.Flexible',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Dropdown',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -302,7 +302,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.Slider',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Slider',
-		data: [
+		values: [
 			{
 				alias: 'enableRange',
 				value: true,
@@ -337,7 +337,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.TrueFalse',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Toggle',
-		data: [
+		values: [
 			{
 				alias: 'default',
 				value: false,
@@ -364,7 +364,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.Tags',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Tags',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -374,7 +374,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MarkdownEditor',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.MarkdownEditor',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -384,7 +384,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.RadioButtonList',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.RadioButtonList',
-		data: [
+		values: [
 			{
 				alias: 'items',
 				value: {
@@ -403,7 +403,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.CheckboxList',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.CheckboxList',
-		data: [
+		values: [
 			{
 				alias: 'items',
 				value: {
@@ -422,7 +422,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.BlockList',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.BlockList',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -432,7 +432,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MediaPicker3',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.MediaPicker',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -442,7 +442,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.ImageCropper',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.ImageCropper',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -452,7 +452,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.UploadField',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.UploadField',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -462,7 +462,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.BlockGrid',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.BlockGrid',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -472,7 +472,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.ListView',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.CollectionView',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -482,7 +482,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.IconPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.IconPicker',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -492,7 +492,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.JSON',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.NumberRange',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -502,7 +502,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.JSON',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.OrderDirection',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -512,7 +512,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.JSON',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.OverlaySize',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -522,7 +522,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.TinyMCE',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -532,7 +532,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.Label',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Label',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -542,7 +542,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.Integer',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Integer',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -552,7 +552,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.Decimal',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.Decimal',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -562,7 +562,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.UserPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.UserPicker',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -572,7 +572,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MemberPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.MemberPicker',
-		data: [],
+		values: [],
 	},
 	{
 		$type: 'data-type',
@@ -582,7 +582,7 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 		parentKey: null,
 		propertyEditorAlias: 'Umbraco.MemberGroupPicker',
 		propertyEditorUiAlias: 'Umb.PropertyEditorUI.MemberGroupPicker',
-		data: [],
+		values: [],
 	},
 ];
 
@@ -590,22 +590,22 @@ export const data: Array<DataTypeModel & { type: 'data-type' }> = [
 // TODO: all properties are optional in the server schema. I don't think this is correct.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-class UmbDataTypeData extends UmbEntityData<DataTypeModel> {
+class UmbDataTypeData extends UmbEntityData<DataTypeResponseModel> {
 	constructor() {
 		super(data);
 	}
 
-	getTreeRoot(): Array<FolderTreeItemModel> {
+	getTreeRoot(): Array<FolderTreeItemResponseModel> {
 		const rootItems = this.data.filter((item) => item.parentKey === null);
 		return rootItems.map((item) => createFolderTreeItem(item));
 	}
 
-	getTreeItemChildren(key: string): Array<FolderTreeItemModel> {
+	getTreeItemChildren(key: string): Array<FolderTreeItemResponseModel> {
 		const childItems = this.data.filter((item) => item.parentKey === key);
 		return childItems.map((item) => createFolderTreeItem(item));
 	}
 
-	getTreeItem(keys: Array<string>): Array<FolderTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<FolderTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createFolderTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/dictionary.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/dictionary.data.ts
index b73bc7e0a5..761220c11d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/dictionary.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/dictionary.data.ts
@@ -1,6 +1,6 @@
 import { UmbEntityData } from './entity.data';
 import { createEntityTreeItem } from './utils';
-import type { EntityTreeItemModel } from '@umbraco-cms/backend-api';
+import type { EntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { DictionaryDetails } from '@umbraco-cms/models';
 
 export const data: Array<DictionaryDetails> = [
@@ -55,17 +55,17 @@ class UmbDictionaryData extends UmbEntityData<DictionaryDetails> {
 		super(data);
 	}
 
-	getTreeRoot(): Array<EntityTreeItemModel> {
+	getTreeRoot(): Array<EntityTreeItemResponseModel> {
 		const rootItems = this.data.filter((item) => item.parentKey === null);
 		return rootItems.map((item) => createEntityTreeItem(item));
 	}
 
-	getTreeItemChildren(key: string): Array<EntityTreeItemModel> {
+	getTreeItemChildren(key: string): Array<EntityTreeItemResponseModel> {
 		const childItems = this.data.filter((item) => item.parentKey === key);
 		return childItems.map((item) => createEntityTreeItem(item));
 	}
 
-	getTreeItem(keys: Array<string>): Array<EntityTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<EntityTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createEntityTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document-type.data.ts
index 2b25677dfc..522e3ed25f 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/document-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document-type.data.ts
@@ -1,12 +1,12 @@
 import { UmbEntityData } from './entity.data';
 import { createDocumentTypeTreeItem } from './utils';
 import {
-	DocumentTypeTreeItemModel,
-	DocumentTypeModel,
+	DocumentTypeTreeItemResponseModel,
+	DocumentTypeResponseModel,
 	ContentTypeCompositionTypeModel,
 } from '@umbraco-cms/backend-api';
 
-export const data: Array<DocumentTypeModel> = [
+export const data: Array<DocumentTypeResponseModel> = [
 	{
 		allowedTemplateKeys: [],
 		defaultTemplateKey: null,
@@ -891,7 +891,7 @@ export const data: Array<DocumentTypeModel> = [
 	},
 ];
 
-export const treeData: Array<DocumentTypeTreeItemModel> = [
+export const treeData: Array<DocumentTypeTreeItemResponseModel> = [
 	{
 		$type: 'DocumentTypeTreeItemViewModel',
 		name: 'All property editors document type',
@@ -928,24 +928,24 @@ export const treeData: Array<DocumentTypeTreeItemModel> = [
 // TODO: all properties are optional in the server schema. I don't think this is correct.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-class UmbDocumentTypeData extends UmbEntityData<DocumentTypeModel> {
+class UmbDocumentTypeData extends UmbEntityData<DocumentTypeResponseModel> {
 	private treeData = treeData;
 
 	constructor() {
 		super(data);
 	}
 
-	getTreeRoot(): Array<DocumentTypeTreeItemModel> {
+	getTreeRoot(): Array<DocumentTypeTreeItemResponseModel> {
 		const rootItems = this.treeData.filter((item) => item.parentKey === null);
 		return rootItems.map((item) => createDocumentTypeTreeItem(item));
 	}
 
-	getTreeItemChildren(key: string): Array<DocumentTypeTreeItemModel> {
+	getTreeItemChildren(key: string): Array<DocumentTypeTreeItemResponseModel> {
 		const childItems = this.treeData.filter((item) => item.parentKey === key);
 		return childItems.map((item) => createDocumentTypeTreeItem(item));
 	}
 
-	getTreeItem(keys: Array<string>): Array<DocumentTypeTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<DocumentTypeTreeItemResponseModel> {
 		const items = this.treeData.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createDocumentTypeTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts
index 8f5b4bfd10..72ed53ea61 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts
@@ -2,12 +2,12 @@ import { UmbEntityData } from './entity.data';
 import { createDocumentTreeItem } from './utils';
 import {
 	ContentStateModel,
-	DocumentModel,
-	DocumentTreeItemModel,
-	PagedDocumentTreeItemModel,
+	DocumentResponseModel,
+	DocumentTreeItemResponseModel,
+	PagedDocumentTreeItemResponseModel,
 } from '@umbraco-cms/backend-api';
 
-export const data: Array<DocumentModel> = [
+export const data: Array<DocumentResponseModel> = [
 	{
 		urls: [
 			{
@@ -20,204 +20,238 @@ export const data: Array<DocumentModel> = [
 		contentTypeKey: 'all-property-editors-document-type-key',
 		values: [
 			{
+				$type: '',
 				alias: 'email',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'colorPicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'contentPicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'eyeDropper',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'multiUrlPicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'multiNodeTreePicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'datePicker',
 				culture: null,
 				segment: null,
 				value: '2023-12-24',
 			},
 			{
+				$type: '',
 				alias: 'datePickerTime',
 				culture: null,
 				segment: null,
 				value: '2023-12-24 14:52',
 			},
 			{
+				$type: '',
 				alias: 'time',
 				culture: null,
 				segment: null,
 				value: '14:52:00',
 			},
 			{
+				$type: '',
 				alias: 'email',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'textBox',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'dropdown',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'textArea',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'slider',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'toggle',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'tags',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'markdownEditor',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'radioButtonList',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'checkboxList',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'blockList',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'mediaPicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'imageCropper',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'uploadField',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'blockGrid',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'blockGrid',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'numberRange',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'orderDirection',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'overlaySize',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'label',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'integer',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'decimal',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'memberPicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'memberGroupPicker',
 				culture: null,
 				segment: null,
 				value: null,
 			},
 			{
+				$type: '',
 				alias: 'userPicker',
 				culture: null,
 				segment: null,
@@ -226,6 +260,7 @@ export const data: Array<DocumentModel> = [
 		],
 		variants: [
 			{
+				$type: '',
 				state: ContentStateModel.PUBLISHED,
 				publishDate: '2023-02-06T15:31:51.354764',
 				culture: 'en-us',
@@ -248,60 +283,70 @@ export const data: Array<DocumentModel> = [
 		contentTypeKey: '29643452-cff9-47f2-98cd-7de4b6807681',
 		values: [
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'masterText',
 				value: 'i have a master text',
 			},
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'pageTitle',
 				value: 'with a page title',
 			},
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'blogPostText',
 				value: 'My first blog post',
 			},
 			{
+				$type: '',
 				culture: 'en-us',
 				segment: null,
 				alias: 'blogTextStringUnderMasterTab',
 				value: 'in the master tab',
 			},
 			{
+				$type: '',
 				culture: 'en-us',
 				segment: null,
 				alias: 'blogTextStringUnderGroupUnderMasterTab',
 				value: 'which is under another group in the tab',
 			},
 			{
+				$type: '',
 				culture: 'da-dk',
 				segment: null,
 				alias: 'blogTextStringUnderMasterTab',
 				value: 'på master dokument tab B',
 			},
 			{
+				$type: '',
 				culture: 'da-dk',
 				segment: null,
 				alias: 'blogTextStringUnderGroupUnderMasterTab',
 				value: 'denne er under en anden gruppe i tab B',
 			},
 			{
+				$type: '',
 				culture: 'no-no',
 				segment: null,
 				alias: 'blogTextStringUnderMasterTab',
 				value: 'Norsk på master dokument tab B',
 			},
 			{
+				$type: '',
 				culture: 'no-no',
 				segment: null,
 				alias: 'blogTextStringUnderGroupUnderMasterTab',
 				value: 'Norsk denne er under en anden gruppe i tab B',
 			},
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'localBlogTabString',
@@ -310,6 +355,7 @@ export const data: Array<DocumentModel> = [
 		],
 		variants: [
 			{
+				$type: '',
 				state: ContentStateModel.PUBLISHED,
 				publishDate: '2023-02-06T15:31:51.354764',
 				culture: 'en-us',
@@ -319,6 +365,7 @@ export const data: Array<DocumentModel> = [
 				updateDate: '2023-02-06T15:31:51.354764',
 			},
 			{
+				$type: '',
 				state: ContentStateModel.PUBLISHED,
 				publishDate: '2023-02-06T15:31:51.354764',
 				culture: 'da-dk',
@@ -328,6 +375,7 @@ export const data: Array<DocumentModel> = [
 				updateDate: '2023-02-06T15:31:51.354764',
 			},
 			{
+				$type: '',
 				state: ContentStateModel.PUBLISHED,
 				publishDate: '2023-02-06T15:31:51.354764',
 				culture: 'no-no',
@@ -345,48 +393,56 @@ export const data: Array<DocumentModel> = [
 		contentTypeKey: '29643452-cff9-47f2-98cd-7de4b6807681',
 		values: [
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'masterText',
 				value: 'i have a master text B',
 			},
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'pageTitle',
 				value: 'with a page title B',
 			},
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'blogPostText',
 				value: 'My first blog post B',
 			},
 			{
+				$type: '',
 				culture: 'en-us',
 				segment: null,
 				alias: 'blogTextStringUnderMasterTab',
 				value: 'in the master tab B',
 			},
 			{
+				$type: '',
 				culture: 'en-us',
 				segment: null,
 				alias: 'blogTextStringUnderGroupUnderMasterTab',
 				value: 'which is under another group in the tab B',
 			},
 			{
+				$type: '',
 				culture: 'da-dk',
 				segment: null,
 				alias: 'blogTextStringUnderMasterTab',
 				value: 'på master dokument tab B',
 			},
 			{
+				$type: '',
 				culture: 'da-dk',
 				segment: null,
 				alias: 'blogTextStringUnderGroupUnderMasterTab',
 				value: 'denne er under en anden gruppe i tab B',
 			},
 			{
+				$type: '',
 				culture: null,
 				segment: null,
 				alias: 'localBlogTabString',
@@ -395,6 +451,7 @@ export const data: Array<DocumentModel> = [
 		],
 		variants: [
 			{
+				$type: '',
 				state: ContentStateModel.DRAFT,
 				publishDate: '2023-02-06T15:32:24.957009',
 				culture: 'en-us',
@@ -407,7 +464,7 @@ export const data: Array<DocumentModel> = [
 	},
 ];
 
-export const treeData: Array<DocumentTreeItemModel> = [
+export const treeData: Array<DocumentTreeItemResponseModel> = [
 	{
 		$type: 'DocumentTreeItemViewModel',
 		isProtected: false,
@@ -474,28 +531,28 @@ export const treeData: Array<DocumentTreeItemModel> = [
 // TODO: all properties are optional in the server schema. I don't think this is correct.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-class UmbDocumentData extends UmbEntityData<DocumentModel> {
+class UmbDocumentData extends UmbEntityData<DocumentResponseModel> {
 	private treeData = treeData;
 
 	constructor() {
 		super(data);
 	}
 
-	getTreeRoot(): PagedDocumentTreeItemModel {
+	getTreeRoot(): PagedDocumentTreeItemResponseModel {
 		const items = this.treeData.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createDocumentTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedDocumentTreeItemModel {
+	getTreeItemChildren(key: string): PagedDocumentTreeItemResponseModel {
 		const items = this.treeData.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createDocumentTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<DocumentTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<DocumentTreeItemResponseModel> {
 		const items = this.treeData.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createDocumentTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/examine.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/examine.data.ts
index ab0a0ed3e6..bc30b8eacb 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/examine.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/examine.data.ts
@@ -1,4 +1,4 @@
-import { HealthStatusModel, IndexModel, PagedIndexModel, SearchResultModel } from '@umbraco-cms/backend-api';
+import { HealthStatusModel, IndexResponseModel, PagedIndexResponseModel, SearchResultResponseModel } from '@umbraco-cms/backend-api';
 
 export function getIndexByName(indexName: string) {
 	return Indexers.find((index) => {
@@ -7,11 +7,11 @@ export function getIndexByName(indexName: string) {
 	});
 }
 
-export function getSearchResultsMockData(): SearchResultModel[] {
+export function getSearchResultsMockData(): SearchResultResponseModel[] {
 	return searchResultMockData;
 }
 
-export const Indexers: IndexModel[] = [
+export const Indexers: IndexResponseModel[] = [
 	{
 		name: 'ExternalIndex',
 		canRebuild: true,
@@ -71,12 +71,12 @@ export const Indexers: IndexModel[] = [
 	},
 ];
 
-export const PagedIndexers: PagedIndexModel = {
+export const PagedIndexers: PagedIndexResponseModel = {
 	items: Indexers,
 	total: 0,
 };
 
-export const searchResultMockData: SearchResultModel[] = [
+export const searchResultMockData: SearchResultResponseModel[] = [
 	{
 		id: '1',
 		score: 1,
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/health-check.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/health-check.data.ts
index ae7bfdac46..b16477292d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/health-check.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/health-check.data.ts
@@ -1,6 +1,6 @@
 import {
-	HealthCheckGroupModel,
-	HealthCheckGroupWithResultModel,
+	HealthCheckGroupPresentationModel,
+	HealthCheckGroupWithResultResponseModel,
 	StatusResultTypeModel,
 } from '@umbraco-cms/backend-api';
 
@@ -12,7 +12,7 @@ export function getGroupWithResultsByName(name: string) {
 	return healthGroups.find((group) => group.name.toLowerCase() === name.toLowerCase());
 }
 
-export const healthGroups: Array<HealthCheckGroupWithResultModel & { name: string }> = [
+export const healthGroups: Array<HealthCheckGroupWithResultResponseModel & { name: string }> = [
 	{
 		name: 'Configuration',
 		checks: [
@@ -211,7 +211,7 @@ export const healthGroups: Array<HealthCheckGroupWithResultModel & { name: strin
 		],
 	},
 ];
-export const healthGroupsWithoutResult: HealthCheckGroupModel[] = [
+export const healthGroupsWithoutResult: HealthCheckGroupPresentationModel[] = [
 	{
 		name: 'Configuration',
 		checks: [
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/languages.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/languages.data.ts
index c795fafd57..af965c5d06 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/languages.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/languages.data.ts
@@ -1,14 +1,14 @@
 import { UmbData } from './data';
-import { LanguageModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel } from '@umbraco-cms/backend-api';
 
 // Temp mocked database
-class UmbLanguagesData extends UmbData<LanguageModel> {
-	constructor(data: LanguageModel[]) {
+class UmbLanguagesData extends UmbData<LanguageResponseModel> {
+	constructor(data: LanguageResponseModel[]) {
 		super(data);
 	}
 
 	// skip can be number or null
-	getAll(skip = 0, take = this.data.length): Array<LanguageModel> {
+	getAll(skip = 0, take = this.data.length): Array<LanguageResponseModel> {
 		return this.data.slice(skip, take);
 	}
 
@@ -16,7 +16,7 @@ class UmbLanguagesData extends UmbData<LanguageModel> {
 		return this.data.find((item) => item.isoCode === key);
 	}
 
-	insert(language: LanguageModel) {
+	insert(language: LanguageResponseModel) {
 		const foundIndex = this.data.findIndex((item) => item.isoCode === language.isoCode);
 
 		if (foundIndex !== -1) {
@@ -26,7 +26,7 @@ class UmbLanguagesData extends UmbData<LanguageModel> {
 		this.data.push(language);
 	}
 
-	save(saveItems: Array<LanguageModel>) {
+	save(saveItems: Array<LanguageResponseModel>) {
 		saveItems.forEach((saveItem) => {
 			const foundIndex = this.data.findIndex((item) => item.isoCode === saveItem.isoCode);
 			if (foundIndex !== -1) {
@@ -60,7 +60,7 @@ class UmbLanguagesData extends UmbData<LanguageModel> {
 		return keys;
 	}
 
-	updateData(updateItem: LanguageModel) {
+	updateData(updateItem: LanguageResponseModel) {
 		const itemIndex = this.data.findIndex((item) => item.isoCode === updateItem.isoCode);
 		const item = this.data[itemIndex];
 		if (!item) return;
@@ -91,7 +91,7 @@ class UmbLanguagesData extends UmbData<LanguageModel> {
 	}
 }
 
-export const MockData: Array<LanguageModel> = [
+export const MockData: Array<LanguageResponseModel> = [
 	{
 		name: 'English',
 		isoCode: 'en',
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/log-viewer.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/log-viewer.data.ts
index b74e755fa9..bf3ddfc0b7 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/log-viewer.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/log-viewer.data.ts
@@ -1,15 +1,15 @@
 import { logs } from './logs.data';
 import { UmbData } from './data';
-import { LogMessageModel, LogTemplateModel, SavedLogSearchModel } from '@umbraco-cms/backend-api';
+import { LogMessageResponseModel, LogTemplateResponseModel, SavedLogSearchResponseModel } from '@umbraco-cms/backend-api';
 
 // Temp mocked database
-class UmbLogviewerSearchesData extends UmbData<SavedLogSearchModel> {
-	constructor(data: SavedLogSearchModel[]) {
+class UmbLogviewerSearchesData extends UmbData<SavedLogSearchResponseModel> {
+	constructor(data: SavedLogSearchResponseModel[]) {
 		super(data);
 	}
 
 	// skip can be number or null
-	getSavedSearches(skip = 0, take = this.data.length): Array<SavedLogSearchModel> {
+	getSavedSearches(skip = 0, take = this.data.length): Array<SavedLogSearchResponseModel> {
 		return this.data.slice(skip, take);
 	}
 
@@ -18,24 +18,24 @@ class UmbLogviewerSearchesData extends UmbData<SavedLogSearchModel> {
 	}
 }
 
-class UmbLogviewerTemplatesData extends UmbData<LogTemplateModel> {
-	constructor(data: LogTemplateModel[]) {
+class UmbLogviewerTemplatesData extends UmbData<LogTemplateResponseModel> {
+	constructor(data: LogTemplateResponseModel[]) {
 		super(data);
 	}
 
 	// skip can be number or null
-	getTemplates(skip = 0, take = this.data.length): Array<LogTemplateModel> {
+	getTemplates(skip = 0, take = this.data.length): Array<LogTemplateResponseModel> {
 		return this.data.slice(skip, take);
 	}
 }
 
-class UmbLogviewerMessagesData extends UmbData<LogMessageModel> {
-	constructor(data: LogTemplateModel[]) {
+class UmbLogviewerMessagesData extends UmbData<LogMessageResponseModel> {
+	constructor(data: LogTemplateResponseModel[]) {
 		super(data);
 	}
 
 	// skip can be number or null
-	getLogs(skip = 0, take = this.data.length): Array<LogMessageModel> {
+	getLogs(skip = 0, take = this.data.length): Array<LogMessageResponseModel> {
 		return this.data.slice(skip, take);
 	}
 
@@ -51,7 +51,7 @@ class UmbLogviewerMessagesData extends UmbData<LogMessageModel> {
 	}
 }
 
-export const savedSearches: Array<SavedLogSearchModel> = [
+export const savedSearches: Array<SavedLogSearchResponseModel> = [
 	{
 		name: 'Find all logs where the Level is NOT Verbose and NOT Debug',
 		query: "Not(@Level='Verbose') and Not(@Level='Debug')",
@@ -98,7 +98,7 @@ export const savedSearches: Array<SavedLogSearchModel> = [
 	},
 ];
 
-export const messageTemplates: LogTemplateModel[] = [
+export const messageTemplates: LogTemplateResponseModel[] = [
 	{
 		messageTemplate: 'Create Foreign Key:\n {Sql}',
 		count: 90,
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/logs.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/logs.data.ts
index 974ec00f50..67c0f25616 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/logs.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/logs.data.ts
@@ -1,4 +1,4 @@
-import { LogLevelModel, LogMessageModel } from '@umbraco-cms/backend-api';
+import { LogLevelModel, LogMessageResponseModel } from '@umbraco-cms/backend-api';
 
 const allLogs = [
 	{
@@ -7309,7 +7309,7 @@ const randomEnumValue = (enumeration: any): LogLevelModel => {
 	return enumeration[enumKey];
 };
 
-export const logs: LogMessageModel[] = allLogs.map((log) => {
+export const logs: LogMessageResponseModel[] = allLogs.map((log) => {
 
 	const randomLevel = randomEnumValue(LogLevelModel);
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts
index e5189fbd01..ea23722ab6 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media-type.data.ts
@@ -1,6 +1,6 @@
 import { UmbEntityData } from './entity.data';
 import { createFolderTreeItem } from './utils';
-import { FolderTreeItemModel, PagedFolderTreeItemModel } from '@umbraco-cms/backend-api';
+import { FolderTreeItemResponseModel, PagedFolderTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { MediaTypeDetails } from '@umbraco-cms/models';
 
 export const data: Array<MediaTypeDetails> = [
@@ -41,21 +41,21 @@ class UmbMediaTypeData extends UmbEntityData<MediaTypeDetails> {
 		super(data);
 	}
 
-	getTreeRoot(): PagedFolderTreeItemModel {
+	getTreeRoot(): PagedFolderTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createFolderTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedFolderTreeItemModel {
+	getTreeItemChildren(key: string): PagedFolderTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createFolderTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<FolderTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<FolderTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createFolderTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts
index e77e6d2691..a4136bab24 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts
@@ -1,6 +1,6 @@
 import { UmbEntityData } from './entity.data';
 import { createContentTreeItem } from './utils';
-import { ContentTreeItemModel, PagedContentTreeItemModel } from '@umbraco-cms/backend-api';
+import { ContentTreeItemResponseModel, PagedContentTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { MediaDetails } from '@umbraco-cms/models';
 
 export const data: Array<MediaDetails> = [
@@ -207,21 +207,21 @@ class UmbMediaData extends UmbEntityData<MediaDetails> {
 		super(data);
 	}
 
-	getTreeRoot(): PagedContentTreeItemModel {
+	getTreeRoot(): PagedContentTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createContentTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedContentTreeItemModel {
+	getTreeItemChildren(key: string): PagedContentTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createContentTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<ContentTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<ContentTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key));
 		return items.map((item) => createContentTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts
index 5e88700348..d1240b9c4c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-group.data.ts
@@ -1,7 +1,7 @@
 import { UmbEntityData } from './entity.data';
 import { createEntityTreeItem } from './utils';
 import type { MemberGroupDetails } from '@umbraco-cms/models';
-import { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 export const data: Array<MemberGroupDetails> = [
 	{
@@ -25,21 +25,21 @@ class UmbMemberGroupData extends UmbEntityData<MemberGroupDetails> {
 		super(data);
 	}
 
-	getTreeRoot(): PagedEntityTreeItemModel {
+	getTreeRoot(): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedEntityTreeItemModel {
+	getTreeItemChildren(key: string): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<EntityTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<EntityTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createEntityTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts
index 5220847f6b..71631866af 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member-type.data.ts
@@ -1,6 +1,6 @@
 import { UmbData } from './data';
 import { createEntityTreeItem } from './utils';
-import { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/backend-api';
+import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 import type { MemberTypeDetails } from '@umbraco-cms/models';
 
 export const data: Array<MemberTypeDetails> = [
@@ -24,21 +24,21 @@ class UmbMemberTypeData extends UmbData<MemberTypeDetails> {
 		super(data);
 	}
 
-	getTreeRoot(): PagedEntityTreeItemModel {
+	getTreeRoot(): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedEntityTreeItemModel {
+	getTreeItemChildren(key: string): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<EntityTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<EntityTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createEntityTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts
index 2a77411e27..bf617e82c9 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/member.data.ts
@@ -1,7 +1,7 @@
 import { UmbEntityData } from './entity.data';
 import { createEntityTreeItem } from './utils';
 import type { MemberDetails } from '@umbraco-cms/models';
-import type { EntityTreeItemModel, PagedEntityTreeItemModel } from '@umbraco-cms/backend-api';
+import type { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel } from '@umbraco-cms/backend-api';
 
 export const data: Array<MemberDetails> = [
 	{
@@ -25,21 +25,21 @@ class UmbMemberData extends UmbEntityData<MemberDetails> {
 		super(data);
 	}
 
-	getTreeRoot(): PagedEntityTreeItemModel {
+	getTreeRoot(): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedEntityTreeItemModel {
+	getTreeItemChildren(key: string): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<EntityTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<EntityTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createEntityTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts
index e7ad3d0c8c..bcb69b3ccc 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/template.data.ts
@@ -2,16 +2,16 @@ import { v4 as uuid } from 'uuid';
 import { UmbEntityData } from './entity.data';
 import { createEntityTreeItem } from './utils';
 import {
-	EntityTreeItemModel,
-	PagedEntityTreeItemModel,
-	TemplateModel,
-	TemplateCreateModel,
-	TemplateScaffoldModel,
+	EntityTreeItemResponseModel,
+	PagedEntityTreeItemResponseModel,
+	TemplateResponseModel,
+	TemplateModelBaseModel,
+	TemplateScaffoldResponseModel,
 } from '@umbraco-cms/backend-api';
 
-type TemplateDBItem = TemplateModel & EntityTreeItemModel;
+type TemplateDBItem = TemplateResponseModel & EntityTreeItemResponseModel;
 
-const createTemplate = (dbItem: TemplateDBItem): TemplateModel => {
+const createTemplate = (dbItem: TemplateDBItem): TemplateResponseModel => {
 	return {
 		$type: '',
 		key: dbItem.key,
@@ -76,18 +76,18 @@ class UmbTemplateData extends UmbEntityData<TemplateDBItem> {
 		super(data);
 	}
 
-	getByKey(key: string): TemplateModel | undefined {
+	getByKey(key: string): TemplateResponseModel | undefined {
 		const item = this.data.find((item) => item.key === key);
 		return item ? createTemplate(item) : undefined;
 	}
 
-	getScaffold(masterTemplateAlias: string): TemplateScaffoldModel {
+	getScaffold(masterTemplateAlias: string): TemplateScaffoldResponseModel {
 		return {
 			content: `Template Scaffold Mock: Layout = ${masterTemplateAlias || null};`,
 		};
 	}
 
-	create(templateData: TemplateCreateModel) {
+	create(templateData: TemplateModelBaseModel) {
 		const template = {
 			$type: '',
 			key: uuid(),
@@ -97,26 +97,26 @@ class UmbTemplateData extends UmbEntityData<TemplateDBItem> {
 		return template;
 	}
 
-	update(template: TemplateModel) {
+	update(template: TemplateResponseModel) {
 		this.updateData(template);
 		return template;
 	}
 
-	getTreeRoot(): PagedEntityTreeItemModel {
+	getTreeRoot(): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === null);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItemChildren(key: string): PagedEntityTreeItemModel {
+	getTreeItemChildren(key: string): PagedEntityTreeItemResponseModel {
 		const items = this.data.filter((item) => item.parentKey === key);
 		const treeItems = items.map((item) => createEntityTreeItem(item));
 		const total = items.length;
 		return { items: treeItems, total };
 	}
 
-	getTreeItem(keys: Array<string>): Array<EntityTreeItemModel> {
+	getTreeItem(keys: Array<string>): Array<EntityTreeItemResponseModel> {
 		const items = this.data.filter((item) => keys.includes(item.key ?? ''));
 		return items.map((item) => createEntityTreeItem(item));
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts
index 2b470d3ebc..81dd7be9b9 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/utils.ts
@@ -1,14 +1,14 @@
 import type {
-	ContentTreeItemModel,
-	DocumentTreeItemModel,
-	DocumentTypeTreeItemModel,
-	EntityTreeItemModel,
-	FolderTreeItemModel,
-	DocumentTypeModel,
-	DocumentModel,
+	ContentTreeItemResponseModel,
+	DocumentTreeItemResponseModel,
+	DocumentTypeTreeItemResponseModel,
+	EntityTreeItemResponseModel,
+	FolderTreeItemResponseModel,
+	DocumentTypeResponseModel,
+	DocumentResponseModel,
 } from '@umbraco-cms/backend-api';
 
-export const createEntityTreeItem = (item: any): EntityTreeItemModel => {
+export const createEntityTreeItem = (item: any): EntityTreeItemResponseModel => {
 	return {
 		$type: '',
 		name: item.name,
@@ -21,7 +21,7 @@ export const createEntityTreeItem = (item: any): EntityTreeItemModel => {
 	};
 };
 
-export const createFolderTreeItem = (item: any): FolderTreeItemModel => {
+export const createFolderTreeItem = (item: any): FolderTreeItemResponseModel => {
 	return {
 		...createEntityTreeItem(item),
 		isFolder: item.isFolder,
@@ -29,7 +29,7 @@ export const createFolderTreeItem = (item: any): FolderTreeItemModel => {
 };
 
 // TODO: remove isTrashed type extension when we have found a solution to trashed items
-export const createContentTreeItem = (item: any): ContentTreeItemModel & { isTrashed: boolean } => {
+export const createContentTreeItem = (item: any): ContentTreeItemResponseModel & { isTrashed: boolean } => {
 	return {
 		...createEntityTreeItem(item),
 		noAccess: item.noAccess,
@@ -38,7 +38,7 @@ export const createContentTreeItem = (item: any): ContentTreeItemModel & { isTra
 };
 
 // TODO: remove isTrashed type extension when we have found a solution to trashed items
-export const createDocumentTreeItem = (item: DocumentModel): DocumentTreeItemModel & { isTrashed: boolean } => {
+export const createDocumentTreeItem = (item: DocumentResponseModel): DocumentTreeItemResponseModel & { isTrashed: boolean } => {
 	return {
 		...createContentTreeItem(item),
 		/*
@@ -51,7 +51,7 @@ export const createDocumentTreeItem = (item: DocumentModel): DocumentTreeItemMod
 	};
 };
 
-export const createDocumentTypeTreeItem = (item: DocumentTypeModel): DocumentTypeTreeItemModel => {
+export const createDocumentTypeTreeItem = (item: DocumentTypeResponseModel): DocumentTypeTreeItemResponseModel => {
 	return {
 		...createFolderTreeItem(item),
 		isElement: item.isElement,
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/dictionary.handlers.ts
index cba8bd2327..ba47b8ec0b 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/dictionary.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/dictionary.handlers.ts
@@ -1,9 +1,9 @@
 import { rest } from 'msw';
 import { umbDictionaryData } from '../data/dictionary.data';
-import { DictionaryImportModel, DictionaryOverviewModel } from '@umbraco-cms/backend-api';
+import { ImportDictionaryRequestModel, DictionaryOverviewResponseModel } from '@umbraco-cms/backend-api';
 import type { DictionaryDetails } from '@umbraco-cms/models';
 
-const uploadResponse: DictionaryImportModel = {
+const uploadResponse: ImportDictionaryRequestModel = {
 	fileName: 'c:/path/to/tempfilename.udt',
 	parentKey: 'b7e7d0ab-53ba-485d-dddd-12537f9925aa',
 };
@@ -31,7 +31,7 @@ const importResponse: DictionaryDetails = {
 };
 
 // alternate data for dashboard view
-const overviewData: Array<DictionaryOverviewModel> = [
+const overviewData: Array<DictionaryOverviewResponseModel> = [
 	{
 		name: 'Hello',
 		key: 'aae7d0ab-53ba-485d-b8bd-12537f9925cb',
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document-type.handlers.ts
index bc06e3b5b8..39ac4b8f62 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document-type.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document-type.handlers.ts
@@ -1,10 +1,10 @@
 import { rest } from 'msw';
 import { umbDocumentTypeData } from '../data/document-type.data';
-import type { DocumentTypeModel } from '@umbraco-cms/backend-api';
+import type { DocumentTypeResponseModel } from '@umbraco-cms/backend-api';
 
 // TODO: add schema
 export const handlers = [
-	rest.post<DocumentTypeModel[]>('/umbraco/management/api/v1/document-type/:key', (req, res, ctx) => {
+	rest.post<DocumentTypeResponseModel[]>('/umbraco/management/api/v1/document-type/:key', (req, res, ctx) => {
 		const data = req.body;
 		if (!data) return;
 
@@ -22,7 +22,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json([document]));
 	}),
 
-	rest.post<DocumentTypeModel[]>('/umbraco/management/api/v1/document-type/details/save', (req, res, ctx) => {
+	rest.post<DocumentTypeResponseModel[]>('/umbraco/management/api/v1/document-type/details/save', (req, res, ctx) => {
 		const data = req.body;
 		if (!data) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document.handlers.ts
index 560b50131e..440bfce534 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document.handlers.ts
@@ -1,6 +1,6 @@
 import { rest } from 'msw';
 import { umbDocumentData } from '../data/document.data';
-import type { DocumentModel } from '@umbraco-cms/backend-api';
+import type { DocumentResponseModel } from '@umbraco-cms/backend-api';
 import { umbracoPath } from '@umbraco-cms/utils';
 
 // TODO: add schema
@@ -35,7 +35,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(items));
 	}),
 
-	rest.post<DocumentModel[]>('/umbraco/management/api/v1/document/:key', async (req, res, ctx) => {
+	rest.post<DocumentResponseModel[]>('/umbraco/management/api/v1/document/:key', async (req, res, ctx) => {
 		const data = await req.json();
 		if (!data) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/examine-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/examine-management.handlers.ts
index e0e704fa4a..55ffafd837 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/examine-management.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/examine-management.handlers.ts
@@ -2,14 +2,14 @@ import { rest } from 'msw';
 import { searchResultMockData, getIndexByName, PagedIndexers } from '../data/examine.data';
 
 import { umbracoPath } from '@umbraco-cms/utils';
-import { IndexModel, PagedIndexModel, PagedSearcherModel, PagedSearchResultModel } from '@umbraco-cms/backend-api';
+import { IndexResponseModel, PagedIndexResponseModel, PagedSearcherResponseModel, PagedSearchResultResponseModel } from '@umbraco-cms/backend-api';
 
 export const handlers = [
 	rest.get(umbracoPath('/indexer'), (_req, res, ctx) => {
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<PagedIndexModel>(PagedIndexers)
+			ctx.json<PagedIndexResponseModel>(PagedIndexers)
 		);
 	}),
 
@@ -20,7 +20,7 @@ export const handlers = [
 		const indexFound = getIndexByName(indexName);
 
 		if (indexFound) {
-			return res(ctx.status(200), ctx.json<IndexModel>(indexFound));
+			return res(ctx.status(200), ctx.json<IndexResponseModel>(indexFound));
 		} else {
 			return res(ctx.status(404));
 		}
@@ -43,7 +43,7 @@ export const handlers = [
 	rest.get(umbracoPath('/searcher'), (_req, res, ctx) => {
 		return res(
 			ctx.status(200),
-			ctx.json<PagedSearcherModel>({
+			ctx.json<PagedSearcherResponseModel>({
 				total: 0,
 				items: [{ name: 'ExternalSearcher' }, { name: 'InternalSearcher' }, { name: 'InternalMemberSearcher' }],
 			})
@@ -61,7 +61,7 @@ export const handlers = [
 		if (searcherName) {
 			return res(
 				ctx.status(200),
-				ctx.json<PagedSearchResultModel>({
+				ctx.json<PagedSearchResultResponseModel>({
 					total: 0,
 					items: searchResultMockData,
 				})
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/health-check.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/health-check.handlers.ts
index 7756158382..ac0378f76a 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/health-check.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/health-check.handlers.ts
@@ -8,11 +8,11 @@ import {
 } from '../data/health-check.data';
 
 import {
-	HealthCheckActionModel,
-	HealthCheckGroupModel,
-	HealthCheckGroupWithResultModel,
-	HealthCheckResultModel,
-	PagedHealthCheckGroupModelBaseModel,
+	HealthCheckActionRequestModel,
+	HealthCheckGroupResponseModel,
+	HealthCheckGroupWithResultResponseModel,
+	HealthCheckResultResponseModel,
+	PagedHealthCheckGroupResponseModel,
 	StatusResultTypeModel,
 } from '@umbraco-cms/backend-api';
 import { umbracoPath } from '@umbraco-cms/utils';
@@ -22,7 +22,7 @@ export const handlers = [
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<PagedHealthCheckGroupModelBaseModel>({ total: 9999, items: healthGroupsWithoutResult })
+			ctx.json<PagedHealthCheckGroupResponseModel>({ total: 9999, items: healthGroupsWithoutResult })
 		);
 	}),
 
@@ -33,7 +33,7 @@ export const handlers = [
 		const group = getGroupByName(name);
 
 		if (group) {
-			return res(ctx.status(200), ctx.json<HealthCheckGroupModel>(group));
+			return res(ctx.status(200), ctx.json<HealthCheckGroupResponseModel>(group));
 		} else {
 			return res(ctx.status(404));
 		}
@@ -46,14 +46,14 @@ export const handlers = [
 		const group = getGroupWithResultsByName(name);
 
 		if (group) {
-			return res(ctx.status(200), ctx.json<HealthCheckGroupWithResultModel>(group));
+			return res(ctx.status(200), ctx.json<HealthCheckGroupWithResultResponseModel>(group));
 		} else {
 			return res(ctx.status(404));
 		}
 	}),
 
-	rest.post<HealthCheckActionModel>(umbracoPath('/health-check/execute-action'), async (req, res, ctx) => {
-		const body = await req.json<HealthCheckActionModel>();
+	rest.post<HealthCheckActionRequestModel>(umbracoPath('/health-check/execute-action'), async (req, res, ctx) => {
+		const body = await req.json<HealthCheckActionRequestModel>();
 		const healthCheckKey = body.healthCheckKey;
 		// Find the health check based on the healthCheckKey from the healthGroups[].checks
 		const healthCheck = healthGroups.flatMap((group) => group.checks).find((check) => check?.key === healthCheckKey);
@@ -74,7 +74,7 @@ export const handlers = [
 			// Respond with a 200 status code
 			ctx.delay(1000),
 			ctx.status(200),
-			ctx.json<HealthCheckResultModel>(result)
+			ctx.json<HealthCheckResultResponseModel>(result)
 		);
 	}),
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts
index 3bd73fa492..3f73a4bbb5 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts
@@ -1,8 +1,8 @@
 import { rest } from 'msw';
 import {
-	DatabaseInstallModel,
-	InstallModel,
-	InstallSettingsModel,
+	DatabaseInstallResponseModel,
+	InstallVResponseModel,
+	InstallSettingsResponseModel,
 	ProblemDetailsModel,
 	TelemetryLevelModel,
 } from '@umbraco-cms/backend-api';
@@ -13,7 +13,7 @@ export const handlers = [
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<InstallSettingsModel>({
+			ctx.json<InstallSettingsResponseModel>({
 				user: {
 					minCharLength: 2,
 					minNonAlphaNumericLength: 0,
@@ -79,7 +79,7 @@ export const handlers = [
 	}),
 
 	rest.post(umbracoPath('/install/validate-database'), async (req, res, ctx) => {
-		const body = await req.json<DatabaseInstallModel>();
+		const body = await req.json<DatabaseInstallResponseModel>();
 
 		if (body.name === 'validate') {
 			return res(
@@ -99,7 +99,7 @@ export const handlers = [
 	}),
 
 	rest.post(umbracoPath('/install/setup'), async (req, res, ctx) => {
-		const body = await req.json<InstallModel>();
+		const body = await req.json<InstallVResponseModel>();
 
 		if (body.database?.name === 'fail') {
 			return res(
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/language.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/language.handlers.ts
index 153894b174..e9614b68c7 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/language.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/language.handlers.ts
@@ -1,6 +1,6 @@
 import { rest } from 'msw';
 import { umbLanguagesData } from '../data/languages.data';
-import { LanguageModel, ProblemDetailsModel } from '@umbraco-cms/backend-api';
+import { LanguageResponseModel, ProblemDetailsModel } from '@umbraco-cms/backend-api';
 import { umbracoPath } from '@umbraco-cms/utils';
 
 // TODO: add schema
@@ -30,7 +30,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(item));
 	}),
 
-	rest.post<LanguageModel>(umbracoPath('/language'), async (req, res, ctx) => {
+	rest.post<LanguageResponseModel>(umbracoPath('/language'), async (req, res, ctx) => {
 		const data = await req.json();
 
 		if (!data) return;
@@ -53,7 +53,7 @@ export const handlers = [
 		}
 	}),
 
-	rest.put<LanguageModel>(umbracoPath('/language/:key'), async (req, res, ctx) => {
+	rest.put<LanguageResponseModel>(umbracoPath('/language/:key'), async (req, res, ctx) => {
 		const data = await req.json();
 
 		if (!data) return;
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/log-viewer.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/log-viewer.handlers.ts
index 70eabc1d7c..7d22630d9d 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/log-viewer.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/log-viewer.handlers.ts
@@ -1,7 +1,7 @@
 import { rest } from 'msw';
 import { umbLogviewerData } from '../data/log-viewer.data';
 import { umbracoPath } from '@umbraco-cms/utils';
-import { SavedLogSearchModel } from '@umbraco-cms/backend-api';
+import { SavedLogSearchRequestModel } from '@umbraco-cms/backend-api';
 
 export const handlers = [
 	//#region Searches
@@ -30,7 +30,7 @@ export const handlers = [
 		return res(ctx.delay(), ctx.status(200), ctx.json(item));
 	}),
 
-	rest.post<SavedLogSearchModel>(umbracoPath('/log-viewer/saved-search'), async (req, res, ctx) => {
+	rest.post<SavedLogSearchRequestModel>(umbracoPath('/log-viewer/saved-search'), async (req, res, ctx) => {
 		return res(ctx.delay(), ctx.status(200));
 	}),
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/modelsbuilder.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/modelsbuilder.handlers.ts
index ce5c859bff..113e6195a5 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/modelsbuilder.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/modelsbuilder.handlers.ts
@@ -1,7 +1,7 @@
 import { rest } from 'msw';
 
 import { umbracoPath } from '@umbraco-cms/utils';
-import { ModelsBuilderModel, ModelsModeModel, OutOfDateStatusModel } from '@umbraco-cms/backend-api';
+import { ModelsBuilderResponseModel, ModelsModeModel, OutOfDateStatusResponseModel } from '@umbraco-cms/backend-api';
 
 export const handlers = [
 	rest.post(umbracoPath('/models-builder/build'), async (_req, res, ctx) => {
@@ -15,20 +15,20 @@ export const handlers = [
 	}),
 
 	rest.get(umbracoPath('/models-builder/dashboard'), async (_req, res, ctx) => {
-		return res(ctx.status(200), ctx.json<ModelsBuilderModel>(model));
+		return res(ctx.status(200), ctx.json<ModelsBuilderResponseModel>(model));
 	}),
 
 	rest.get(umbracoPath('/models-builder/status'), async (_req, res, ctx) => {
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<OutOfDateStatusModel>({})
+			ctx.json<OutOfDateStatusResponseModel>({})
 		);
 	}),
 ];
 
 // Mock Data for now
-const modelBeforeBuild: ModelsBuilderModel = {
+const modelBeforeBuild: ModelsBuilderResponseModel = {
 	mode: ModelsModeModel.IN_MEMORY_AUTO,
 	canGenerate: true,
 	outOfDateModels: true,
@@ -49,7 +49,7 @@ at async TransformContext.transform (file:///C:/Users/Umbraco/Documents/Umbraco.
 	trackingOutOfDateModels: true,
 };
 
-const modelAfterBuild: ModelsBuilderModel = {
+const modelAfterBuild: ModelsBuilderResponseModel = {
 	mode: ModelsModeModel.IN_MEMORY_AUTO,
 	canGenerate: true,
 	outOfDateModels: false,
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/package.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/package.handlers.ts
index c056cc616a..b56a347048 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/package.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/package.handlers.ts
@@ -3,10 +3,10 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { umbracoPath } from '@umbraco-cms/utils';
 import {
-	PackageCreateModel,
-	PackageDefinitionModel,
-	PagedPackageDefinitionModel,
-	PagedPackageMigrationStatusModel,
+	PackageMigrationStatusResponseModel,
+	PackageDefinitionResponseModel,
+	PagedPackageDefinitionResponseModel,
+	PagedPackageMigrationStatusResponseModel,
 } from '@umbraco-cms/backend-api';
 
 export const handlers = [
@@ -14,7 +14,7 @@ export const handlers = [
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<PagedPackageMigrationStatusModel>({
+			ctx.json<PagedPackageMigrationStatusResponseModel>({
 				total: 3,
 				items: [
 					{
@@ -44,7 +44,7 @@ export const handlers = [
 		// read all
 		return res(
 			ctx.status(200),
-			ctx.json<PagedPackageDefinitionModel>({
+			ctx.json<PagedPackageDefinitionResponseModel>({
 				total: packageArray.length,
 				items: packageArray,
 			})
@@ -53,10 +53,10 @@ export const handlers = [
 
 	rest.post(umbracoPath('/package/created'), async (_req, res, ctx) => {
 		//save
-		const data: PackageCreateModel = await _req.json();
-		const newPackage: PackageDefinitionModel = { ...data, key: uuidv4() };
+		const data: PackageMigrationStatusResponseModel = await _req.json();
+		const newPackage: PackageDefinitionResponseModel = { ...data, key: uuidv4() };
 		packageArray.push(newPackage);
-		return res(ctx.status(200), ctx.json<PackageDefinitionModel>(newPackage));
+		return res(ctx.status(200), ctx.json<PackageDefinitionResponseModel>(newPackage));
 	}),
 
 	rest.get(umbracoPath('/package/created/:key'), (_req, res, ctx) => {
@@ -65,12 +65,12 @@ export const handlers = [
 		if (!key) return res(ctx.status(404));
 		const found = packageArray.find((p) => p.key == key);
 		if (!found) return res(ctx.status(404));
-		return res(ctx.status(200), ctx.json<PackageDefinitionModel>(found));
+		return res(ctx.status(200), ctx.json<PackageDefinitionResponseModel>(found));
 	}),
 
 	rest.put(umbracoPath('/package/created/:key'), async (_req, res, ctx) => {
 		//update
-		const data: PackageDefinitionModel = await _req.json();
+		const data: PackageDefinitionResponseModel = await _req.json();
 		if (!data.key) return;
 		const index = packageArray.findIndex((x) => x.key === data.key);
 		packageArray[index] = data;
@@ -93,7 +93,7 @@ export const handlers = [
 	}),
 ];
 
-const packageArray: PackageDefinitionModel[] = [
+const packageArray: PackageDefinitionResponseModel[] = [
 	{
 		key: '2a0181ec-244b-4068-a1d7-2f95ed7e6da6',
 		packagePath: undefined,
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/performance-profiling.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/performance-profiling.handlers.ts
index 074a7c6edb..2ed61aadf4 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/performance-profiling.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/performance-profiling.handlers.ts
@@ -1,14 +1,14 @@
 import { rest } from 'msw';
 
 import { umbracoPath } from '@umbraco-cms/utils';
-import type { ProfilingStatusModel } from '@umbraco-cms/backend-api';
+import type { ProfilingStatusResponseModel } from '@umbraco-cms/backend-api';
 
 export const handlers = [
 	rest.get(umbracoPath('/profiling/status'), (_req, res, ctx) => {
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<ProfilingStatusModel>({ enabled: true })
+			ctx.json<ProfilingStatusResponseModel>({ enabled: true })
 		);
 	}),
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts
index dc72903041..49b8cd7c4a 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts
@@ -1,10 +1,10 @@
 import { rest } from 'msw';
 import { umbracoPath } from '@umbraco-cms/utils';
 import {
-	PagedRedirectUrlModel,
-	RedirectUrlModel,
+	PagedRedirectUrlResponseModel,
+	RedirectUrlResponseModel,
 	RedirectStatusModel,
-	RedirectUrlStatusModel,
+	RedirectUrlStatusResponseModel,
 } from '@umbraco-cms/backend-api';
 
 export const handlers = [
@@ -14,35 +14,35 @@ export const handlers = [
 		const take = parseInt(_req.url.searchParams.get('take') ?? '20', 10);
 
 		if (filter) {
-			const filtered: RedirectUrlModel[] = [];
+			const filtered: RedirectUrlResponseModel[] = [];
 
 			PagedRedirectUrlData.items.forEach((item) => {
 				if (item.originalUrl?.includes(filter)) filtered.push(item);
 			});
-			const filteredPagedData: PagedRedirectUrlModel = {
+			const filteredPagedData: PagedRedirectUrlResponseModel = {
 				total: filtered.length,
 				items: filtered.slice(skip, skip + take),
 			};
-			return res(ctx.status(200), ctx.json<PagedRedirectUrlModel>(filteredPagedData));
+			return res(ctx.status(200), ctx.json<PagedRedirectUrlResponseModel>(filteredPagedData));
 		} else {
 			const items = PagedRedirectUrlData.items.slice(skip, skip + take);
 
-			const PagedData: PagedRedirectUrlModel = {
+			const PagedData: PagedRedirectUrlResponseModel = {
 				total: PagedRedirectUrlData.total,
 				items,
 			};
-			return res(ctx.status(200), ctx.json<PagedRedirectUrlModel>(PagedData));
+			return res(ctx.status(200), ctx.json<PagedRedirectUrlResponseModel>(PagedData));
 		}
 	}),
 
 	rest.get(umbracoPath('/redirect-management/:key'), async (_req, res, ctx) => {
 		const key = _req.params.key as string;
 		if (!key) return res(ctx.status(404));
-		if (key === 'status') return res(ctx.status(200), ctx.json<RedirectUrlStatusModel>(UrlTracker));
+		if (key === 'status') return res(ctx.status(200), ctx.json<RedirectUrlStatusResponseModel>(UrlTracker));
 
 		const PagedRedirectUrlObject = _getRedirectUrlByKey(key);
 
-		return res(ctx.status(200), ctx.json<PagedRedirectUrlModel>(PagedRedirectUrlObject));
+		return res(ctx.status(200), ctx.json<PagedRedirectUrlResponseModel>(PagedRedirectUrlObject));
 	}),
 
 	rest.delete(umbracoPath('/redirect-management/:key'), async (_req, res, ctx) => {
@@ -67,10 +67,10 @@ export const handlers = [
 
 // Mock Data
 
-const UrlTracker: RedirectUrlStatusModel = { status: RedirectStatusModel.ENABLED, userIsAdmin: true };
+const UrlTracker: RedirectUrlStatusResponseModel = { status: RedirectStatusModel.ENABLED, userIsAdmin: true };
 
 const _getRedirectUrlByKey = (key: string) => {
-	const PagedResult: PagedRedirectUrlModel = {
+	const PagedResult: PagedRedirectUrlResponseModel = {
 		total: 0,
 		items: [],
 	};
@@ -86,14 +86,14 @@ const _getRedirectUrlByKey = (key: string) => {
 const _deleteRedirectUrlByKey = (key: string) => {
 	const index = RedirectUrlData.findIndex((data) => data.key === key);
 	if (index > -1) RedirectUrlData.splice(index, 1);
-	const PagedResult: PagedRedirectUrlModel = {
+	const PagedResult: PagedRedirectUrlResponseModel = {
 		items: RedirectUrlData,
 		total: RedirectUrlData.length,
 	};
 	return PagedResult;
 };
 
-const RedirectUrlData: RedirectUrlModel[] = [
+const RedirectUrlData: RedirectUrlResponseModel[] = [
 	{
 		key: '1',
 		created: '2022-12-05T13:59:43.6827244',
@@ -173,7 +173,7 @@ const RedirectUrlData: RedirectUrlModel[] = [
 	},
 ];
 
-const PagedRedirectUrlData: PagedRedirectUrlModel = {
+const PagedRedirectUrlData: PagedRedirectUrlResponseModel = {
 	total: RedirectUrlData.length,
 	items: RedirectUrlData,
 };
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts
index 97a80dc6b1..0493ebf2d3 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts
@@ -1,12 +1,12 @@
 import { rest } from 'msw';
-import { RuntimeLevelModel, ServerStatusModel, VersionModel } from '@umbraco-cms/backend-api';
+import { RuntimeLevelModel, ServerStatusResponseModel, VersionResponseModel } from '@umbraco-cms/backend-api';
 import { umbracoPath } from '@umbraco-cms/utils';
 
 export const serverRunningHandler = rest.get(umbracoPath('/server/status'), (_req, res, ctx) => {
 	return res(
 		// Respond with a 200 status code
 		ctx.status(200),
-		ctx.json<ServerStatusModel>({
+		ctx.json<ServerStatusResponseModel>({
 			serverStatus: RuntimeLevelModel.RUN,
 		})
 	);
@@ -16,7 +16,7 @@ export const serverMustInstallHandler = rest.get(umbracoPath('/server/status'),
 	return res(
 		// Respond with a 200 status code
 		ctx.status(200),
-		ctx.json<ServerStatusModel>({
+		ctx.json<ServerStatusResponseModel>({
 			serverStatus: RuntimeLevelModel.INSTALL,
 		})
 	);
@@ -26,7 +26,7 @@ export const serverMustUpgradeHandler = rest.get(umbracoPath('/server/status'),
 	return res(
 		// Respond with a 200 status code
 		ctx.status(200),
-		ctx.json<ServerStatusModel>({
+		ctx.json<ServerStatusResponseModel>({
 			serverStatus: RuntimeLevelModel.UPGRADE,
 		})
 	);
@@ -36,7 +36,7 @@ export const serverVersionHandler = rest.get(umbracoPath('/server/version'), (_r
 	return res(
 		// Respond with a 200 status code
 		ctx.status(200),
-		ctx.json<VersionModel>({
+		ctx.json<VersionResponseModel>({
 			version: '13.0.0',
 		})
 	);
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts
index b8651b539e..978a5e9c10 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts
@@ -1,7 +1,7 @@
 import { rest } from 'msw';
 
 import { umbracoPath } from '@umbraco-cms/utils';
-import { PagedTelemetryModel, TelemetryModel, TelemetryLevelModel } from '@umbraco-cms/backend-api';
+import { PagedTelemetryResponseModel, TelemetryResponseModel, TelemetryLevelModel } from '@umbraco-cms/backend-api';
 
 let telemetryLevel = TelemetryLevelModel.BASIC;
 
@@ -10,7 +10,7 @@ export const handlers = [
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<TelemetryModel>({
+			ctx.json<TelemetryResponseModel>({
 				telemetryLevel,
 			})
 		);
@@ -20,7 +20,7 @@ export const handlers = [
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<PagedTelemetryModel>({
+			ctx.json<PagedTelemetryResponseModel>({
 				total: 3,
 				items: [
 					{ telemetryLevel: TelemetryLevelModel.MINIMAL },
@@ -31,8 +31,8 @@ export const handlers = [
 		);
 	}),
 
-	rest.post<TelemetryModel>(umbracoPath('/telemetry/level'), async (_req, res, ctx) => {
-		const newLevel = (await _req.json<TelemetryModel>()).telemetryLevel;
+	rest.post<TelemetryResponseModel>(umbracoPath('/telemetry/level'), async (_req, res, ctx) => {
+		const newLevel = (await _req.json<TelemetryResponseModel>()).telemetryLevel;
 		if (newLevel) {
 			telemetryLevel = newLevel;
 			return res(
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts
index d947764f8c..5a1695cd76 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts
@@ -1,14 +1,14 @@
 import { rest } from 'msw';
 
 import { umbracoPath } from '@umbraco-cms/utils';
-import type { UpgradeSettingsModel } from '@umbraco-cms/backend-api';
+import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backend-api';
 
 export const handlers = [
 	rest.get(umbracoPath('/upgrade/settings'), (_req, res, ctx) => {
 		return res(
 			// Respond with a 200 status code
 			ctx.status(200),
-			ctx.json<UpgradeSettingsModel>({
+			ctx.json<UpgradeSettingsResponseModel>({
 				currentState: '2b20c6e7',
 				newState: '2b20c6e8',
 				oldVersion: '13.0.0',
diff --git a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts
index cf243a7f8d..ee3969304d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts
@@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 
 import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context';
-import { ConsentLevelModel, TelemetryModel, TelemetryLevelModel } from '@umbraco-cms/backend-api';
+import { ConsentLevelPresentationModel, TelemetryResponseModel, TelemetryLevelModel } from '@umbraco-cms/backend-api';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 @customElement('umb-installer-consent')
@@ -45,10 +45,10 @@ export class UmbInstallerConsentElement extends UmbLitElement {
 	];
 
 	@state()
-	private _telemetryLevels: ConsentLevelModel[] = [];
+	private _telemetryLevels: ConsentLevelPresentationModel[] = [];
 
 	@state()
-	private _telemetryFormData?: TelemetryModel['telemetryLevel'];
+	private _telemetryFormData?: TelemetryResponseModel['telemetryLevel'];
 
 	private _installerContext?: UmbInstallerContext;
 
diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts
index 40d9cf223c..7507389ceb 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts
@@ -4,8 +4,8 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 
 import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context';
 import {
-	DatabaseInstallModel,
-	DatabaseSettingsModel,
+	DatabaseInstallResponseModel,
+	DatabaseSettingsPresentationModel,
 	InstallResource,
 	ProblemDetailsModel,
 } from '@umbraco-cms/backend-api';
@@ -82,16 +82,16 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 	private _installButton!: UUIButtonElement;
 
 	@property({ attribute: false })
-	public databaseFormData!: DatabaseInstallModel;
+	public databaseFormData!: DatabaseInstallResponseModel;
 
 	@state()
 	private _options: Option[] = [];
 
 	@state()
-	private _databases: DatabaseSettingsModel[] = [];
+	private _databases: DatabaseSettingsPresentationModel[] = [];
 
 	@state()
-	private _preConfiguredDatabase?: DatabaseSettingsModel;
+	private _preConfiguredDatabase?: DatabaseSettingsPresentationModel;
 
 	@state()
 	private _validationErrorMessage = '';
@@ -151,7 +151,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 		value[target.name] = target.checked ?? target.value; // handle boolean and text inputs
 
 		// TODO: Mark id and providerName as non-optional in schema
-		const database: DatabaseInstallModel = {
+		const database: DatabaseInstallResponseModel = {
 			id: '0',
 			providerName: '',
 			...this._installerContext?.getData().database,
@@ -161,7 +161,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 		this._setDatabase(database);
 	}
 
-	private _setDatabase(database: DatabaseInstallModel) {
+	private _setDatabase(database: DatabaseInstallResponseModel) {
 		this._installerContext?.appendData({ database });
 	}
 
@@ -199,7 +199,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 			}
 
 			if (selectedDatabase.requiresConnectionTest) {
-				const databaseDetails: DatabaseInstallModel = {
+				const databaseDetails: DatabaseInstallResponseModel = {
 					id,
 					username,
 					password,
@@ -221,7 +221,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 				}
 			}
 
-			const database: DatabaseInstallModel = {
+			const database: DatabaseInstallResponseModel = {
 				...this._installerContext?.getData().database,
 				id,
 				username,
@@ -397,7 +397,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
 		${this._renderSettings()}
 	`;
 
-	private _renderPreConfiguredDatabase = (database: DatabaseSettingsModel) => html`
+	private _renderPreConfiguredDatabase = (database: DatabaseSettingsPresentationModel) => html`
 		<p>A database has already been pre-configured on the server and will be used:</p>
 		<p>
 			Type: <strong>${database.displayName}</strong>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts
index dd2537af89..7df3e7a8b2 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts
@@ -7,7 +7,7 @@ import { rest } from 'msw';
 import { installerContextProvider } from '../shared/utils.story-helpers';
 
 import type { UmbInstallerDatabaseElement } from './installer-database.element';
-import type { InstallSettingsModel } from '@umbraco-cms/backend-api';
+import type { InstallSettingsResponseModel } from '@umbraco-cms/backend-api';
 export default {
 	title: 'Apps/Installer/Steps',
 	component: 'umb-installer-database',
@@ -30,7 +30,7 @@ Step3DatabasePreconfigured.parameters = {
 				rest.get('/umbraco/backoffice/install/settings', (_req, res, ctx) => {
 					return res(
 						ctx.status(200),
-						ctx.json<InstallSettingsModel>({
+						ctx.json<InstallSettingsResponseModel>({
 							user: { consentLevels: [], minCharLength: 2, minNonAlphaNumericLength: 2 },
 							databases: [
 								{
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts
index d51f3d2c28..5ffa75da16 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts
@@ -1,8 +1,8 @@
 import { Observable } from 'rxjs';
 import {
-	InstallModel,
+	InstallVResponseModel,
 	InstallResource,
-	InstallSettingsModel,
+	InstallSettingsResponseModel,
 	ProblemDetailsModel,
 	TelemetryLevelModel,
 } from '@umbraco-cms/backend-api';
@@ -16,7 +16,7 @@ import { ObjectState, NumberState } from '@umbraco-cms/observable-api';
  * @class UmbInstallerContext
  */
 export class UmbInstallerContext {
-	private _data = new ObjectState<InstallModel>({
+	private _data = new ObjectState<InstallVResponseModel>({
 		user: { name: '', email: '', password: '', subscribeToNewsletter: false },
 		database: { id: '', providerName: '' },
 		telemetryLevel: TelemetryLevelModel.BASIC,
@@ -26,7 +26,7 @@ export class UmbInstallerContext {
 	private _currentStep = new NumberState<number>(1);
 	public readonly currentStep = this._currentStep.asObservable();
 
-	private _settings = new ObjectState<InstallSettingsModel | undefined>(undefined);
+	private _settings = new ObjectState<InstallSettingsResponseModel | undefined>(undefined);
 	public readonly settings = this._settings.asObservable();
 
 	private _installStatus = new ObjectState<ProblemDetailsModel | null>(null);
@@ -90,7 +90,7 @@ export class UmbInstallerContext {
 	 * @param {Partial<PostInstallRequest>} data
 	 * @memberof UmbInstallerContext
 	 */
-	public appendData(data: Partial<InstallModel>): void {
+	public appendData(data: Partial<InstallVResponseModel>): void {
 		this._data.next({ ...this.getData(), ...data });
 	}
 
@@ -100,7 +100,7 @@ export class UmbInstallerContext {
 	 * @return {*}  {PostInstallRequest}
 	 * @memberof UmbInstallerContext
 	 */
-	public getData(): InstallModel {
+	public getData(): InstallVResponseModel {
 		return this._data.getValue();
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts
index 44de67977d..36df7b5171 100644
--- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts
@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { UpgradeSettingsModel } from '@umbraco-cms/backend-api';
+import { UpgradeSettingsResponseModel } from '@umbraco-cms/backend-api';
 
 /**
  * @element umb-upgrader-view
@@ -32,7 +32,7 @@ export class UmbUpgraderView extends LitElement {
 	errorMessage = '';
 
 	@property({ type: Object, reflect: true })
-	settings?: UpgradeSettingsModel;
+	settings?: UpgradeSettingsResponseModel;
 
 	private _renderLayout() {
 		return html`
diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts
index bd38add924..c520db8565 100644
--- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts
@@ -3,7 +3,7 @@ import './upgrader-view.element';
 
 import { html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
-import { UpgradeResource, UpgradeSettingsModel } from '@umbraco-cms/backend-api';
+import { UpgradeResource, UpgradeSettingsResponseModel } from '@umbraco-cms/backend-api';
 import { tryExecute } from '@umbraco-cms/resources';
 import { UmbLitElement } from '@umbraco-cms/element';
 
@@ -13,7 +13,7 @@ import { UmbLitElement } from '@umbraco-cms/element';
 @customElement('umb-upgrader')
 export class UmbUpgrader extends UmbLitElement {
 	@state()
-	private upgradeSettings?: UpgradeSettingsModel;
+	private upgradeSettings?: UpgradeSettingsResponseModel;
 
 	@state()
 	private fetching = true;