diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts
index 555af8a7e8..9f3bfca1ae 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts
@@ -6,7 +6,7 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { UmbDataTypeStore } from '../../../settings/data-types/data-type.store';
 import type { ContentProperty } from '@umbraco-cms/models';
 
-import '../property/entity-property.element';
+import '../property/property.element';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 @customElement('umb-content-property')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/entity-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/property.element.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/entity-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/property.element.ts
index 5337cd842a..972bcfcd49 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/entity-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/property.element.ts
@@ -108,12 +108,12 @@ export class UmbPropertyElement extends UmbLitElement {
 	/**
 	 * Property Editor UI Alias. Render the Property Editor UI registered for this alias.
 	 * @public
-	 * @type {string}
+	 * @type {object}
 	 * @attr
 	 * @default ''
 	 */
 	@property({ type: Object, attribute: false })
-	public set value(value: object) {
+	public set value(value: object | string) {
 		this._propertyContext.setValue(value);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/entity-propery.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/propery.stories.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/entity-propery.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/propery.stories.ts
index 60d407b46a..2f71c32d96 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/entity-propery.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/property/propery.stories.ts
@@ -1,8 +1,8 @@
 import { Meta, Story } from '@storybook/web-components';
 import { html } from 'lit-html';
 
-import type { UmbPropertyElement } from './entity-property.element';
-import './entity-property.element';
+import type { UmbPropertyElement } from './property.element';
+import './property.element';
 
 export default {
 	title: 'Components/Entity Property',
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts
index 3a3e951ed3..5e85d4d446 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts
@@ -5,7 +5,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import type { PropertyEditorConfigDefaultData, PropertyEditorConfigProperty } from '@umbraco-cms/models';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
 
-import '../../../components/property/entity-property.element';
+import '../../../components/property/property.element';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 /**