diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
index 7bedd2dab7..23ec67e716 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
@@ -1,5 +1,5 @@
 //TODO: we need to figure out what components should be available for extensions and load them upfront
-import './editors/shared/editor-entity-layout/editor-entity-layout.element';
+import './workspaces/shared/editor-entity-layout/editor-entity-layout.element';
 import './components/ref-property-editor-ui/ref-property-editor-ui.element';
 import './components/backoffice-frame/backoffice-header.element';
 import './components/backoffice-frame/backoffice-main.element';
@@ -37,7 +37,7 @@ import { manifests as sectionManifests } from './sections/manifests';
 import { manifests as propertyEditorModelManifests } from './property-editor-models/manifests';
 import { manifests as propertyEditorUIManifests } from './property-editor-uis/manifests';
 import { manifests as treeManifests } from './trees/manifests';
-import { manifests as editorManifests } from './editors/manifests';
+import { manifests as editorManifests } from './workspaces/manifests';
 import { manifests as propertyActionManifests } from './property-actions/manifests';
 import { manifests as externalLoginProviderManifests } from './external-login-providers/manifests';
 import { manifests as userDashboards } from './user-dashboards/manifests';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts
index 03a6d05e01..00c8b05d01 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts
@@ -8,7 +8,7 @@ import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import type { ManifestPropertyEditorUI, ManifestTypes } from '@umbraco-cms/models';
 
 import '../../property-actions/shared/property-action-menu/property-action-menu.element';
