diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts
index f315eee874..b8af412389 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts
@@ -12,19 +12,23 @@ export class UmbPropertyActionMenuElement extends UmbLitElement {
 	#actionsInitializer?: UmbExtensionsElementInitializer<ManifestTypes, 'propertyAction'>;
 
 	@property({ attribute: false })
-	public get value(): unknown {
-		return this._value;
-	}
 	public set value(value: unknown) {
 		this._value = value;
 		if (this.#actionsInitializer) {
 			this.#actionsInitializer.properties = { value };
 		}
 	}
+	public get value(): unknown {
+		return this._value;
+	}
+
 	private _value?: unknown;
 
+	#propertyEditorUiAlias = '';
+
 	@property()
 	set propertyEditorUiAlias(alias: string) {
+		this.#propertyEditorUiAlias = alias;
 		// TODO: Stop using string for 'propertyAction', we need to start using Const.
 		// TODO: Align property actions with entity actions.
 		this.#actionsInitializer = new UmbExtensionsElementInitializer(
@@ -38,6 +42,10 @@ export class UmbPropertyActionMenuElement extends UmbLitElement {
 			'extensionsInitializer',
 		);
 	}
+	get propertyEditorUiAlias() {
+		return this.#propertyEditorUiAlias;
+	}
+
 	@state()
 	private _actions: Array<UmbExtensionElementInitializer<ManifestPropertyAction, any>> = [];
 
@@ -80,3 +88,9 @@ export class UmbPropertyActionMenuElement extends UmbLitElement {
 		`,
 	];
 }
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-property-action-menu': UmbPropertyActionMenuElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts
index dc0e41c16f..be0ca6343a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/index.ts
@@ -1,4 +1,4 @@
-export * from './workspace-action-menu/index.js';
+export * from './workspace-entity-action-menu/index.js';
 export * from './workspace-action/index.js';
 export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/index.ts
deleted file mode 100644
index 02d1af5c38..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './workspace-action-menu.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/index.ts
new file mode 100644
index 0000000000..44a6ce51e0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/index.ts
@@ -0,0 +1 @@
+export * from './workspace-entity-action-menu.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
similarity index 86%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
index 92380bea73..22e3c54f50 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
@@ -3,8 +3,8 @@ import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffic
 import type { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
-@customElement('umb-workspace-action-menu')
-export class UmbWorkspaceActionMenuElement extends UmbLitElement {
+@customElement('umb-workspace-entity-action-menu')
+export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement {
 	private _workspaceContext?: typeof UMB_WORKSPACE_CONTEXT.TYPE;
 
 	@state()
@@ -49,12 +49,12 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
 	#renderActionsMenu() {
 		return this._entityId && this._entityType
 			? html`
-					<uui-button popovertarget="workspace-action-menu-popover" label="Actions">
+					<uui-button popovertarget="workspace-entity-action-menu-popover" label="Actions">
 						Actions
 						<uui-symbol-expand .open=${this._popoverOpen}></uui-symbol-expand>
 					</uui-button>
 					<uui-popover-container
-						id="workspace-action-menu-popover"
+						id="workspace-entity-action-menu-popover"
 						placement="bottom-end"
 						@toggle=${this.#onPopoverToggle}>
 						<umb-popover-layout>
@@ -87,6 +87,6 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-workspace-action-menu': UmbWorkspaceActionMenuElement;
+		'umb-workspace-entity-action-menu': UmbWorkspaceEntityActionMenuElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
index f498ff31b0..840765e937 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
@@ -31,7 +31,7 @@ export class UmbWorkspaceSplitViewElement extends UmbLitElement {
 					<umb-variant-selector></umb-variant-selector>
 				</div>
 				${this.displayNavigation
-					? html`<umb-workspace-action-menu slot="action-menu"></umb-workspace-action-menu>`
+					? html`<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>`
 					: ''}
 				<slot name="action-menu" slot="action-menu"></slot>
 			</umb-workspace-editor>
diff --git a/src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx b/src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
index 725b5253c4..f9b35e3215 100644
--- a/src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
+++ b/src/Umbraco.Web.UI.Client/storybook/stories/extending/entity-actions.mdx
@@ -28,7 +28,7 @@ TODO: introduction to actions
 			</td>
 			<td>
 				<div>
-					<strong>Workspace Action Menu</strong>
+					<strong>Workspace Entity Action Menu</strong>
 				</div>
 				<img src="docs/entity-action-workspace-menu.svg" width="400" />
 			</td>