diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts
index e4670dd58c..a8cad46458 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts
@@ -35,7 +35,7 @@ export class UmbDataTypeServerDataSource implements UmbDetailDataSource<UmbDataT
 	 */
 	async createScaffold(parentUnique: string | null) {
 		const data: UmbDataTypeDetailModel = {
-			entityType: 'data-type',
+			type: 'data-type',
 			unique: UmbId.new(),
 			parentUnique,
 			name: '',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.server.data.ts
index d1f5a67a15..35375e33e5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.server.data.ts
@@ -1,3 +1,4 @@
+import { UmbDataTypeTreeItemModel } from './types.js';
 import type { UmbTreeDataSource } from '@umbraco-cms/backoffice/tree';
 import { DataTypeResource, DataTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -9,7 +10,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbDataTypeTreeServerDataSource
  * @implements {DocumentTreeDataSource}
  */
-export class UmbDataTypeTreeServerDataSource implements UmbTreeDataSource<DataTypeTreeItemResponseModel> {
+export class UmbDataTypeTreeServerDataSource implements UmbTreeDataSource<UmbDataTypeTreeItemModel> {
 	#host: UmbControllerHost;
 
 	/**
@@ -27,45 +28,72 @@ export class UmbDataTypeTreeServerDataSource implements UmbTreeDataSource<DataTy
 	 * @memberof UmbDataTypeTreeServerDataSource
 	 */
 	async getRootItems() {
-		return tryExecuteAndNotify(this.#host, DataTypeResource.getTreeDataTypeRoot({}));
+		const { data, error } = await tryExecuteAndNotify(this.#host, DataTypeResource.getTreeDataTypeRoot({}));
+
+		if (data) {
+			const items = data?.items.map((item) => mapper(item));
+			return { data: { total: data.total, items } };
+		}
+
+		return { error };
 	}
 
 	/**
-	 * Fetches the children of a given parent id from the server
-	 * @param {(string)} parentId
+	 * Fetches the children of a given parent unique from the server
+	 * @param {(string)} parentUnique
 	 * @return {*}
 	 * @memberof UmbDataTypeTreeServerDataSource
 	 */
-	async getChildrenOf(parentId: string | null) {
-		if (parentId === undefined) throw new Error('Parent id is missing');
+	async getChildrenOf(parentUnique: string | null) {
+		if (parentUnique === undefined) throw new Error('Parent unique is missing');
 
 		/* TODO: should we make getRootItems() internal
 		so it only is a server concern that there are two endpoints? */
-		if (parentId === null) {
+
+		if (parentUnique === null) {
 			return this.getRootItems();
-		} else {
-			return tryExecuteAndNotify(
-				this.#host,
-				DataTypeResource.getTreeDataTypeChildren({
-					parentId,
-				}),
-			);
 		}
+
+		const { data, error } = await tryExecuteAndNotify(
+			this.#host,
+			DataTypeResource.getTreeDataTypeChildren({
+				parentId: parentUnique,
+			}),
+		);
+
+		if (data) {
+			const items = data?.items.map((item) => mapper(item));
+			return { data: { total: data.total, items } };
+		}
+
+		return { error };
 	}
 
 	/**
 	 * Fetches the items for the given ids from the server
-	 * @param {Array<string>} ids
+	 * @param {Array<string>} uniques
 	 * @return {*}
 	 * @memberof UmbDataTypeTreeServerDataSource
 	 */
-	async getItems(ids: Array<string>) {
-		if (!ids) throw new Error('Ids are missing');
+	async getItems(uniques: Array<string>) {
+		if (!uniques) throw new Error('Uniques are missing');
 		return tryExecuteAndNotify(
 			this.#host,
 			DataTypeResource.getDataTypeItem({
-				id: ids,
+				id: uniques,
 			}),
 		);
 	}
 }
+
+const mapper = (item: DataTypeTreeItemResponseModel): UmbDataTypeTreeItemModel => {
+	return {
+		unique: item.id!,
+		parentUnique: item.parentId || null,
+		name: item.name!,
+		type: item.isFolder ? 'data-type-folder' : 'data-type',
+		isFolder: item.isFolder!,
+		isContainer: item.isContainer!,
+		hasChildren: item.hasChildren!,
+	};
+};
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts
index d56d77e029..e2f0c237d5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type.tree.store.ts
@@ -35,7 +35,7 @@ export class UmbDataTypeTreeStore extends UmbUniqueTreeStore {
 			unique: item.unique!,
 			parentUnique: item.parentUnique,
 			name: item.name,
-			entityType: item.entityType,
+			type: item.type,
 			isFolder: false,
 			isContainer: false,
 			hasChildren: false,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/types.ts
index 114ae8f1af..d705782db1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/types.ts
@@ -7,7 +7,7 @@ export type UmbDataTypeTreeItemModel = {
 	isFolder: boolean;
 	isContainer: boolean;
 	name: string;
-	entityType: string;
+	type: string;
 	hasChildren: boolean;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/types.ts
index 375912e809..01d5bcdd90 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/types.ts
@@ -1,7 +1,7 @@
 import { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export type UmbDataTypeDetailModel = Omit<DataTypeResponseModel, 'id' | 'parentId'> & {
-	entityType: string;
+	type: string;
 	unique: string | undefined; // TODO - remove this when server doesn't allow undefined
 	parentUnique: string | null | undefined; // TODO - remove this when server doesn't allow undefined
 };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts
index 918144115c..6c43590079 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts
@@ -4,19 +4,22 @@ import { UmbStore } from './store.interface.js';
 import { UmbContextConsumerController, UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbStoreConnector {
+export class UmbStoreConnector<StoreType, ConnectedStoreType> {
 	#store: UmbStoreBase;
-	#connectedStore?: UmbStore<any>;
-	#mapperFunction: (item: any) => any;
+	#connectedStore?: UmbStore<ConnectedStoreType>;
+	#createMapperFunction: (item: ConnectedStoreType) => StoreType;
+	#updateMapperFunction?: (item: ConnectedStoreType) => StoreType;
 
 	constructor(
 		host: UmbControllerHost,
 		store: UmbStoreBase,
 		connectToStoreAlias: UmbContextToken<any, any> | string,
-		mapperFunction: (item: any) => any,
+		createMapperFunction: (item: ConnectedStoreType) => StoreType,
+		updateMapperFunction: (item: ConnectedStoreType) => StoreType,
 	) {
 		this.#store = store;
-		this.#mapperFunction = mapperFunction;
+		this.#createMapperFunction = createMapperFunction;
+		this.#updateMapperFunction = updateMapperFunction;
 
 		new UmbContextConsumerController(host, connectToStoreAlias, (instance) => {
 			this.#connectedStore = instance;
@@ -36,14 +39,14 @@ export class UmbStoreConnector {
 
 	#onConnectedStoreCreate = (event: UmbStoreCreateEvent) => {
 		const items = this.#connectedStore!.getItems(event.uniques);
-		const mappedItems = items.map((item) => this.#mapperFunction(item));
+		const mappedItems = items.map((item) => this.#createMapperFunction(item));
 		this.#store.appendItems(mappedItems);
 	};
 
 	#onConnectedStoreUpdate = (event: UmbStoreUpdateEvent) => {
 		const uniques = event.uniques;
 		const items = this.#connectedStore!.getItems(uniques);
-		const mappedItems = items.map((item) => this.#mapperFunction(item));
+		const mappedItems = items.map((item) => this.#updateMapperFunction(item));
 		mappedItems.forEach((mappedItem, index) => this.#store.updateItem(uniques[index], mappedItem));
 	};