diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-user-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-user-modal.token.ts
index 5ac7a0a780..e5769560b3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-user-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/create-user-modal.token.ts
@@ -1,6 +1,6 @@
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
-export const UMB_CREATE_USER_MODAL = new UmbModalToken('Umb.Modal.CreateUser', {
+export const UMB_CREATE_USER_MODAL = new UmbModalToken('Umb.Modal.User.Create', {
 	type: 'dialog',
 	size: 'small',
 });
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/current-user-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/current-user-modal.token.ts
index 5a78080a7a..bef9978337 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/current-user-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/current-user-modal.token.ts
@@ -1,6 +1,6 @@
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
-export const UMB_CURRENT_USER_MODAL = new UmbModalToken('Umb.Modal.CurrentUser', {
+export const UMB_CURRENT_USER_MODAL = new UmbModalToken('Umb.Modal.User.Current', {
 	type: 'sidebar',
 	size: 'small',
 });
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts
index 214a1b69d9..45fb8884c3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/user-picker-modal.token.ts
@@ -8,7 +8,7 @@ export interface UmbUserPickerModalValue {
 }
 
 export const UMB_USER_PICKER_MODAL = new UmbModalToken<UmbUserPickerModalData, UmbUserPickerModalValue>(
-	'Umb.Modal.UserPicker',
+	'Umb.Modal.User.Picker',
 	{
 		type: 'sidebar',
 		size: 'small',