-import '../../editors/shared/editor-property-layout/editor-property-layout.element';
+import '../../workspaces/shared/editor-property-layout/editor-property-layout.element';
 
 /**
  *  @element umb-entity-property
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts
index 2972eb91cf..c105a5aad9 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/created/section-view-packages-created.element.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { IRoute, IRoutingInfo } from 'router-slot';
-import { UmbEditorEntityElement } from '../../../../editors/shared/editor-entity/editor-entity.element';
+import { UmbWorkspaceEntityElement } from '../../../../workspaces/shared/workspace-entity/workspace-entity.element';
 
 @customElement('umb-section-view-packages-created')
 export class UmbSectionViewPackagesCreatedElement extends LitElement {
@@ -13,9 +13,9 @@ export class UmbSectionViewPackagesCreatedElement extends LitElement {
 		},
 		{
 			path: `:entityType/:key`,
-			component: () => import('../../../../editors/shared/editor-entity/editor-entity.element'),
+			component: () => import('../../../../workspaces/shared/workspace-entity/workspace-entity.element'),
 			setup: (component: HTMLElement, info: IRoutingInfo) => {
-				const element = component as UmbEditorEntityElement;
+				const element = component as UmbWorkspaceEntityElement;
 				element.entityKey = info.match.params.key;
 				element.entityType = info.match.params.entityType;
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts
index 2123f9f3d3..333cf299a8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/views/installed/section-view-packages-installed.element.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { IRoute, IRoutingInfo } from 'router-slot';
-import { UmbEditorEntityElement } from '../../../../editors/shared/editor-entity/editor-entity.element';
+import { UmbWorkspaceEntityElement } from '../../../../workspaces/shared/workspace-entity/workspace-entity.element';
 
 @customElement('umb-section-view-packages-installed')
 export class UmbSectionViewPackagesInstalledElement extends LitElement {
@@ -13,9 +13,9 @@ export class UmbSectionViewPackagesInstalledElement extends LitElement {
 		},
 		{
 			path: `:entityType/:key`,
-			component: () => import('../../../../editors/shared/editor-entity/editor-entity.element'),
+			component: () => import('../../../../workspaces/shared/workspace-entity/workspace-entity.element'),
 			setup: (component: HTMLElement, info: IRoutingInfo) => {
-				const element = component as UmbEditorEntityElement;
+				const element = component as UmbWorkspaceEntityElement;
 				element.entityKey = info.match.params.key;
 				element.entityType = info.match.params.entityType;
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts
index d6331a6fe2..acb0d143fe 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts
@@ -3,7 +3,7 @@ import { css, html, LitElement, nothing } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import { map, switchMap, EMPTY, of } from 'rxjs';
 import { UmbSectionContext } from '../section.context';
-import { UmbEditorEntityElement } from '../../editors/shared/editor-entity/editor-entity.element';
+import { UmbWorkspaceEntityElement } from '../../workspaces/shared/workspace-entity/workspace-entity.element';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import { createExtensionElement } from '@umbraco-cms/extensions-api';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
@@ -85,16 +85,16 @@ export class UmbSectionElement extends UmbContextConsumerMixin(UmbObserverMixin(
 			},
 			{
 				path: `:entityType/:key`,
-				component: () => import('../../editors/shared/editor-entity/editor-entity.element'),
-				setup: (component: UmbEditorEntityElement, info: any) => {
+				component: () => import('../../workspaces/shared/workspace-entity/workspace-entity.element'),
+				setup: (component: UmbWorkspaceEntityElement, info: any) => {
 					component.entityKey = info.match.params.key;
 					component.entityType = info.match.params.entityType;
 				},
 			},
 			{
 				path: `:entityType`,
-				component: () => import('../../editors/shared/editor-entity/editor-entity.element'),
-				setup: (component: UmbEditorEntityElement, info: any) => {
+				component: () => import('../../workspaces/shared/workspace-entity/workspace-entity.element'),
+				setup: (component: UmbWorkspaceEntityElement, info: any) => {
 					component.entityType = info.match.params.entityType;
 				},
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
index a525cb8862..f01564081e 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { BehaviorSubject, Observable } from 'rxjs';
 import type { IRoute, IRoutingInfo } from 'router-slot';
-import UmbEditorEntityElement from '../../../../editors/shared/editor-entity/editor-entity.element';
+import UmbWorkspaceEntityElement from '../../../../workspaces/shared/workspace-entity/workspace-entity.element';
 import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api';
 
 import './list-view-layouts/table/editor-view-users-table.element';
@@ -35,9 +35,9 @@ export class UmbSectionViewUsersElement extends UmbContextProviderMixin(
 		},
 		{
 			path: `:entityType/:key`,
-			component: () => import('../../../../editors/shared/editor-entity/editor-entity.element'),
+			component: () => import('../../../../workspaces/shared/workspace-entity/workspace-entity.element'),
 			setup: (component: HTMLElement, info: IRoutingInfo) => {
-				const element = component as UmbEditorEntityElement;
+				const element = component as UmbWorkspaceEntityElement;
 				element.entityKey = info.match.params.key;
 				element.entityType = info.match.params.entityType;
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/actions/save/editor-action-data-type-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/actions/save/editor-action-data-type-save.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/actions/save/editor-action-data-type-save.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/actions/save/editor-action-data-type-save.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/data-type.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/data-type.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/data-type.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/data-type.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/editor-data-type.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/editor-data-type.element.ts
index 6b4471bbb8..aa90782203 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/editor-data-type.element.ts
@@ -139,9 +139,9 @@ export class UmbEditorDataTypeElement extends UmbContextProviderMixin(
 
 	render() {
 		return html`
-			<umb-editor-entity-layout alias="Umb.Editor.DataType">
+			<umb-workspace-entity-layout alias="Umb.Editor.DataType">
 				<uui-input id="header" slot="header" .value=${this._dataTypeName} @input="${this._handleInput}"></uui-input>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/editor-data-type.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/editor-data-type.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/edit/editor-view-data-type-edit.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/edit/editor-view-data-type-edit.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/edit/editor-view-data-type-edit.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/edit/editor-view-data-type-edit.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/info/editor-view-data-type-info.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/info/editor-view-data-type-info.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/info/editor-view-data-type-info.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/data-type/views/info/editor-view-data-type-info.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/actions/save/editor-action-document-type-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/actions/save/editor-action-document-type-save.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/actions/save/editor-action-document-type-save.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/actions/save/editor-action-document-type-save.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/document-type.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/document-type.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/document-type.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/document-type.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/editor-document-type.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/editor-document-type.element.ts
index aaf0777440..d21928fac5 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/editor-document-type.element.ts
@@ -127,7 +127,7 @@ export class UmbEditorDocumentTypeElement extends UmbContextProviderMixin(
 
 	render() {
 		return html`
-			<umb-editor-entity-layout alias="Umb.Editor.DocumentType">
+			<umb-workspace-entity-layout alias="Umb.Editor.DocumentType">
 				<div id="header" slot="header">
 					<umb-property-editor-ui-icon-picker></umb-property-editor-ui-icon-picker>
 					<uui-input id="name" .value=${this._documentType?.name} @input="${this._handleInput}">
@@ -136,7 +136,7 @@ export class UmbEditorDocumentTypeElement extends UmbContextProviderMixin(
 				</div>
 
 				<div slot="footer">Keyboard Shortcuts</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/editor-document-type.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/editor-document-type.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/design/editor-view-document-type-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/views/design/editor-view-document-type-design.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/design/editor-view-document-type-design.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/views/design/editor-view-document-type-design.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/design/editor-view-document-type-design.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/views/design/editor-view-document-type-design.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/design/editor-view-document-type-design.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document-type/views/design/editor-view-document-type-design.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document/editor-document.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document/editor-document.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document/editor-document.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/document/editor-document.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/extensions/editor-extensions.element.ts
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/extensions/editor-extensions.element.ts
index 969f3afb65..034eb53c0f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/extensions/editor-extensions.element.ts
@@ -24,7 +24,7 @@ export class UmbEditorExtensionsElement extends UmbContextConsumerMixin(UmbObser
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Extensions" alias="Umb.Editor.Extensions">
+			<umb-workspace-entity-layout headline="Extensions" alias="Umb.Editor.Extensions">
 				<uui-box>
 					<p>List of currently loaded extensions</p>
 					<uui-table>
@@ -49,7 +49,7 @@ export class UmbEditorExtensionsElement extends UmbContextConsumerMixin(UmbObser
 						)}
 					</uui-table>
 				</uui-box>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/extensions/editor-extensions.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/extensions/editor-extensions.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media-type/editor-media-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media-type/editor-media-type.element.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/media-type/editor-media-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media-type/editor-media-type.element.ts
index 8f10ec3f5f..688c46c6b6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media-type/editor-media-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media-type/editor-media-type.element.ts
@@ -21,7 +21,7 @@ export class UmbEditorMediaTypeElement extends LitElement {
 	id!: string;
 
 	render() {
-		return html` <umb-editor-entity-layout alias="Umb.Editor.MediaType">Media Type Editor</umb-editor-entity-layout> `;
+		return html` <umb-workspace-entity-layout alias="Umb.Editor.MediaType">Media Type Editor</umb-workspace-entity-layout> `;
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media/editor-media.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media/editor-media.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media/editor-media.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/media/editor-media.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/member-group/editor-member-group.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member-group/editor-member-group.element.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/member-group/editor-member-group.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member-group/editor-member-group.element.ts
index 4b3ddd2105..6a0a1a8655 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/member-group/editor-member-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member-group/editor-member-group.element.ts
@@ -20,7 +20,7 @@ export class UmbEditorMemberGroupElement extends LitElement {
 
 	render() {
 		return html`
-			<umb-editor-entity-layout alias="Umb.Editor.MemberGroup">Member Group Editor</umb-editor-entity-layout>
+			<umb-workspace-entity-layout alias="Umb.Editor.MemberGroup">Member Group Editor</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/member-type/editor-member-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member-type/editor-member-type.element.ts
similarity index 86%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/member-type/editor-member-type.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member-type/editor-member-type.element.ts
index 95dc175aed..83501b146c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/member-type/editor-member-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member-type/editor-member-type.element.ts
@@ -22,7 +22,7 @@ export class UmbEditorMemberTypeElement extends LitElement {
 
 	render() {
 		return html`
-			<umb-editor-entity-layout alias="Umb.Editor.MemberType">Member Type Editor</umb-editor-entity-layout>
+			<umb-workspace-entity-layout alias="Umb.Editor.MemberType">Member Type Editor</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/member/editor-member.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member/editor-member.element.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/member/editor-member.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member/editor-member.element.ts
index e29a2a1317..78d4c478c1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/member/editor-member.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/member/editor-member.element.ts
@@ -19,7 +19,7 @@ export class UmbEditorMemberElement extends LitElement {
 	id!: string;
 
 	render() {
-		return html` <umb-editor-entity-layout alias="Umb.Editor.Member">Member Editor</umb-editor-entity-layout> `;
+		return html` <umb-workspace-entity-layout alias="Umb.Editor.Member">Member Editor</umb-workspace-entity-layout> `;
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/package-builder/editor-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/package-builder/editor-package-builder.element.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/package-builder/editor-package-builder.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/package-builder/editor-package-builder.element.ts
index f5c0bdceb3..c1b3eb876e 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/package-builder/editor-package-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/package-builder/editor-package-builder.element.ts
@@ -16,8 +16,8 @@ export class UmbEditorPackageBuilderElement extends LitElement {
 	];
 
 	render() {
-		return html`<umb-editor-entity-layout alias="Umb.Editor.PackageBuilder"
-			>PACKAGE BUILDER</umb-editor-entity-layout
+		return html`<umb-workspace-entity-layout alias="Umb.Editor.PackageBuilder"
+			>PACKAGE BUILDER</umb-workspace-entity-layout
 		> `;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/package/editor-package.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/package/editor-package.element.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/package/editor-package.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/package/editor-package.element.ts
index 8d40a8240b..67c9ac2484 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/package/editor-package.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/package/editor-package.element.ts
@@ -16,7 +16,7 @@ export class UmbEditorPackageElement extends LitElement {
 	];
 
 	render() {
-		return html`<umb-editor-entity-layout alias="Umb.Editor.Package">PACKAGE EDITOR</umb-editor-entity-layout> `;
+		return html`<umb-workspace-entity-layout alias="Umb.Editor.Package">PACKAGE EDITOR</umb-workspace-entity-layout> `;
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-action-extension/editor-action-extension.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-action-extension/editor-action-extension.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-action-extension/editor-action-extension.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-action-extension/editor-action-extension.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/editor-content.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/editor-content.element.ts
similarity index 98%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/editor-content.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/editor-content.element.ts
index 0041e9046a..149b0057d7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/editor-content.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/editor-content.element.ts
@@ -172,7 +172,7 @@ export class UmbEditorContentElement extends UmbContextProviderMixin(
 
 	render() {
 		return html`
-			<umb-editor-entity-layout alias=${this.alias}>
+			<umb-workspace-entity-layout alias=${this.alias}>
 				<div id="header" slot="header">
 					<uui-input id="name-input" .value=${this._content?.name} @input="${this._handleInput}">
 						<!-- Implement Variant Selector -->
@@ -215,7 +215,7 @@ export class UmbEditorContentElement extends UmbContextProviderMixin(
 					look="primary"
 					color="positive"
 					label="Save and publish"></uui-button>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/editor-content.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/editor-content.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/editor-content.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/editor-content.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/node.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/node.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/node.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/node.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/edit/editor-view-content-edit.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/edit/editor-view-content-edit.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/edit/editor-view-content-edit.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/edit/editor-view-content-edit.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/info/editor-view-content-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/info/editor-view-content-info.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/info/editor-view-content-info.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/info/editor-view-content-info.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/info/editor-view-content-info.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/info/editor-view-content-info.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/info/editor-view-content-info.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-content/views/info/editor-view-content-info.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-entity-layout/editor-entity-layout.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-entity-layout/editor-entity-layout.element.ts
index 7ff23cf616..66113b3585 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-entity-layout/editor-entity-layout.element.ts
@@ -15,7 +15,7 @@ import '../../../components/extension-slot/extension-slot.element';
 import '../editor-action-extension/editor-action-extension.element';
 
 /**
- * @element umb-editor-entity-layout
+ * @element umb-workspace-entity-layout
  * @description
  * @slot icon - Slot for rendering the entity icon
  * @slot name - Slot for rendering the entity name
@@ -26,7 +26,7 @@ import '../editor-action-extension/editor-action-extension.element';
  * @class UmbEditorEntityLayout
  * @extends {UmbContextConsumerMixin(LitElement)}
  */
