diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type-repository-base.ts
index ea06a17b8b..8b3fc5eb5c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type-repository-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type-repository-base.ts
@@ -1,6 +1,6 @@
-import { UMB_DATA_TYPE_ITEM_STORE_CONTEXT_TOKEN, UmbDataTypeItemStore } from './item/data-type-item.store.js';
-import { UMB_DATA_TYPE_TREE_STORE_CONTEXT_TOKEN, UmbDataTypeTreeStore } from '../tree/data-type.tree.store.js';
-import { UMB_DATA_TYPE_STORE_CONTEXT_TOKEN, UmbDataTypeDetailStore } from './detail/data-type-detail.store.js';
+import { UMB_DATA_TYPE_TREE_STORE_CONTEXT, UmbDataTypeTreeStore } from '../tree/data-type.tree.store.js';
+import { UMB_DATA_TYPE_ITEM_STORE_CONTEXT, UmbDataTypeItemStore } from './item/data-type-item.store.js';
+import { UMB_DATA_TYPE_STORE_CONTEXT, UmbDataTypeDetailStore } from './detail/data-type-detail.store.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
@@ -18,15 +18,15 @@ export class UmbDataTypeRepositoryBase extends UmbRepositoryBase {
 		super(host);
 
 		this._init = Promise.all([
-			this.consumeContext(UMB_DATA_TYPE_STORE_CONTEXT_TOKEN, (instance) => {
+			this.consumeContext(UMB_DATA_TYPE_STORE_CONTEXT, (instance) => {
 				this._detailStore = instance;
 			}).asPromise(),
 
-			this.consumeContext(UMB_DATA_TYPE_TREE_STORE_CONTEXT_TOKEN, (instance) => {
+			this.consumeContext(UMB_DATA_TYPE_TREE_STORE_CONTEXT, (instance) => {
 				this._treeStore = instance;
 			}).asPromise(),
 
-			this.consumeContext(UMB_DATA_TYPE_ITEM_STORE_CONTEXT_TOKEN, (instance) => {
+			this.consumeContext(UMB_DATA_TYPE_ITEM_STORE_CONTEXT, (instance) => {
 				this._itemStore = instance;
 			}).asPromise(),
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.store.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.store.ts
index 240842efc7..abb4b1594a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.store.ts
@@ -4,7 +4,7 @@ import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbStoreBase } from '@umbraco-cms/backoffice/store';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
-export const UMB_DATA_TYPE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDataTypeDetailStore>('UmbDataTypeStore');
+export const UMB_DATA_TYPE_STORE_CONTEXT = new UmbContextToken<UmbDataTypeDetailStore>('UmbDataTypeStore');
 
 /**
  * @export
@@ -19,11 +19,7 @@ export class UmbDataTypeDetailStore extends UmbStoreBase<DataTypeResponseModel>
 	 * @memberof UmbDataTypeStore
 	 */
 	constructor(host: UmbControllerHostElement) {
-		super(
-			host,
-			UMB_DATA_TYPE_STORE_CONTEXT_TOKEN.toString(),
-			new UmbArrayState<DataTypeResponseModel>([], (x) => x.id),
-		);
+		super(host, UMB_DATA_TYPE_STORE_CONTEXT.toString(), new UmbArrayState<DataTypeResponseModel>([], (x) => x.id));
 	}
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/item/data-type-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/item/data-type-item.store.ts
index 1781bac1f1..85496e4315 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/item/data-type-item.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/item/data-type-item.store.ts
@@ -17,8 +17,8 @@ export class UmbDataTypeItemStore extends UmbEntityItemStore<DataTypeItemRespons
 	 * @memberof UmbDataTypeItemStore
 	 */
 	constructor(host: UmbControllerHost) {
-		super(host, UMB_DATA_TYPE_ITEM_STORE_CONTEXT_TOKEN.toString());
+		super(host, UMB_DATA_TYPE_ITEM_STORE_CONTEXT.toString());
 	}
 }
 
-export const UMB_DATA_TYPE_ITEM_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDataTypeItemStore>('UmbDataTypeItemStore');
+export const UMB_DATA_TYPE_ITEM_STORE_CONTEXT = new UmbContextToken<UmbDataTypeItemStore>('UmbDataTypeItemStore');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/tree/data-type.tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/tree/data-type.tree.store.ts
index 1b0cfecc4e..4f41e6642a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/tree/data-type.tree.store.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/tree/data-type.tree.store.ts
@@ -15,8 +15,8 @@ export class UmbDataTypeTreeStore extends UmbEntityTreeStore {
 	 * @memberof UmbDataTypeTreeStore
 	 */
 	constructor(host: UmbControllerHostElement) {
-		super(host, UMB_DATA_TYPE_TREE_STORE_CONTEXT_TOKEN.toString());
+		super(host, UMB_DATA_TYPE_TREE_STORE_CONTEXT.toString());
 	}
 }
 
-export const UMB_DATA_TYPE_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDataTypeTreeStore>('UmbDataTypeTreeStore');
+export const UMB_DATA_TYPE_TREE_STORE_CONTEXT = new UmbContextToken<UmbDataTypeTreeStore>('UmbDataTypeTreeStore');