diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/data-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/data-type/index.ts
deleted file mode 100644
index 4ddb2e0bb7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/data-type/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './data-type-property-collection.class.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
index 73287c99f9..6c530463d7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
@@ -7,7 +7,6 @@ import { renderEditor, type tinymce } from '@umbraco-cms/backoffice/external/tin
 import { UMB_AUTH, UmbLoggedInUser } from '@umbraco-cms/backoffice/auth';
 import {
 	TinyMcePluginArguments,
-	UmbDataTypeConfigCollection,
 	UmbTinyMcePluginBase,
 } from '@umbraco-cms/backoffice/components';
 import { ClassConstructor, hasDefaultExport, loadExtension } from '@umbraco-cms/backoffice/extension-api';
@@ -25,12 +24,13 @@ import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
 import { UMB_MODAL_CONTEXT_TOKEN, UmbModalContext } from '@umbraco-cms/backoffice/modal';
 import { UmbMediaHelper } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 // TODO => integrate macro picker, update stylesheet fetch when backend CLI exists (ref tinymce.service.js in existing backoffice)
 @customElement('umb-input-tiny-mce')
 export class UmbInputTinyMceElement extends FormControlMixin(UmbLitElement) {
 	@property({ attribute: false })
-	configuration?: UmbDataTypeConfigCollection;
+	configuration?: UmbPropertyEditorConfigCollection;
 
 	@state()
 	private _tinyConfig: tinymce.RawEditorOptions = {};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts
index fb26439393..2bed6abf22 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts
@@ -1,10 +1,11 @@
-import type { UmbDataTypeConfigCollection, UmbInputTinyMceElement } from '@umbraco-cms/backoffice/components';
+import type { UmbInputTinyMceElement } from '@umbraco-cms/backoffice/components';
 import type { tinymce } from '@umbraco-cms/backoffice/external/tinymce';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 export class UmbTinyMcePluginBase {
 	host: UmbInputTinyMceElement;
 	editor: tinymce.Editor;
-	configuration?: UmbDataTypeConfigCollection;
+	configuration?: UmbPropertyEditorConfigCollection;
 
 	constructor(arg: TinyMcePluginArguments) {
 		this.host = arg.host;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts
index 23a7c556b4..880886367f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/property-type-based-property/property-type-based-property.element.ts
@@ -1,4 +1,4 @@
-import { UmbDataTypeConfig } from '../../property-editor/index.js';
+import { UmbPropertyEditorConfig } from '../../property-editor/index.js';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { css, html, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbDataTypeRepository } from '@umbraco-cms/backoffice/data-type';
@@ -28,7 +28,7 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 	private _propertyEditorUiAlias?: string;
 
 	@state()
-	private _dataTypeData?: UmbDataTypeConfig;
+	private _dataTypeData?: UmbPropertyEditorConfig;
 
 	private _dataTypeRepository: UmbDataTypeRepository = new UmbDataTypeRepository(this);
 	private _dataTypeObserver?: UmbObserverController<DataTypeResponseModel | undefined>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/property-editor-ui-extension-element.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/property-editor-ui-extension-element.interface.ts
index 09d40521dc..9923c20b92 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/property-editor-ui-extension-element.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/property-editor-ui-extension-element.interface.ts
@@ -1,6 +1,6 @@
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from "@umbraco-cms/backoffice/property-editor";
 
 export interface UmbPropertyEditorExtensionElement extends HTMLElement {
 	value: unknown;
-	config?: UmbDataTypeConfigCollection;
+	config?: UmbPropertyEditorConfigCollection;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts
index 8fefc28991..4c4af2eaaa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-editor.model.ts
@@ -1,5 +1,5 @@
 import type { UmbPropertyEditorExtensionElement } from '../interfaces/index.js';
-import type { UmbDataTypeConfig } from '../../property-editor/index.js';
+import type { UmbPropertyEditorConfig } from '../../property-editor/index.js';
 import type { ManifestElement, ManifestBase } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestPropertyEditorUi extends ManifestElement<UmbPropertyEditorExtensionElement> {
@@ -58,7 +58,7 @@ export interface PropertyEditorConfigProperty {
 	description?: string;
 	alias: string;
 	propertyEditorUiAlias: string;
-	config?: UmbDataTypeConfig;
+	config?: UmbPropertyEditorConfig;
 }
 
 export interface PropertyEditorConfigDefaultData {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/index.ts
new file mode 100644
index 0000000000..a6654797d0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/index.ts
@@ -0,0 +1,2 @@
+export * from './property-editor-config.type.js'
+export * from './property-editor-config-collection.class.js'
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/data-type/data-type-property-collection.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts
similarity index 81%
rename from src/Umbraco.Web.UI.Client/src/packages/core/components/data-type/data-type-property-collection.class.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts
index 0769e31836..524f28aa1d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/data-type/data-type-property-collection.class.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts
@@ -1,12 +1,12 @@
-import { type UmbDataTypeConfigProperty, type UmbDataTypeConfig } from '../../property-editor/index.js';
+import { type UmbPropertyEditorConfigProperty, type UmbPropertyEditorConfig } from '../index.js';
 import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 
 /**
  * Extends Array to add utility functions for accessing data type properties
  * by alias, returning either the value or the complete DataTypePropertyPresentationModel object
  */
-export class UmbDataTypeConfigCollection extends Array<UmbDataTypeConfigProperty> {
-	constructor(args: UmbDataTypeConfig) {
+export class UmbPropertyEditorConfigCollection extends Array<UmbPropertyEditorConfigProperty> {
+	constructor(args: UmbPropertyEditorConfig) {
 		super(...args);
 	}
 	static get [Symbol.species](): ArrayConstructor {
@@ -45,7 +45,7 @@ export class UmbDataTypeConfigCollection extends Array<UmbDataTypeConfigProperty
 		return Object.fromEntries(this.map((x) => [x.alias, x.value]));
 	}
 
-	equal(other: UmbDataTypeConfigCollection | undefined): boolean {
+	equal(other: UmbPropertyEditorConfigCollection | undefined): boolean {
 		if (this.length !== other?.length) {
 			return false;
 		}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts
new file mode 100644
index 0000000000..1fa912fc66
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts
@@ -0,0 +1,4 @@
+import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
+
+export type UmbPropertyEditorConfigProperty = DataTypePropertyPresentationModel;
+export type UmbPropertyEditorConfig = UmbPropertyEditorConfigProperty[];
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 d30f050efd..575fe7d99f 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
@@ -1,4 +1,4 @@
-export * from './types/index.js';
+export * from './config/index.js';
 export * from './events/index.js';
 
 export const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = 'Umbraco.Label';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/types/data-type-config.type.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/types/data-type-config.type.ts
deleted file mode 100644
index b32c367ef7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/types/data-type-config.type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';
-
-export type UmbDataTypeConfigProperty = DataTypePropertyPresentationModel;
-export type UmbDataTypeConfig = UmbDataTypeConfigProperty[];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/types/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/types/index.ts
deleted file mode 100644
index 97979c4c68..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/types/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './data-type-config.type.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.element.ts
index a02b9f1549..99f4bf64d3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.element.ts
@@ -6,7 +6,7 @@ import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-block-grid
@@ -19,7 +19,7 @@ export class UmbPropertyEditorUIBlockGridElement extends UmbLitElement implement
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	@state()
 	private _routes: UmbRoute[] = [];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts
index bd93d380a2..80045a1615 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts
@@ -1,8 +1,8 @@
+import type { UmbPropertyEditorConfigCollection } from '../../config/index.js';
 import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
 
 /**
  * @element umb-property-editor-ui-block-list
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-block-list</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
index 8e439e4cde..f5fe71d275 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts
@@ -3,7 +3,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-checkbox-list
@@ -20,7 +20,7 @@ export class UmbPropertyEditorUICheckboxListElement extends UmbLitElement implem
 	}
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		if (!config) return;
 		const listData: Record<number, { value: string; sortOrder: number }> | undefined = config.getValueByAlias('items');
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts
index 43b93767b6..bc0ba7bb1a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts
@@ -3,7 +3,7 @@ import { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import type { UmbSwatchDetails } from '@umbraco-cms/backoffice/models';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-color-picker
@@ -22,7 +22,7 @@ export class UmbPropertyEditorUIColorPickerElement extends UmbLitElement impleme
 	private _swatches: UmbSwatchDetails[] = [];
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._showLabels = config?.getValueByAlias('useLabel') ?? this.#defaultShowLabels;
 		this._swatches = config?.getValueByAlias('items') ?? [];
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts
index a335274dbe..4c8cbe1852 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts
@@ -1,9 +1,9 @@
-import { UmbPropertyValueChangeEvent } from '../../index.js';
+import { UmbPropertyEditorConfigCollection, UmbPropertyValueChangeEvent } from '../../index.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection, UmbInputDateElement } from '@umbraco-cms/backoffice/components';
+import type { UmbInputDateElement } from '@umbraco-cms/backoffice/components';
 
 /**
  * @element umb-property-editor-ui-date-picker
@@ -54,7 +54,7 @@ export class UmbPropertyEditorUIDatePickerElement extends UmbLitElement implemen
 	private _offsetTime?: boolean;
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		if (!config) return;
 		const oldVal = this._inputType;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.stories.ts
index f9f1e29af1..cd40b10b8f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.stories.ts
@@ -3,14 +3,14 @@ import type { UmbPropertyEditorUIDatePickerElement } from './property-editor-ui-
 import { html } from '@umbraco-cms/backoffice/external/lit';
 
 import './property-editor-ui-date-picker.element.js';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 export default {
 	title: 'Property Editor UIs/Date Picker',
 	component: 'umb-property-editor-ui-date-picker',
 	id: 'umb-property-editor-ui-date-picker',
 	args: {
-		config: new UmbDataTypeConfigCollection([
+		config: new UmbPropertyEditorConfigCollection([
 			{
 				alias: 'format',
 				value: 'YYYY-MM-DD HH:mm:ss',
@@ -31,7 +31,7 @@ WithDateValue.args = {
 
 export const WithFormat = Template.bind({});
 WithFormat.args = {
-	config: new UmbDataTypeConfigCollection([
+	config: new UmbPropertyEditorConfigCollection([
 		{
 			alias: 'format',
 			value: 'dd/MM/yyyy HH:mm:ss',
@@ -41,7 +41,7 @@ WithFormat.args = {
 
 export const Timeframe = Template.bind({});
 Timeframe.args = {
-	config: new UmbDataTypeConfigCollection([
+	config: new UmbPropertyEditorConfigCollection([
 		{
 			alias: 'format',
 			value: 'dd/MM/yyyy HH:mm:ss',
@@ -59,7 +59,7 @@ Timeframe.args = {
 
 export const TimeOnly = Template.bind({});
 TimeOnly.args = {
-	config: new UmbDataTypeConfigCollection([
+	config: new UmbPropertyEditorConfigCollection([
 		{
 			alias: 'format',
 			value: 'HH:mm:ss',
@@ -69,7 +69,7 @@ TimeOnly.args = {
 
 export const DateOnly = Template.bind({});
 DateOnly.args = {
-	config: new UmbDataTypeConfigCollection([
+	config: new UmbPropertyEditorConfigCollection([
 		{
 			alias: 'format',
 			value: 'dd/MM/yyyy',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts
index bf923029a6..bc7b520289 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.test.ts
@@ -2,7 +2,7 @@ import { expect, fixture, html } from '@open-wc/testing';
 import { UmbInputDateElement } from '../../../components/input-date/input-date.element.js';
 import { UmbPropertyEditorUIDatePickerElement } from './property-editor-ui-date-picker.element.js';
 import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 describe('UmbPropertyEditorUIDatePickerElement', () => {
 	let element: UmbPropertyEditorUIDatePickerElement;
@@ -26,13 +26,13 @@ describe('UmbPropertyEditorUIDatePickerElement', () => {
 	});
 
 	it('should show a type=date field if the format only contains a date', async () => {
-		element.config = new UmbDataTypeConfigCollection([{ alias: 'format', value: 'YYYY-MM-dd' }]);
+		element.config = new UmbPropertyEditorConfigCollection([{ alias: 'format', value: 'YYYY-MM-dd' }]);
 		await element.updateComplete;
 		expect(inputElement.type).to.equal('date');
 	});
 
 	it('should show a type=time field if the format only contains a time', async () => {
-		element.config = new UmbDataTypeConfigCollection([{ alias: 'format', value: 'HH:mm' }]);
+		element.config = new UmbPropertyEditorConfigCollection([{ alias: 'format', value: 'HH:mm' }]);
 		await element.updateComplete;
 		expect(inputElement.type).to.equal('time');
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts
index 7cc1244e51..302e02ab66 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-dropdown
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUIDropdownElement extends UmbLitElement implements
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-dropdown</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
index 24a48f318e..a109b1850a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex
 import { UUIColorPickerChangeEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-eye-dropper
@@ -21,7 +21,7 @@ export class UmbPropertyEditorUIEyeDropperElement extends UmbLitElement implemen
 	private _swatches: string[] = [];
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		if (config) {
 			this._opacity = config.getValueByAlias('showAlpha') ?? this.#defaultOpacity;
 			this._swatches = config.getValueByAlias('palette') ?? [];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts
index 548792a026..9b915a3efa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts
@@ -7,7 +7,7 @@ import {
 	UMB_ICON_PICKER_MODAL,
 } from '@umbraco-cms/backoffice/modal';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-icon-picker
@@ -18,7 +18,7 @@ export class UmbPropertyEditorUIIconPickerElement extends UmbLitElement implemen
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	private _modalContext?: UmbModalManagerContext;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts
index 2383a370ee..7a1c68bae9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/property-editor-ui-image-cropper.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-image-cropper
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUIImageCropperElement extends UmbLitElement implem
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-image-cropper</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
index 7546bd41da..add1cfe7c8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-image-crops-configuration
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUIImageCropsConfigurationElement
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-image-crops-configuration</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts
index 2bed3a10a1..c339f7c807 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-label
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUILabelElement extends UmbLitElement implements Um
 	description = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`${this.value ?? ''}`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts
index a4d34e1095..a101f8c1e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-markdown-editor
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUIMarkdownEditorElement
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-markdown-editor</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts
index f37308e4c8..910a5d2c13 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/property-editor-ui-media-picker.element.ts
@@ -1,6 +1,6 @@
 import { UmbInputMediaElement } from '../../../../media/media/components/input-media/input-media.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
@@ -20,7 +20,7 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme
 	}
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		const validationLimit = config?.getByAlias('validationLimit');
 		if (!validationLimit) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts
index d0792808ce..27eced94f2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-member-group-picker
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUIMemberGroupPickerElement
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-member-group-picker</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts
index bdba2aff70..a3cc8e4861 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-member-picker
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUIMemberPickerElement extends UmbLitElement implem
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-member-picker</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
index 3c5b6d3bc1..99600f8ae7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts
@@ -6,7 +6,7 @@ import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/wo
 import { UmbLinkPickerLink } from '@umbraco-cms/backoffice/modal';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-multi-url-picker
@@ -20,7 +20,7 @@ export class UmbPropertyEditorUIMultiUrlPickerElement
 	value: UmbLinkPickerLink[] = [];
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._overlaySize = config?.getValueByAlias('overlaySize');
 		this._hideAnchor = config?.getValueByAlias('hideAnchor');
 		this._ignoreUserStartNodes = config?.getValueByAlias('ignoreUserStartNodes');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
index 6a21a9804c..db71e5d040 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts
@@ -4,7 +4,7 @@ import {
 	MultipleTextStringValue,
 } from './input-multiple-text-string/input-multiple-text-string.element.js';
 import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/events';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -21,7 +21,7 @@ export class UmbPropertyEditorUIMultipleTextStringElement
 	public value: MultipleTextStringValue = [];
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._limitMin = config?.getValueByAlias('minNumber');
 		this._limitMax = config?.getValueByAlias('maxNumber');
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts
index aa3573431d..177605fd77 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts
@@ -3,7 +3,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 import '../../../components/input-number-range/input-number-range.element.js';
 
@@ -29,7 +29,7 @@ export class UmbPropertyEditorUINumberRangeElement extends UmbLitElement impleme
 	}
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	private _onChange(event: CustomEvent) {
 		this.value = {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts
index faf1cd245c..cd4cea8e72 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts
@@ -2,7 +2,7 @@ import { css, html, customElement, property, state, ifDefined } from '@umbraco-c
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 @customElement('umb-property-editor-ui-number')
 export class UmbPropertyEditorUINumberElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
@@ -19,7 +19,7 @@ export class UmbPropertyEditorUINumberElement extends UmbLitElement implements U
 	private _step?: number;
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._min = config?.getValueByAlias('min');
 		this._max = config?.getValueByAlias('max');
 		this._step = config?.getValueByAlias('step');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts
index 7e84bfeae8..48b1e2fe35 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-order-direction
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUIOrderDirectionElement
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-order-direction</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts
index ab4fe834e3..8ce035b05d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-overlay-size
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUIOverlaySizeElement extends UmbLitElement impleme
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-overlay-size</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
index 9a7ade1e10..62d0ff5d7b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts
@@ -1,7 +1,7 @@
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import '../../../components/input-radio-button-list/input-radio-button-list.element.js';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import type { UmbInputRadioButtonListElement } from '../../../components/input-radio-button-list/input-radio-button-list.element.js';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -24,7 +24,7 @@ export class UmbPropertyEditorUIRadioButtonListElement
 	}
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		if (!config) return;
 		const listData: Record<number, { value: string; sortOrder: number }> | undefined = config.getValueByAlias('items');
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts
index a6339a4304..c80fec3978 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts
@@ -3,7 +3,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-slider
@@ -37,7 +37,7 @@ export class UmbPropertyEditorUISliderElement extends UmbLitElement implements U
 	_max?: number;
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._enableRange = config?.getValueByAlias('enableRange');
 		this._initVal1 = config?.getValueByAlias('initVal1');
 		this._initVal2 = config?.getValueByAlias('initVal2');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts
index e33b208d05..a03b55a591 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts
@@ -2,7 +2,7 @@ import { css, html, customElement, property, state, ifDefined } from '@umbraco-c
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 @customElement('umb-property-editor-ui-text-box')
 export class UmbPropertyEditorUITextBoxElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
@@ -18,7 +18,7 @@ export class UmbPropertyEditorUITextBoxElement extends UmbLitElement implements
 	private _maxChars?: number;
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._type = config?.getValueByAlias('inputType') ?? this.#defaultType;
 		this._maxChars = config?.getValueByAlias('maxChars');
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts
index bcd7168879..16564f7c83 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts
@@ -2,7 +2,7 @@ import { css, html, customElement, property, state, ifDefined, styleMap } from '
 import { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 @customElement('umb-property-editor-ui-textarea')
 export class UmbPropertyEditorUITextareaElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
@@ -25,7 +25,7 @@ export class UmbPropertyEditorUITextareaElement extends UmbLitElement implements
 	private _css?: any;
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._maxChars = config?.getValueByAlias('maxChars');
 		this._rows = config?.getValueByAlias('rows');
 		this._minHeight = config?.getValueByAlias('minHeight');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
index fb2e9ef060..5cfbd291fd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts
@@ -3,7 +3,7 @@ import { customElement, css, html, property, map, state, PropertyValueMap } from
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UmbPropertyEditorExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { tinymce } from '@umbraco-cms/backoffice/external/tinymce';
 
 const tinyIconSet = tinymce.default?.IconManager.get('default');
@@ -52,7 +52,7 @@ export class UmbPropertyEditorUITinyMceToolbarConfigurationElement
 	}
 
 	@property({ attribute: false })
-	config?: UmbDataTypeConfigCollection;
+	config?: UmbPropertyEditorConfigCollection;
 
 	@state()
 	private _toolbarConfig: ToolbarConfig[] = [];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts
index 3b43f86d12..8b9afa03ef 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts
@@ -2,20 +2,20 @@ import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-tiny-mce
  */
 @customElement('umb-property-editor-ui-tiny-mce')
 export class UmbPropertyEditorUITinyMceElement extends UmbLitElement implements UmbPropertyEditorExtensionElement {
-	#configuration?: UmbDataTypeConfigCollection;
+	#configuration?: UmbPropertyEditorConfigCollection;
 
 	@property({ type: String })
 	value = '';
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this.#configuration = config;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts
index c099b3d2b5..14e5bbd6b5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.stories.ts
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/web-components';
 import type { UmbPropertyEditorUITinyMceElement } from './property-editor-ui-tiny-mce.element.js';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 import './property-editor-ui-tiny-mce.element.js';
 
-const config = new UmbDataTypeConfigCollection([
+const config = new UmbPropertyEditorConfigCollection([
 	{
 		alias: 'hideLabel',
 		value: true,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
index c7b3dccb6f..d11be50269 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts
@@ -1,7 +1,7 @@
 import { UmbInputToggleElement } from '../../../components/input-toggle/input-toggle.element.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
@@ -23,7 +23,7 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U
 	_showLabels?: boolean;
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this.value ??= config?.getValueByAlias('default') ?? false;
 		this._labelOff = config?.getValueByAlias('labelOff');
 		this._labelOn = config?.getValueByAlias('labelOn');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts
index 688d6a3aed..ebcf9a3733 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-tree-picker
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUITreePickerElement extends UmbLitElement implemen
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	render() {
 		return html`<div>umb-property-editor-ui-tree-picker</div>`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts
index ead0093f20..fb7b9e7db2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts
@@ -3,7 +3,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import type { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-upload-field
@@ -14,7 +14,7 @@ export class UmbPropertyEditorUIUploadFieldElement extends UmbLitElement impleme
 	value = '';
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._fileExtensions = config?.getValueByAlias('fileExtensions');
 		this._multiple = config?.getValueByAlias('multiple');
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts
index a3bd67c958..a8a988f8b0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts
@@ -2,7 +2,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-user-picker
@@ -13,7 +13,7 @@ export class UmbPropertyEditorUIUserPickerElement extends UmbLitElement implemen
 	value = '';
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	// TODO: implement config
 	render() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts
index 8c321bd572..ee72de4b87 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts
@@ -3,7 +3,7 @@ import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  * @element umb-property-editor-ui-value-type
@@ -39,7 +39,7 @@ export class UmbPropertyEditorUIValueTypeElement extends UmbLitElement implement
 	];
 
 	@property({ attribute: false })
-	public config?: UmbDataTypeConfigCollection;
+	public config?: UmbPropertyEditorConfigCollection;
 
 	#onChange(e: UUISelectEvent) {
 		this.value = e.target.value as string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types/workspace-property-data.type.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types/workspace-property-data.type.ts
index a93c3ce110..6773a83e5b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types/workspace-property-data.type.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/types/workspace-property-data.type.ts
@@ -1,9 +1,9 @@
-import { type UmbDataTypeConfig } from '../../property-editor/index.js';
+import { type UmbPropertyEditorConfig } from '../../property-editor/index.js';
 
 export type WorkspacePropertyData<ValueType> = {
 	alias?: string;
 	label?: string;
 	description?: string;
 	value?: ValueType | null;
-	config?: UmbDataTypeConfig; // This could potentially then come from hardcoded JS object and not the DataType store.
+	config?: UmbPropertyEditorConfig; // This could potentially then come from hardcoded JS object and not the DataType store.
 };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.context.ts
index ec25e1c418..ef68b157b3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.context.ts
@@ -16,7 +16,7 @@ import {
 	UmbContextProviderController,
 	UmbContextToken,
 } from '@umbraco-cms/backoffice/context-api';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 export class UmbWorkspacePropertyContext<ValueType = any> {
 	#host: UmbControllerHostElement;
@@ -31,7 +31,7 @@ export class UmbWorkspacePropertyContext<ValueType = any> {
 	public readonly value = this.#data.asObservablePart((data) => data.value);
 	public readonly configValues = this.#data.asObservablePart((data) => data.config);
 
-	#configCollection = new UmbClassState<UmbDataTypeConfigCollection | undefined>(undefined);
+	#configCollection = new UmbClassState<UmbPropertyEditorConfigCollection | undefined>(undefined);
 	public readonly config = this.#configCollection.asObservable();
 
 	private _editor = new UmbBasicState<UmbPropertyEditorExtensionElement | undefined>(undefined);
@@ -63,7 +63,7 @@ export class UmbWorkspacePropertyContext<ValueType = any> {
 		this._providerController = new UmbContextProviderController(host, UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN, this);
 
 		this.configValues.subscribe((configValues) => {
-			this.#configCollection.next(configValues ? new UmbDataTypeConfigCollection(configValues) : undefined);
+			this.#configCollection.next(configValues ? new UmbPropertyEditorConfigCollection(configValues) : undefined);
 		});
 
 		this.variantId.subscribe((propertyVariantId) => {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.element.ts
index bbb235384d..7e6b5b181a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property/workspace-property.element.ts
@@ -1,4 +1,4 @@
-import { type UmbDataTypeConfig } from '../../property-editor/index.js';
+import { type UmbPropertyEditorConfig } from '../../property-editor/index.js';
 import { UmbWorkspacePropertyContext } from './workspace-property.context.js';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { css, html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
@@ -7,7 +7,7 @@ import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
 import { ManifestPropertyEditorUi, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 /**
  *  @element umb-workspace-property
@@ -86,7 +86,7 @@ export class UmbWorkspacePropertyElement extends UmbLitElement {
 	 * @default ''
 	 */
 	@property({ type: Array, attribute: false })
-	public set config(value: UmbDataTypeConfig | undefined) {
+	public set config(value: UmbPropertyEditorConfig | undefined) {
 		this._propertyContext.setConfig(value);
 	}
 
@@ -124,7 +124,7 @@ export class UmbWorkspacePropertyElement extends UmbLitElement {
 	private _propertyContext = new UmbWorkspacePropertyContext(this);
 
 	private _valueObserver?: UmbObserverController<unknown>;
-	private _configObserver?: UmbObserverController<UmbDataTypeConfigCollection | undefined>;
+	private _configObserver?: UmbObserverController<UmbPropertyEditorConfigCollection | undefined>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts
index 22890ad896..081d9b3304 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts
@@ -2,7 +2,7 @@ import type { UmbInputDocumentElement } from '../../components/input-document/in
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
 @customElement('umb-property-editor-ui-document-picker')
 export class UmbPropertyEditorUIContentPickerElement
@@ -20,7 +20,7 @@ export class UmbPropertyEditorUIContentPickerElement
 	}
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		const validationLimit = config?.find((x) => x.alias === 'validationLimit');
 
 		this._limitMin = (validationLimit?.value as any).min;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts
index 90a13e0f92..6ac46def1d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts
@@ -2,7 +2,7 @@ import { UmbTagsInputElement } from '../../components/tags-input/tags-input.elem
 import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
 import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/workspace';
-import type { UmbDataTypeConfigCollection } from '@umbraco-cms/backoffice/components';
+import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
@@ -29,7 +29,7 @@ export class UmbPropertyEditorUITagsElement extends UmbLitElement implements Umb
 	//TODO: Use type from VariantID
 
 	@property({ attribute: false })
-	public set config(config: UmbDataTypeConfigCollection | undefined) {
+	public set config(config: UmbPropertyEditorConfigCollection | undefined) {
 		this._group = config?.getValueByAlias('group');
 		this.value = config?.getValueByAlias('items') ?? [];
 	}