diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts
index 812e1bd7f6..8bac2d6a9f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-editor-config/property-editor-config.element.ts
@@ -36,7 +36,7 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement {
 		super();
 
 		this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (instance) => {
-			this.#variantContext = instance.createPropertySetContext(this);
+			this.#variantContext = instance.createInvariantVariantContext(this);
 			this.observe(this.#variantContext.properties, (properties) => {
 				this._properties = properties as Array<PropertyEditorConfigProperty>;
 			}, 'observeProperties');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts
index ba55f834fe..43ee103b87 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts
@@ -16,5 +16,5 @@ export interface UmbInvariantableWorkspaceContextInterface<T = unknown>
 	setPropertyValue(alias: string, value: unknown): Promise<void>;
 
 	// Dataset methods:
-	createPropertySetContext(host: UmbControllerHost): UmbVariantContext;
+	createInvariantVariantContext(host: UmbControllerHost): UmbVariantContext;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts
index 85ee93e1c8..5163d6c4aa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts
@@ -25,5 +25,5 @@ export interface UmbVariantableWorkspaceContextInterface<EntityType = unknown> e
 	//propertyDataByAlias(alias: string, variantId?: UmbVariantId): Observable<ValueModelBaseModel | undefined>;
 
 	// Dataset methods:
-	createVariantPropertySetContext(host: UmbControllerHost, variantId: UmbVariantId): UmbVariantContext;
+	createVariantVariantContext(host: UmbControllerHost, variantId: UmbVariantId): UmbVariantContext;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts
index 02333e7a67..e32cce2ac0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts
@@ -59,7 +59,7 @@ export class UmbWorkspaceSplitViewContext extends UmbBaseController {
 				const variantId = UmbVariantId.Create(activeVariantInfo);
 				// We can safely assume in this context that the workspace is variant.
 				//if(variantId.isInvariant()) {
-					this.#variantContext = this.#workspaceContext?.createVariantPropertySetContext(this, variantId);
+					this.#variantContext = this.#workspaceContext?.createVariantVariantContext(this, variantId);
 				/*} else {
 					this.#variantContext = this.#workspaceContext?.createDatasetContext(this);
 				}*/
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
index 49daa152eb..c1bc00283a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -208,7 +208,7 @@ export class UmbDocumentWorkspaceContext
 	}
 	*/
 
-	public createVariantPropertySetContext(host: UmbControllerHost, variantId: UmbVariantId) {
+	public createVariantVariantContext(host: UmbControllerHost, variantId: UmbVariantId) {
 		return new UmbDocumentVariantContext(host, this, variantId);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts
index 3a6e0009da..fb32520faf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts
@@ -100,7 +100,7 @@ export class UmbDataTypeWorkspaceContext
 		return this._configDefaultData?.find((x) => x.alias === alias)?.value;
 	}
 
-	createPropertySetContext(host: UmbControllerHost): UmbDataTypeVariantContext {
+	createInvariantVariantContext(host: UmbControllerHost): UmbDataTypeVariantContext {
 		return new UmbDataTypeVariantContext(host, this);
 	}