diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create/user-create-modal.element.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create/user-create-modal.element.ts
index 17f8ee41dc..e0b4b34ac1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create-user/create-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/create/user-create-modal.element.ts
@@ -2,7 +2,6 @@ import { css, html, nothing } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement, query, state } from 'lit/decorators.js';
 import { UUIInputPasswordElement } from '@umbraco-ui/uui';
-import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from '../../repository/user.store';
 import { UmbInputPickerUserGroupElement } from '../../../../shared/components/input-user-group/input-user-group.element';
 import { UmbUserRepository } from '../../repository/user.repository';
 import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
@@ -14,8 +13,8 @@ import {
 import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export type UsersViewType = 'list' | 'grid';
-@customElement('umb-create-user-modal')
-export class UmbCreateUserModalElement extends UmbModalBaseElement {
+@customElement('umb-user-create-modal')
+export class UmbUserCreateModalElement extends UmbModalBaseElement {
 	@query('#form')
 	private _form!: HTMLFormElement;
 
@@ -218,10 +217,10 @@ export class UmbCreateUserModalElement extends UmbModalBaseElement {
 	];
 }
 
-export default UmbCreateUserModalElement;
+export default UmbUserCreateModalElement;
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-create-user-modal': UmbCreateUserModalElement;
+		'umb-user-create-modal': UmbUserCreateModalElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite/user-invite-modal.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite/user-invite-modal.element.ts
index 463df6e6fe..66d0826d0f 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite-user/invite-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/invite/user-invite-modal.element.ts
@@ -7,8 +7,8 @@ import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
 import type { UserResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export type UsersViewType = 'list' | 'grid';
-@customElement('umb-invite-user-modal')
-export class UmbInviteUserModalElement extends UmbModalBaseElement {
+@customElement('umb-user-invite-modal')
+export class UmbUserInviteModalElement extends UmbModalBaseElement {
 	@query('#form')
 	private _form!: HTMLFormElement;
 
@@ -187,10 +187,10 @@ export class UmbInviteUserModalElement extends UmbModalBaseElement {
 	];
 }
 
-export default UmbInviteUserModalElement;
+export default UmbUserInviteModalElement;
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-invite-user-modal': UmbInviteUserModalElement;
+		'umb-user-invite-modal': UmbUserInviteModalElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/manifests.ts
index efdf1f2edc..8d9fbee64d 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/modals/manifests.ts
@@ -5,13 +5,13 @@ const modals: Array<ManifestModal> = [
 		type: 'modal',
 		alias: 'Umb.Modal.CreateUser',
 		name: 'Create User Modal',
-		loader: () => import('./create-user/create-user-modal.element'),
+		loader: () => import('./create/user-create-modal.element'),
 	},
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.InviteUser',
 		name: 'Invite User Modal',
-		loader: () => import('./invite-user/invite-user-modal.element'),
+		loader: () => import('./invite/user-invite-modal.element'),
 	},
 	{
 		type: 'modal',