diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-link-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-link-picker.element.ts
index d93c77a974..e1034d6428 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-link-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-link-picker.element.ts
@@ -7,8 +7,8 @@ import { UmbTreeElement } from '../../components/tree/tree.element';
 import { UmbLinkPickerConfig, UmbLinkPickerLink, UmbLinkPickerModalData } from '.';
 import { buildUdi, getKeyFromUdi } from '@umbraco-cms/utils';
 
-@customElement('umb-modal-layout-link-picker')
-export class UmbModalLayoutLinkPickerElement extends UmbModalLayoutElement<UmbLinkPickerModalData> {
+@customElement('umb-link-picker-modal')
+export class UmbLinkPickerModalElement extends UmbModalLayoutElement<UmbLinkPickerModalData> {
 	static styles = [
 		UUITextStyles,
 		css`
@@ -197,6 +197,6 @@ export class UmbModalLayoutLinkPickerElement extends UmbModalLayoutElement<UmbLi
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-modal-layout-link-picker': UmbModalLayoutLinkPickerElement;
+		'umb-link-picker-modal': UmbLinkPickerModalElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-multi-url-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-multi-url-picker.stories.ts
index e16539b91c..32b5d95de7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-multi-url-picker.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/modal-layout-multi-url-picker.stories.ts
@@ -4,17 +4,17 @@ import './modal-layout-link-picker.element';
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit';
 
-import type { UmbModalLayoutLinkPickerElement } from './modal-layout-link-picker.element';
+import type { UmbLinkPickerModalElement } from './modal-layout-link-picker.element';
 
 export default {
 	title: 'API/Modals/Layouts/Link Picker',
-	component: 'umb-modal-layout-link-picker',
-	id: 'modal-layout-link-picker',
+	component: 'umb-link-picker-modal',
+	id: 'umb-link-picker-modal',
 } as Meta;
 
-export const Overview: Story<UmbModalLayoutLinkPickerElement> = () => html`
+export const Overview: Story<UmbLinkPickerModalElement> = () => html`
 	<!-- TODO: figure out if generics are allowed for properties:
 	https://github.com/runem/lit-analyzer/issues/149
 	https://github.com/runem/lit-analyzer/issues/163 -->
-	<umb-modal-layout-link-picker></umb-modal-layout-link-picker>
+	<umb-link-picker-modal></umb-link-picker-modal>
 `;