diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
index eef015b076..916280fd91 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts
@@ -3,7 +3,7 @@ import './components/backoffice-header.element';
 import './components/backoffice-main.element';
 import './components/backoffice-modal-container.element';
 import './components/backoffice-notification-container.element';
-import './components/node-property/node-property.element';
+import './components/content-property/content-property.element';
 import './components/table/table.element';
 import './components/shared/code-block.element';
 import './sections/shared/section-main/section-main.element';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/content-property/content-property.element.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/content-property/content-property.element.ts
index 4b3ee1cc71..923176cacb 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/content-property/content-property.element.ts
@@ -5,16 +5,15 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { EMPTY, of, switchMap } from 'rxjs';
 
 import { UmbDataTypesStore } from '../../../core/stores/data-types/data-types.store';
-import { NodeProperty } from '../../../core/mocks/data/node.data';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
-import type { ManifestTypes } from '@umbraco-cms/models';
+import type { ContentProperty, ManifestTypes } from '@umbraco-cms/models';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 
 import '../entity-property/entity-property.element';
 
-@customElement('umb-node-property')
-export class UmbNodePropertyElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
+@customElement('umb-content-property')
+export class UmbContentPropertyElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
 	static styles = [
 		UUITextStyles,
 		css`
@@ -24,12 +23,12 @@ export class UmbNodePropertyElement extends UmbContextConsumerMixin(UmbObserverM
 		`,
 	];
 
-	private _property?: NodeProperty;
+	private _property?: ContentProperty;
 	@property({ type: Object, attribute: false })
-	public get property(): NodeProperty | undefined {
+	public get property(): ContentProperty | undefined {
 		return this._property;
 	}
-	public set property(value: NodeProperty | undefined) {
+	public set property(value: ContentProperty | undefined) {
 		this._property = value;
 		this._observeDataType();
 	}
@@ -86,6 +85,6 @@ export class UmbNodePropertyElement extends UmbContextConsumerMixin(UmbObserverM
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-node-property': UmbNodePropertyElement;
+		'umb-content-property': UmbContentPropertyElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.element.ts
index 96cde2001a..25d04318ff 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-content/views/edit/editor-view-content-edit.element.ts
@@ -7,7 +7,7 @@ import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import type { ContentProperty, ContentPropertyData, DocumentDetails, MediaDetails } from '@umbraco-cms/models';
 
-import '../../../../../components/node-property/node-property.element';
+import '../../../../../components/content-property/content-property.element';
 
 @customElement('umb-editor-view-content-edit')
 export class UmbEditorViewContentEditElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {
@@ -52,9 +52,9 @@ export class UmbEditorViewContentEditElement extends UmbContextConsumerMixin(Umb
 			<uui-box>
 				${this._properties.map(
 					(property: ContentProperty) => html`
-						<umb-node-property
+						<umb-content-property
 							.property=${property}
-							.value=${this._data.find((data) => data.alias === property.alias)?.value}></umb-node-property>
+							.value=${this._data.find((data) => data.alias === property.alias)?.value}></umb-content-property>
 					`
 				)}
 			</uui-box>