diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
index c498fc6144..abd78bfa28 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/index.ts
@@ -2,4 +2,4 @@ export * from './components/index.js';
 export * from './config/index.js';
 export * from './constants.js';
 export * from './events/index.js';
-export * from './property-editor-ui-picker/index.js';
+export * from './ui-picker-modal/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts
index acb95199f1..fb5a8ae26f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/manifests.ts
@@ -1,3 +1,3 @@
-import { manifests as uiPickerModalManifests } from './property-editor-ui-picker/manifests.js';
+import { manifests as uiPickerModalManifests } from './ui-picker-modal/manifests.js';
 
 export const manifests: Array<UmbExtensionManifest> = [...uiPickerModalManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.stories.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.stories.ts
index b9d8b53d98..6d9d81d8a6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.stories.ts
@@ -4,7 +4,7 @@ import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
 
 import './property-editor-ui-picker-modal.element.js';
-import '../../../core/components/body-layout/body-layout.element.js';
+import '../../components/body-layout/body-layout.element.js';
 
 export default {
 	title: 'API/Modals/Layouts/Property Editor UI Picker',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/property-editor-ui-picker/property-editor-ui-picker-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.token.ts