diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts
index 48e61a8b89..aebd915c1a 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, property, state } from 'lit/decorators.js';
 
 import type { UmbModalService } from '../../../core/services/modal';
-import type { Entity } from '../../../core/mocks/data/entities';
+import type { Entity } from '@umbraco-cms/models';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import { UmbDocumentStore } from 'src/core/stores/document/document.store';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts
index 5f99b9d74e..af65fc077f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts
@@ -1,7 +1,5 @@
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
-
-import { Entity } from '../../core/mocks/data/entities';
-import type { ManifestSection, ManifestSectionView, ManifestTree } from '@umbraco-cms/models';
+import type { Entity, ManifestSection, ManifestSectionView, ManifestTree } from '@umbraco-cms/models';
 
 export class UmbSectionContext {
 	// TODO: figure out how fine grained we want to make our observables.
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts
index 7ecbed102c..a7acf75887 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts
@@ -3,10 +3,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { map } from 'rxjs';
 import { UmbSectionContext } from '../../../sections/section.context';
-import { Entity } from '../../../../core/mocks/data/entities';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
-import type { ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models';
+import type { Entity, ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models';
 import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry';
 
 @customElement('umb-tree-context-menu-page-action-list')
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts
index e4833c0ce7..d65e4b4270 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts
@@ -1,12 +1,11 @@
 import { LitElement } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
-import { Entity } from '../../../core/mocks/data/entities';
 import { UmbSectionContext } from '../../sections/section.context';
 import { UmbTreeContextMenuPageService } from './context-menu/tree-context-menu-page.service';
 import { UmbTreeContextMenuService } from './context-menu/tree-context-menu.service';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
-import type { ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models';
+import type { Entity, ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models';
 
 export type ActionPageEntity = {
 	key: string;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts
index 8b057e07cc..64e556f1aa 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts
@@ -6,9 +6,8 @@ import { map } from 'rxjs';
 import { repeat } from 'lit/directives/repeat.js';
 import type { UmbTreeContextBase } from '../tree.context';
 import { UmbSectionContext } from '../../sections/section.context';
-import { Entity } from '../../../core/mocks/data/entities';
-import type { ManifestSection } from '../../../core/models';
 import { UmbTreeContextMenuService } from './context-menu/tree-context-menu.service';
+import type { Entity, ManifestSection } from '@umbraco-cms/models';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
 import { UmbDataStore } from 'src/core/stores/store';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts
index dbce267179..5727254663 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts
@@ -3,11 +3,10 @@ import { repeat } from 'lit/directives/repeat.js';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
-import { Entity } from '../../../core/mocks/data/entities';
 import { UmbTreeContext } from '../tree.context';
 import { UmbObserverMixin } from '@umbraco-cms/observable-api';
 import { UmbContextConsumerMixin } from '@umbraco-cms/context-api';
-import type { ManifestTree } from '@umbraco-cms/models';
+import type { Entity, ManifestTree } from '@umbraco-cms/models';
 import { UmbDataStore } from 'src/core/stores/store';
 
 import './tree-item.element';