diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
index efdea09e01..47e717ec86 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
@@ -17,10 +17,8 @@ export interface UmbModalPropertyEditorUIPickerData {
 interface GroupedPropertyEditorUIs {
 	[key: string]: Array<ManifestPropertyEditorUI>;
 }
-
-// TODO: make use of UmbPickerLayoutBase
-@customElement('umb-modal-layout-property-editor-ui-picker')
-export class UmbModalLayoutPropertyEditorUIPickerElement extends UmbLitElement {
+@customElement('umb-property-editor-ui-picker-modal')
+export class UmbPropertyEditorUIPickerModalElement extends UmbLitElement {
 	static styles = [
 		UUITextStyles,
 		css`
@@ -198,8 +196,10 @@ export class UmbModalLayoutPropertyEditorUIPickerElement extends UmbLitElement {
 	}
 }
 
+export default UmbPropertyEditorUIPickerModalElement;
+
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-modal-layout-property-editor-ui-picker': UmbModalLayoutPropertyEditorUIPickerElement;
+		'umb-property-editor-ui-picker-modal': UmbPropertyEditorUIPickerModalElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
index aeb7eba4bc..e9246d16a0 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
@@ -1,7 +1,7 @@
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 import type {
-	UmbModalLayoutPropertyEditorUIPickerElement,
+	UmbPropertyEditorUIPickerModalElement,
 	UmbModalPropertyEditorUIPickerData,
 } from './property-editor-ui-picker-modal.element';
 import './property-editor-ui-picker-modal.element';
@@ -16,6 +16,6 @@ export default {
 
 const data: UmbModalPropertyEditorUIPickerData = { selection: [] };
 
-export const Overview: Story<UmbModalLayoutPropertyEditorUIPickerElement> = () => html`
+export const Overview: Story<UmbPropertyEditorUIPickerModalElement> = () => html`
 	<umb-modal-layout-property-editor-ui-picker .data=${data as any}></umb-modal-layout-property-editor-ui-picker>
 `;