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 3e6643bbb7..0c555f60ca 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
@@ -28,7 +28,7 @@ export class UmbDocumentTypeWorkspaceContext
 	readonly compositions;
 
 	// Document type specific:
-	readonly allowedTemplateKeys;
+	readonly allowedTemplateIds;
 	readonly defaultTemplateKey;
 	readonly cleanup;
 
@@ -53,7 +53,7 @@ export class UmbDocumentTypeWorkspaceContext
 		this.compositions = this.structure.rootDocumentTypeObservablePart((data) => data?.compositions);
 
 		// Document type specific:
-		this.allowedTemplateKeys = this.structure.rootDocumentTypeObservablePart((data) => data?.allowedTemplateKeys);
+		this.allowedTemplateIds = this.structure.rootDocumentTypeObservablePart((data) => data?.allowedTemplateIds);
 		this.defaultTemplateKey = this.structure.rootDocumentTypeObservablePart((data) => data?.defaultTemplateKey);
 		this.cleanup = this.structure.rootDocumentTypeObservablePart((data) => data?.defaultTemplateKey);
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts
index 32f96d6687..1963448239 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts
@@ -66,7 +66,7 @@ export class UmbDocumentTypeWorkspaceViewTemplatesElement extends UmbLitElement
 				<div id="templates" slot="editor">
 					<umb-input-template-picker
 						.defaultKey="${/*this._documentType?.defaultTemplateKey ??*/ ''}"
-						.allowedKeys="${/*this._documentType?.allowedTemplateKeys ??*/ []}"
+						.allowedKeys="${/*this._documentType?.allowedTemplateIds ??*/ []}"
 						@change-default="${this.#changeDefaultKey}"
 						@change-allowed="${this.#changeAllowedKeys}"></umb-input-template-picker>
 				</div>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create.action.ts
index 7c198e7a38..81d40bf7b6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/entity-actions/create/create.action.ts
@@ -26,9 +26,9 @@ export class UmbCreateDocumentEntityAction extends UmbEntityActionBase<UmbDocume
 
 		const { data } = await this.repository.requestById(this.unique);
 
-		if (data && data.contentTypeKey) {
+		if (data && data.contentTypeId) {
 			const modalHandler = this.#modalContext?.open(UMB_ALLOWED_DOCUMENT_TYPES_MODAL, {
-				key: data.contentTypeKey,
+				key: data.contentTypeId,
 			});
 
 			const { documentTypeKey } = await modalHandler.onSubmit();
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 c479ad54a3..ff96898cb0 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
@@ -29,11 +29,11 @@ export class UmbDocumentWorkspaceContext
 	 */
 	#draft = new ObjectState<EntityType | undefined>(undefined);
 	readonly unique = this.#draft.getObservablePart((data) => data?.id);
-	readonly documentTypeKey = this.#draft.getObservablePart((data) => data?.contentTypeKey);
+	readonly documentTypeKey = this.#draft.getObservablePart((data) => data?.contentTypeId);
 
 	readonly variants = this.#draft.getObservablePart((data) => data?.variants || []);
 	readonly urls = this.#draft.getObservablePart((data) => data?.urls || []);
-	readonly templateKey = this.#draft.getObservablePart((data) => data?.templateKey || null);
+	readonly templateId = this.#draft.getObservablePart((data) => data?.templateId || null);
 
 	readonly structure;
 	readonly splitView;