diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-content.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-node.context.ts
similarity index 79%
rename from src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-content.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-node.context.ts
index 906b08c26e..9797850814 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-content.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-node.context.ts
@@ -1,10 +1,10 @@
 
 import { UmbWorkspaceWithStoreContext } from "./workspace-with-store.context";
-import type { DocumentDetails } from "@umbraco-cms/models";
 import { UmbNodeStoreBase } from "@umbraco-cms/stores/store";
 import { UmbNotificationDefaultData } from "@umbraco-cms/services";
+import { ContentTreeItem } from "@umbraco-cms/backend-api";
 
-export class UmbWorkspaceContentContext<ContentTypeType extends DocumentDetails, StoreType extends UmbNodeStoreBase<ContentTypeType>> extends UmbWorkspaceWithStoreContext<ContentTypeType, StoreType> {
+export class UmbWorkspaceNodeContext<ContentTypeType extends ContentTreeItem, StoreType extends UmbNodeStoreBase<ContentTypeType>> extends UmbWorkspaceWithStoreContext<ContentTypeType, StoreType> {
 
 	constructor(target:HTMLElement, defaultData:ContentTypeType, storeAlias:string, entityType: string, entityKey: string) {
 		super(target, defaultData, storeAlias, entityType, entityKey);
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-with-store.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-with-store.context.ts
index eaf5e0a0f8..1ada726215 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-with-store.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-context/workspace-with-store.context.ts
@@ -1,11 +1,11 @@
 import { Subscription } from "rxjs";
 import { UmbWorkspaceContext } from "./workspace.context";
 import { UmbContextConsumer } from "@umbraco-cms/context-api";
-import type { DocumentDetails } from "@umbraco-cms/models";
 import { UmbNotificationService } from "@umbraco-cms/services";
 import { UmbDataStoreBase } from "@umbraco-cms/stores/store";
+import { ContentTreeItem } from "@umbraco-cms/backend-api";
 
-export abstract class UmbWorkspaceWithStoreContext<DataType extends DocumentDetails, StoreType extends UmbDataStoreBase<DataType>> extends UmbWorkspaceContext<DataType> {
+export abstract class UmbWorkspaceWithStoreContext<DataType extends ContentTreeItem, StoreType extends UmbDataStoreBase<DataType>> extends UmbWorkspaceContext<DataType> {
 
 
 	protected _notificationConsumer!:UmbContextConsumer;
@@ -30,7 +30,7 @@ export abstract class UmbWorkspaceWithStoreContext<DataType extends DocumentDeta
 		});
 
 		// TODO: consider if store alias should be configurable of manifest:
-		this._storeConsumer = new UmbContextConsumer(this._target, storeAlias, (_instance: UmbDataStoreBase<DataType>) => {
+		this._storeConsumer = new UmbContextConsumer(this._target, storeAlias, (_instance: StoreType) => {
 			this._store = _instance;
 			if(!this._store) {
 				// TODO: if we keep the type assumption of _store existing, then we should here make sure to break the application in a good way.
@@ -59,7 +59,7 @@ export abstract class UmbWorkspaceWithStoreContext<DataType extends DocumentDeta
 	}*/
 
 
-	public getStore():UmbDataStoreBase<DataType> {
+	public getStore():StoreType {
 		return this._store;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/models/index.ts b/src/Umbraco.Web.UI.Client/src/core/models/index.ts
index 6bd4c46fcc..a87476df72 100644
--- a/src/Umbraco.Web.UI.Client/src/core/models/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/models/index.ts
@@ -14,6 +14,7 @@ export * from '../extensions-registry/models';
 export type HTMLElementConstructor<T = HTMLElement> = new (...args: any[]) => T;
 
 // Users
+// TODO: would the right name be Node? as entity is just something with a Key. But node is something in a content structure, aka. with hasChildren and parentKey.
 export interface Entity {
 	key: string;
 	name: string;