diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts
index 9d7674bd31..447442f0d0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts
@@ -48,20 +48,12 @@ export class UmbDocumentWorkspaceViewEditTabElement extends UmbLitElement {
 		this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (workspaceContext) => {
 			this.#groupStructureHelper.setStructureManager(workspaceContext.structure);
 		});
-		this.observe(
-			this.#groupStructureHelper.containers,
-			(groups) => {
-				this._groups = groups;
-			},
-			null,
-		);
-		this.observe(
-			this.#groupStructureHelper.hasProperties,
-			(hasProperties) => {
-				this._hasProperties = hasProperties;
-			},
-			null,
-		);
+		this.observe(this.#groupStructureHelper.containers, (groups) => {
+			this._groups = groups;
+		});
+		this.observe(this.#groupStructureHelper.hasProperties, (hasProperties) => {
+			this._hasProperties = hasProperties;
+		});
 	}
 
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts
index afcf72ebb3..f1c7e9a19f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts
@@ -8,40 +8,33 @@ import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffic
 import './media-workspace-view-edit-properties.element.js';
 @customElement('umb-media-workspace-view-edit-tab')
 export class UmbMediaWorkspaceViewEditTabElement extends UmbLitElement {
-	private _tabName?: string | undefined;
-
 	@property({ type: String })
 	public get tabName(): string | undefined {
-		return this._groupStructureHelper.getName();
+		return this.#groupStructureHelper.getName();
 	}
 	public set tabName(value: string | undefined) {
-		if (value === this._tabName) return;
-		const oldValue = this._tabName;
-		this._tabName = value;
-		this._groupStructureHelper.setName(value);
-		this.requestUpdate('tabName', oldValue);
+		const oldName = this.#groupStructureHelper.getName();
+		this.#groupStructureHelper.setName(value);
+		this.requestUpdate('tabName', oldName);
 	}
 
 	@property({ type: Boolean })
 	public get noTabName(): boolean {
-		return this._groupStructureHelper.getIsRoot();
+		return this.#groupStructureHelper.getIsRoot();
 	}
 	public set noTabName(value: boolean) {
-		this._groupStructureHelper.setIsRoot(value);
+		this.#groupStructureHelper.setIsRoot(value);
 	}
 
-	private _ownerTabId?: string | null;
 	@property({ type: String })
-	public get ownerTabId(): string | null | undefined {
-		return this._ownerTabId;
+	public get containerId(): string | null | undefined {
+		return this.#groupStructureHelper.getParentId();
 	}
-	public set ownerTabId(value: string | null | undefined) {
-		if (value === this._ownerTabId) return;
-		this._ownerTabId = value;
-		this._groupStructureHelper.setParentId(value);
+	public set containerId(value: string | null | undefined) {
+		this.#groupStructureHelper.setParentId(value);
 	}
 
-	_groupStructureHelper = new UmbContentTypeContainerStructureHelper<any>(this);
+	#groupStructureHelper = new UmbContentTypeContainerStructureHelper<any>(this);
 
 	@state()
 	_groups: Array<PropertyTypeContainerModelBaseModel> = [];
@@ -52,15 +45,13 @@ export class UmbMediaWorkspaceViewEditTabElement extends UmbLitElement {
 	constructor() {
 		super();
 
-		this._groupStructureHelper.setParentType('Tab');
-
 		this.consumeContext(UMB_MEDIA_WORKSPACE_CONTEXT, (workspaceContext) => {
-			this._groupStructureHelper.setStructureManager(workspaceContext.structure);
+			this.#groupStructureHelper.setStructureManager(workspaceContext.structure);
 		});
-		this.observe(this._groupStructureHelper.containers, (groups) => {
+		this.observe(this.#groupStructureHelper.containers, (groups) => {
 			this._groups = groups;
 		});
-		this.observe(this._groupStructureHelper.hasProperties, (hasProperties) => {
+		this.observe(this.#groupStructureHelper.hasProperties, (hasProperties) => {
 			this._hasProperties = hasProperties;
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts
index 41f1c6e896..8f3f7f75ca 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts
@@ -78,8 +78,7 @@ export class UmbMediaWorkspaceViewEditElement extends UmbLitElement implements U
 					setup: (component) => {
 						(component as UmbMediaWorkspaceViewEditTabElement).tabName = tabName;
 						// TODO: Consider if we can link these more simple, and not parse this on.
-						(component as UmbMediaWorkspaceViewEditTabElement).ownerTabId =
-							this._tabsStructureHelper.isOwnerChildContainer(tab.id!) ? tab.id : undefined;
+						(component as UmbMediaWorkspaceViewEditTabElement).containerId = tab.id;
 					},
 				});
 			});
@@ -91,7 +90,7 @@ export class UmbMediaWorkspaceViewEditElement extends UmbLitElement implements U
 				component: () => import('./media-workspace-view-edit-tab.element.js'),
 				setup: (component) => {
 					(component as UmbMediaWorkspaceViewEditTabElement).noTabName = true;
-					(component as UmbMediaWorkspaceViewEditTabElement).ownerTabId = null;
+					(component as UmbMediaWorkspaceViewEditTabElement).containerId = null;
 				},
 			});
 		}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts
index bcd9425a75..0256197809 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts
@@ -8,40 +8,33 @@ import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffic
 import './member-workspace-view-content-properties.element.js';
 @customElement('umb-member-workspace-view-content-tab')
 export class UmbMemberWorkspaceViewContentTabElement extends UmbLitElement {
-	private _tabName?: string | undefined;
-
 	@property({ type: String })
 	public get tabName(): string | undefined {
-		return this._groupStructureHelper.getName();
+		return this.#groupStructureHelper.getName();
 	}
 	public set tabName(value: string | undefined) {
-		if (value === this._tabName) return;
-		const oldValue = this._tabName;
-		this._tabName = value;
-		this._groupStructureHelper.setName(value);
-		this.requestUpdate('tabName', oldValue);
+		const oldName = this.#groupStructureHelper.getName();
+		this.#groupStructureHelper.setName(value);
+		this.requestUpdate('tabName', oldName);
 	}
 
 	@property({ type: Boolean })
 	public get noTabName(): boolean {
-		return this._groupStructureHelper.getIsRoot();
+		return this.#groupStructureHelper.getIsRoot();
 	}
 	public set noTabName(value: boolean) {
-		this._groupStructureHelper.setIsRoot(value);
+		this.#groupStructureHelper.setIsRoot(value);
 	}
 
-	private _ownerTabId?: string | null;
 	@property({ type: String })
-	public get ownerTabId(): string | null | undefined {
-		return this._ownerTabId;
+	public get containerId(): string | null | undefined {
+		return this.#groupStructureHelper.getParentId();
 	}
-	public set ownerTabId(value: string | null | undefined) {
-		if (value === this._ownerTabId) return;
-		this._ownerTabId = value;
-		this._groupStructureHelper.setParentId(value);
+	public set containerId(value: string | null | undefined) {
+		this.#groupStructureHelper.setParentId(value);
 	}
 
-	_groupStructureHelper = new UmbContentTypeContainerStructureHelper<any>(this);
+	#groupStructureHelper = new UmbContentTypeContainerStructureHelper<any>(this);
 
 	@state()
 	_groups: Array<PropertyTypeContainerModelBaseModel> = [];
@@ -52,15 +45,13 @@ export class UmbMemberWorkspaceViewContentTabElement extends UmbLitElement {
 	constructor() {
 		super();
 
-		this._groupStructureHelper.setParentType('Tab');
-
 		this.consumeContext(UMB_MEMBER_WORKSPACE_CONTEXT, (workspaceContext) => {
-			this._groupStructureHelper.setStructureManager(workspaceContext.structure);
+			this.#groupStructureHelper.setStructureManager(workspaceContext.structure);
 		});
-		this.observe(this._groupStructureHelper.containers, (groups) => {
+		this.observe(this.#groupStructureHelper.containers, (groups) => {
 			this._groups = groups;
 		});
-		this.observe(this._groupStructureHelper.hasProperties, (hasProperties) => {
+		this.observe(this.#groupStructureHelper.hasProperties, (hasProperties) => {
 			this._hasProperties = hasProperties;
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts
index bf7b9bb5fc..be6129d3f9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts
@@ -78,8 +78,7 @@ export class UmbMemberWorkspaceViewEditElement extends UmbLitElement implements
 					setup: (component) => {
 						(component as UmbMemberWorkspaceViewContentTabElement).tabName = tabName;
 						// TODO: Consider if we can link these more simple, and not parse this on.
-						(component as UmbMemberWorkspaceViewContentTabElement).ownerTabId =
-							this._tabsStructureHelper.isOwnerChildContainer(tab.id!) ? tab.id : undefined;
+						(component as UmbMemberWorkspaceViewContentTabElement).containerId = tab.id;
 					},
 				});
 			});
@@ -91,7 +90,7 @@ export class UmbMemberWorkspaceViewEditElement extends UmbLitElement implements
 				component: () => import('./member-workspace-view-content-tab.element.js'),
 				setup: (component) => {
 					(component as UmbMemberWorkspaceViewContentTabElement).noTabName = true;
-					(component as UmbMemberWorkspaceViewContentTabElement).ownerTabId = null;
+					(component as UmbMemberWorkspaceViewContentTabElement).containerId = null;
 				},
 			});
 		}