diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
index 58d7bf467a..bcdf4e6a35 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
@@ -9,17 +9,17 @@ export interface UmbWorkspaceAction<WorkspaceType = unknown> extends UmbApi {
 	execute(): Promise<void>;
 }
 
-export abstract class UmbWorkspaceActionBase<WorkspaceType extends UmbWorkspaceContextInterface>
-	implements UmbWorkspaceAction<WorkspaceType>
+export abstract class UmbWorkspaceActionBase<WorkspaceContextType extends UmbWorkspaceContextInterface>
+	implements UmbWorkspaceAction<WorkspaceContextType>
 {
 	host: UmbControllerHostElement;
-	workspaceContext?: WorkspaceType;
+	workspaceContext?: WorkspaceContextType;
 	constructor(host: UmbControllerHostElement) {
 		this.host = host;
 
 		new UmbContextConsumerController(this.host, UMB_WORKSPACE_CONTEXT, (instance) => {
 			// TODO: Be aware we are casting here. We should consider a better solution for typing the contexts. (But notice we still want to capture the first workspace...)
-			this.workspaceContext = instance as unknown as WorkspaceType;
+			this.workspaceContext = instance as unknown as WorkspaceContextType;
 		});
 	}
 	abstract execute(): Promise<void>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts
index 057260abaf..45bef2b98d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts
@@ -135,7 +135,6 @@ export class UmbDocumentTypeWorkspaceContext
 		this.setIsSorting(false);
 		//this.#draft.next(data);
 		return { data } || undefined;
-		// TODO: Is this wrong? should we return { data }??
 	}
 
 	async load(entityId: string) {
@@ -146,7 +145,6 @@ export class UmbDocumentTypeWorkspaceContext
 		this.setIsSorting(false);
 		//this.#draft.next(data);
 		return { data } || undefined;
-		// TODO: Is this wrong? should we return { data }??
 	}
 
 	/**