-@customElement('umb-editor-entity-layout')
+@customElement('umb-workspace-entity-layout')
 export class UmbEditorEntityLayout extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
 	static styles = [
 		UUITextStyles,
@@ -171,6 +171,6 @@ export class UmbEditorEntityLayout extends UmbContextConsumerMixin(UmbObserverMi
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-editor-entity-layout': UmbEditorEntityLayout;
+		'umb-workspace-entity-layout': UmbEditorEntityLayout;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-entity-layout/editor-entity-layout.stories.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-entity-layout/editor-entity-layout.stories.ts
index de23679089..fd84ac3fa8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-entity-layout/editor-entity-layout.stories.ts
@@ -7,15 +7,15 @@ import type { UmbEditorEntityLayout } from './editor-entity-layout.element';
 
 export default {
 	title: 'Editors/Shared/Editor Entity Layout',
-	component: 'umb-editor-entity-layout',
-	id: 'umb-editor-entity-layout',
+	component: 'umb-workspace-entity-layout',
+	id: 'umb-workspace-entity-layout',
 } as Meta;
 
-export const AAAOverview: Story<UmbEditorEntityLayout> = () => html` <umb-editor-entity-layout>
+export const AAAOverview: Story<UmbEditorEntityLayout> = () => html` <umb-workspace-entity-layout>
 	<div slot="icon"><uui-button color="" look="placeholder">Icon slot</uui-button></div>
 	<div slot="name"><uui-button color="" look="placeholder">Name slot</uui-button></div>
 	<div slot="footer"><uui-button color="" look="placeholder">Footer slot</uui-button></div>
 	<div slot="actions"><uui-button color="" look="placeholder">Actions slot</uui-button></div>
 	<uui-button color="" look="placeholder">Default slot</uui-button>
-</umb-editor-entity-layout>`;
+</umb-workspace-entity-layout>`;
 AAAOverview.storyName = 'Overview';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-property-layout/editor-property-layout.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-property-layout/editor-property-layout.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-property-layout/editor-property-layout.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/editor-property-layout/editor-property-layout.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-entity/workspace-entity.element.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-entity/workspace-entity.element.ts
index bbc7e73d7b..32fec89d8a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/shared/workspace-entity/workspace-entity.element.ts
@@ -9,8 +9,8 @@ import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import type { ManifestEditor } from '@umbraco-cms/models';
 
-@customElement('umb-editor-entity')
-export class UmbEditorEntityElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
+@customElement('umb-workspace-entity')
+export class UmbWorkspaceEntityElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
 	static styles = [
 		UUITextStyles,
 		css`
@@ -84,10 +84,10 @@ export class UmbEditorEntityElement extends UmbContextConsumerMixin(UmbObserverM
 	}
 }
 
-export default UmbEditorEntityElement;
+export default UmbWorkspaceEntityElement;
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-editor-entity': UmbEditorEntityElement;
+		'umb-workspace-entity': UmbWorkspaceEntityElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/actions/editor-action-user-group-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/actions/editor-action-user-group-save.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/actions/editor-action-user-group-save.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/actions/editor-action-user-group-save.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/editor-user-group.element.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/editor-user-group.element.ts
index 942270aeb1..1043e5023f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/editor-user-group.element.ts
@@ -377,13 +377,13 @@ export class UmbEditorUserGroupElement extends UmbContextProviderMixin(
 		if (!this._userGroup) return nothing;
 
 		return html`
-			<umb-editor-entity-layout alias="Umb.Editor.UserGroup">
+			<umb-workspace-entity-layout alias="Umb.Editor.UserGroup">
 				<uui-input id="name" slot="header" .value=${this._userGroup.name} @input="${this._handleInput}"></uui-input>
 				<div id="main">
 					<div id="left-column">${this.renderLeftColumn()}</div>
 					<div id="right-column">${this.renderRightColumn()}</div>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/editor-user-group.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/editor-user-group.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/editor-user-group.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/user-group.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/user-group.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user-group/user-group.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user-group/user-group.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/actions/editor-action-user-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/actions/editor-action-user-save.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user/actions/editor-action-user-save.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/actions/editor-action-user-save.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/editor-user.element.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/editor-user.element.ts
index ffe939c570..0433760151 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/editor-user.element.ts
@@ -372,13 +372,13 @@ export class UmbEditorUserElement extends UmbContextProviderMixin(
 		if (!this._user) return html`User not found`;
 
 		return html`
-			<umb-editor-entity-layout alias="Umb.Editor.User">
+			<umb-workspace-entity-layout alias="Umb.Editor.User">
 				<uui-input id="name" slot="name" .value=${this._userName} @input="${this._handleInput}"></uui-input>
 				<div id="main">
 					<div id="left-column">${this._renderLeftColumn()}</div>
 					<div id="right-column">${this._renderRightColumn()}</div>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/editor-user.test.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.test.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/editor-user.test.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/user.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/user.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/user/user.context.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/workspaces/user/user.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts
index b10fd8662c..5f7ba6148e 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts
@@ -73,7 +73,7 @@ export class UmbModalLayoutContentPickerElement extends UmbModalLayoutElement<Um
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Select Content">
+			<umb-workspace-entity-layout headline="Select Content">
 				<uui-box>
 					<uui-input></uui-input>
 					<hr />
@@ -87,7 +87,7 @@ export class UmbModalLayoutContentPickerElement extends UmbModalLayoutElement<Um
 					<uui-button label="Close" @click=${this._close}></uui-button>
 					<uui-button label="Submit" look="primary" color="positive" @click=${this._submit}></uui-button>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
index b5d9ab7666..f6c723ac65 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts
@@ -233,7 +233,7 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Select Icon">
+			<umb-workspace-entity-layout headline="Select Icon">
 				<div id="container">
 					${this.renderSearchbar()}
 					<hr />
@@ -247,7 +247,7 @@ export class UmbModalLayoutIconPickerElement extends UmbModalLayoutElement<UmbMo
 				<uui-button slot="actions" color="positive" look="primary" @click="${this._save}" label="save">
 					Save
 				</uui-button>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-current-user.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-current-user.element.ts
index 4f932cb1a2..85a41f1b10 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-current-user.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-current-user.element.ts
@@ -20,7 +20,7 @@ export class UmbModalLayoutCurrentUserElement extends UmbContextConsumerMixin(Um
 				display: block;
 			}
 			:host,
-			umb-editor-entity-layout {
+			umb-workspace-entity-layout {
 				width: 100%;
 				height: 100%;
 			}
@@ -183,7 +183,7 @@ export class UmbModalLayoutCurrentUserElement extends UmbContextConsumerMixin(Um
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="${this._currentUser?.name || ''}">
+			<umb-workspace-entity-layout headline="${this._currentUser?.name || ''}">
 				<div id="main">
 					<uui-box>
 						<b slot="headline">Your profile</b>
@@ -215,7 +215,7 @@ export class UmbModalLayoutCurrentUserElement extends UmbContextConsumerMixin(Um
 					<uui-button @click=${this._close} look="secondary">Close</uui-button>
 					<uui-button @click=${this._logout} look="primary" color="danger">Logout</uui-button>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.element.ts
index 12dca4bd09..84ed636ca0 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.element.ts
@@ -67,7 +67,7 @@ export class UmbPickerLayoutSectionElement extends UmbContextConsumerMixin(UmbOb
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Select sections">
+			<umb-workspace-entity-layout headline="Select sections">
 				<uui-box>
 					<uui-input label="search"></uui-input>
 					<hr />
@@ -88,7 +88,7 @@ export class UmbPickerLayoutSectionElement extends UmbContextConsumerMixin(UmbOb
 					<uui-button label="Close" @click=${this._close}></uui-button>
 					<uui-button label="Submit" look="primary" color="positive" @click=${this._submit}></uui-button>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.element.ts
index 32d2b5165e..ab22ede384 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.element.ts
@@ -78,7 +78,7 @@ export class UmbPickerLayoutUserGroupElement extends UmbContextConsumerMixin(Umb
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Select user groups">
+			<umb-workspace-entity-layout headline="Select user groups">
 				<uui-box>
 					<uui-input label="search"></uui-input>
 					<hr />
@@ -100,7 +100,7 @@ export class UmbPickerLayoutUserGroupElement extends UmbContextConsumerMixin(Umb
 					<uui-button label="Close" @click=${this._close}></uui-button>
 					<uui-button label="Submit" look="primary" color="positive" @click=${this._submit}></uui-button>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.element.ts
index c754f3d1ad..689bc65774 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.element.ts
@@ -80,7 +80,7 @@ export class UmbPickerLayoutUserElement extends UmbContextConsumerMixin(UmbObser
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Select users">
+			<umb-workspace-entity-layout headline="Select users">
 				<uui-box>
 					<uui-input label="search"></uui-input>
 					<hr />
@@ -102,7 +102,7 @@ export class UmbPickerLayoutUserElement extends UmbContextConsumerMixin(UmbObser
 					<uui-button label="Close" @click=${this._close}></uui-button>
 					<uui-button label="Submit" look="primary" color="positive" @click=${this._submit}></uui-button>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts
index 289f4a84a5..14d1f59b3b 100644
--- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts
@@ -158,13 +158,13 @@ export class UmbModalLayoutPropertyEditorUIPickerElement extends UmbContextConsu
 
 	render() {
 		return html`
-			<umb-editor-entity-layout headline="Select Property Editor UI">
+			<umb-workspace-entity-layout headline="Select Property Editor UI">
 				<uui-box> ${this._renderFilter()} ${this._renderGrid()} </uui-box>
 				<div slot="actions">
 					<uui-button label="Close" @click=${this._close}></uui-button>
 					<uui-button label="${this._submitLabel}" look="primary" color="positive" @click=${this._submit}></uui-button>
 				</div>
-			</umb-editor-entity-layout>
+			</umb-workspace-entity-layout>
 		`;
 	}