diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts
index 340af86198..182cfce40f 100644
--- a/src/Umbraco.Web.UI.Client/src/app.ts
+++ b/src/Umbraco.Web.UI.Client/src/app.ts
@@ -11,7 +11,7 @@ import { UmbContextProviderMixin } from './core/context';
 // Load these in the correct components
 import './backoffice/components/editor-layout.element';
 import './backoffice/components/editor-property-layout.element';
-import './backoffice/components/node-editor/node-property.element';
+import './backoffice/components/node-property.element';
 
 const routes = [
   {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor.element.ts
similarity index 91%
rename from src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-editor.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor.element.ts
index 073824ba10..b37279fb07 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor.element.ts
@@ -1,21 +1,21 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, html, LitElement } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
-import { UmbContextConsumerMixin } from '../../../core/context';
-import { UmbNodeStore } from '../../../core/stores/node.store';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { UmbNodeStore } from '../../core/stores/node.store';
 import { map, Subscription } from 'rxjs';
-import { DocumentNode } from '../../../mocks/data/content.data';
-import { UmbNotificationService } from '../../../core/service/notifications.store';
-import { UmbExtensionManifest, UmbExtensionManifestEditorView, UmbExtensionRegistry } from '../../../core/extension';
+import { DocumentNode } from '../../mocks/data/content.data';
+import { UmbNotificationService } from '../../core/service/notifications.store';
+import { UmbExtensionManifest, UmbExtensionManifestEditorView, UmbExtensionRegistry } from '../../core/extension';
 import { IRoutingInfo, RouterSlot } from 'router-slot';
 
 // Lazy load
 // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node.
-import '../../editor-views/editor-view-node-edit.element';
-import '../../editor-views/editor-view-node-info.element';
+import '../editor-views/editor-view-node-edit.element';
+import '../editor-views/editor-view-node-info.element';
 
-@customElement('umb-content-editor')
-export class UmbContentEditor extends UmbContextConsumerMixin(LitElement) {
+@customElement('umb-node-editor')
+export class UmbNodeEditor extends UmbContextConsumerMixin(LitElement) {
   static styles = [
     UUITextStyles,
     css`
@@ -236,10 +236,10 @@ export class UmbContentEditor extends UmbContextConsumerMixin(LitElement) {
   }
 }
 
-export default UmbContentEditor;
+export default UmbNodeEditor;
 
 declare global {
   interface HTMLElementTagNameMap {
-    'umb-content-editor': UmbContentEditor;
+    'umb-node-editor': UmbNodeEditor;
   }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor/node-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor/node-property.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/components/node-property.element.ts
index 222bc1375a..e1a37095cd 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-editor/node-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property.element.ts
@@ -4,10 +4,10 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { EMPTY, of, Subscription } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
-import { UmbContextConsumerMixin } from '../../../core/context';
-import { createExtensionElement, UmbExtensionManifest, UmbExtensionRegistry } from '../../../core/extension';
-import { UmbDataTypeStore } from '../../../core/stores/data-type.store';
-import { DataTypeEntity } from '../../../mocks/data/content.data';
+import { UmbContextConsumerMixin } from '../../core/context';
+import { createExtensionElement, UmbExtensionManifest, UmbExtensionRegistry } from '../../core/extension';
+import { UmbDataTypeStore } from '../../core/stores/data-type.store';
+import { DataTypeEntity } from '../../mocks/data/content.data';
 
 @customElement('umb-node-property')
 class UmbNodeProperty extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
index cd1727ecc6..7282d396df 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/content/content-section.element.ts
@@ -30,7 +30,7 @@ export class UmbContentSection extends LitElement {
     },
     {
       path: 'node/:nodeId',
-      component: () => import('./content-editor.element'),
+      component: () => import('../../components/node-editor.element'),
       setup: (component: HTMLElement, info: IRoutingInfo) => {
         this._currentNodeId = info.match.params.nodeId;
         component.id = this._currentNodeId;