diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts
index 17bc531166..ba68ec4184 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts
@@ -1,6 +1,6 @@
 import { UmbUserGroupCollectionFilterModel } from '../../types.js';
 import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN, UmbUserGroupStore } from '../../repository/user-group.store.js';
-import { UmbUserGroupCollectionServerDataSource } from './user-group-collection.server.data.js';
+import { UmbUserGroupCollectionServerDataSource } from './user-group-collection.server.data-source.js';
 import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/repository';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data-source.ts
similarity index 99%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data-source.ts
index ce2262ca2f..1e6d4be786 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group-item.server.data-source.ts
@@ -34,7 +34,7 @@ export class UmbUserGroupItemServerDataSource implements UmbItemDataSource<UserG
 			this.#host,
 			UserGroupResource.getUserGroupItem({
 				id: ids,
-			})
+			}),
 		);
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/sources/user-group.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts
index 5306b1be37..f91af89b78 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts
@@ -1,8 +1,8 @@
 import { UmbUserGroupDetailDataSource } from '../types.js';
-import { UmbUserGroupServerDataSource } from './sources/user-group.server.data.js';
+import { UmbUserGroupServerDataSource } from './sources/user-group.server.data-source.js';
 import { UMB_USER_GROUP_ITEM_STORE_CONTEXT_TOKEN, UmbUserGroupItemStore } from './user-group-item.store.js';
 import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN, UmbUserGroupStore } from './user-group.store.js';
-import { UmbUserGroupItemServerDataSource } from './sources/user-group-item.server.data.js';
+import { UmbUserGroupItemServerDataSource } from './sources/user-group-item.server.data-source.js';
 import { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import {
 	CreateUserGroupRequestModel,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts
index a2c7e3895e..fe7196b207 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts
@@ -1,6 +1,6 @@
 import { UmbUserCollectionFilterModel } from '../../types.js';
 import { UmbUserRepositoryBase } from '../../repository/user-repository-base.js';
-import { UmbUserCollectionServerDataSource } from './user-collection.server.data.js';
+import { UmbUserCollectionServerDataSource } from './user-collection.server.data-source.js';
 import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/repository';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.repository.ts
index 3f0f8481fa..8e3208fb04 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.repository.ts
@@ -1,5 +1,5 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
-import { UmbChangeUserPasswordServerDataSource } from './change-user-password.server.data.js';
+import { UmbChangeUserPasswordServerDataSource } from './change-user-password.server.data-source.js';
 import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts
index 761e333645..95d996c37c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts
@@ -1,5 +1,5 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
-import { UmbDisableUserServerDataSource } from './disable-user.server.data.js';
+import { UmbDisableUserServerDataSource } from './disable-user.server.data-source.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UserStateModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts
index f5866349e6..71b8dde49b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts
@@ -1,5 +1,5 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
-import { UmbEnableUserServerDataSource } from './enable-user.server.data.js';
+import { UmbEnableUserServerDataSource } from './enable-user.server.data-source.js';
 import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UserStateModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.repository.ts
index ad85cb0efe..da2afa1791 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.repository.ts
@@ -1,6 +1,6 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
 import { type UmbInviteUserDataSource } from './types.js';
-import { UmbInviteUserServerDataSource } from './invite-user.server.data.js';
+import { UmbInviteUserServerDataSource } from './invite-user.server.data-source.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { InviteUserRequestModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/invite/invite-user.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts
index 4a0e976ca3..b2d92aebf1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.repository.ts
@@ -1,5 +1,5 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
-import { UmbUserItemServerDataSource } from './user-item.server.data.js';
+import { UmbUserItemServerDataSource } from './user-item.server.data-source.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbItemDataSource, UmbItemRepository } from '@umbraco-cms/backoffice/repository';
 import { UserItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts
index 2337ccecac..4ff8f3e402 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts
@@ -1,5 +1,5 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
-import { UmbUnlockUserServerDataSource } from './unlock-user.server.data.js';
+import { UmbUnlockUserServerDataSource } from './unlock-user.server.data-source.js';
 import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UserStateModel } from '@umbraco-cms/backoffice/backend-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.repository.ts
index 94c193828f..57652f5cb3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/user.repository.ts
@@ -1,7 +1,7 @@
 import { UmbTemporaryFileRepository } from '@umbraco-cms/backoffice/temporary-file';
 import { UmbUserDetailDataSource, UmbUserSetGroupDataSource } from '../types.js';
-import { UmbUserServerDataSource } from './sources/user.server.data.js';
-import { UmbUserSetGroupsServerDataSource } from './sources/user-set-group.server.data.js';
+import { UmbUserServerDataSource } from './sources/user.server.data-source.js';
+import { UmbUserSetGroupsServerDataSource } from './sources/user-set-group.server.data-source.js';
 
 import { UmbUserRepositoryBase } from './user-repository-base.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';