diff --git a/README.md b/README.md
index 658639f..47b0a2c 100644
--- a/README.md
+++ b/README.md
@@ -685,10 +685,10 @@ yarn install
 
 yarn build
 
-yarn start usermonitoring run-user-group-monitoring --config-file config.json
+yarn start usermonitoring run-user-groups-monitoring --config-file config.json
 
 # To get the debug logs and store them in a file use:
-LOG_LEVEL=debug yarn start usermonitoring run-user-group-monitoring --config-file config.json &> user-group-monitoring.log
+LOG_LEVEL=debug yarn start usermonitoring run-user-groups-monitoring --config-file config.json &> user-groups-monitoring.log
 ```
 
 #### Parameters:
diff --git a/src/data/user-monitoring/user-group-monitoring/UserGroupD2Repository.ts b/src/data/user-monitoring/user-groups-monitoring/UserGroupD2Repository.ts
similarity index 93%
rename from src/data/user-monitoring/user-group-monitoring/UserGroupD2Repository.ts
rename to src/data/user-monitoring/user-groups-monitoring/UserGroupD2Repository.ts
index f88e8db..c870837 100644
--- a/src/data/user-monitoring/user-group-monitoring/UserGroupD2Repository.ts
+++ b/src/data/user-monitoring/user-groups-monitoring/UserGroupD2Repository.ts
@@ -1,7 +1,7 @@
 import { Id } from "domain/entities/Base";
 import { Async } from "domain/entities/Async";
-import { UserGroup } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
-import { UserGroupRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupRepository";
+import { UserGroup } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
+import { UserGroupRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupRepository";
 import { D2Api, MetadataPick, D2UserGroupSchema } from "@eyeseetea/d2-api/2.36";
 
 export class UserGroupD2Repository implements UserGroupRepository {
diff --git a/src/data/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigD2Repository.ts b/src/data/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigD2Repository.ts
similarity index 88%
rename from src/data/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigD2Repository.ts
rename to src/data/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigD2Repository.ts
index 7d7b5e0..32f7529 100644
--- a/src/data/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigD2Repository.ts
+++ b/src/data/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigD2Repository.ts
@@ -5,8 +5,8 @@ import { D2Api } from "@eyeseetea/d2-api/2.36";
 import { Async } from "domain/entities/Async";
 import { getObject } from "../common/GetDataStoreObjectByKey";
 import { d2ToolsNamespace, Namespace } from "data/externalConfig/Namespaces";
-import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-group-monitoring/UserGroupsMonitoringOptions";
-import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository";
+import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions";
+import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository";
 
 export class UserGroupsMonitoringConfigD2Repository implements UserGroupsMonitoringConfigRepository {
     private api: D2Api;
diff --git a/src/data/user-monitoring/user-template-monitoring/UserD2Repository.ts b/src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts
similarity index 96%
rename from src/data/user-monitoring/user-template-monitoring/UserD2Repository.ts
rename to src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts
index 37c2389..7320f18 100644
--- a/src/data/user-monitoring/user-template-monitoring/UserD2Repository.ts
+++ b/src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts
@@ -1,7 +1,7 @@
 import { Username } from "domain/entities/Base";
 import { Async } from "domain/entities/Async";
-import { User } from "domain/entities/user-monitoring/user-template-monitoring/Users";
-import { UserRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserRepository";
+import { User } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
+import { UserRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserRepository";
 import { D2Api, SelectedPick, D2UserSchema } from "@eyeseetea/d2-api/2.36";
 
 export class UserD2Repository implements UserRepository {
diff --git a/src/data/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigD2Repository.ts b/src/data/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigD2Repository.ts
similarity index 87%
rename from src/data/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigD2Repository.ts
rename to src/data/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigD2Repository.ts
index c6e0458..e11d629 100644
--- a/src/data/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigD2Repository.ts
+++ b/src/data/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigD2Repository.ts
@@ -5,8 +5,8 @@ import { D2Api } from "@eyeseetea/d2-api/2.36";
 import { Async } from "domain/entities/Async";
 import { getObject } from "../common/GetDataStoreObjectByKey";
 import { d2ToolsNamespace, Namespace } from "data/externalConfig/Namespaces";
-import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-template-monitoring/UserTemplatesMonitoringOptions";
-import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository";
+import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions";
+import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository";
 
 export class UserTemplatesMonitoringConfigD2Repository implements UserTemplatesMonitoringConfigRepository {
     private api: D2Api;
diff --git a/src/domain/entities/user-monitoring/user-group-monitoring/UserGroups.ts b/src/domain/entities/user-monitoring/user-groups-monitoring/UserGroups.ts
similarity index 100%
rename from src/domain/entities/user-monitoring/user-group-monitoring/UserGroups.ts
rename to src/domain/entities/user-monitoring/user-groups-monitoring/UserGroups.ts
diff --git a/src/domain/entities/user-monitoring/user-group-monitoring/UserGroupsMonitoringOptions.ts b/src/domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions.ts
similarity index 100%
rename from src/domain/entities/user-monitoring/user-group-monitoring/UserGroupsMonitoringOptions.ts
rename to src/domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions.ts
diff --git a/src/domain/entities/user-monitoring/user-template-monitoring/UserTemplatesMonitoringOptions.ts b/src/domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions.ts
similarity index 100%
rename from src/domain/entities/user-monitoring/user-template-monitoring/UserTemplatesMonitoringOptions.ts
rename to src/domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions.ts
diff --git a/src/domain/entities/user-monitoring/user-template-monitoring/Users.ts b/src/domain/entities/user-monitoring/user-templates-monitoring/Users.ts
similarity index 100%
rename from src/domain/entities/user-monitoring/user-template-monitoring/Users.ts
rename to src/domain/entities/user-monitoring/user-templates-monitoring/Users.ts
diff --git a/src/domain/repositories/user-monitoring/user-group-monitoring/UserGroupRepository.ts b/src/domain/repositories/user-monitoring/user-groups-monitoring/UserGroupRepository.ts
similarity index 88%
rename from src/domain/repositories/user-monitoring/user-group-monitoring/UserGroupRepository.ts
rename to src/domain/repositories/user-monitoring/user-groups-monitoring/UserGroupRepository.ts
index 610a529..fc73820 100644
--- a/src/domain/repositories/user-monitoring/user-group-monitoring/UserGroupRepository.ts
+++ b/src/domain/repositories/user-monitoring/user-groups-monitoring/UserGroupRepository.ts
@@ -1,6 +1,6 @@
 import { Id } from "domain/entities/Base";
 import { Async } from "domain/entities/Async";
-import { UserGroup } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
+import { UserGroup } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
 
 export interface UserGroupRepository {
     get(ids: Id[]): Async<UserGroup[]>;
diff --git a/src/domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository.ts b/src/domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository.ts
similarity index 78%
rename from src/domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository.ts
rename to src/domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository.ts
index 1a7c9bd..3ba7e53 100644
--- a/src/domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository.ts
+++ b/src/domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository.ts
@@ -1,4 +1,4 @@
-import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-group-monitoring/UserGroupsMonitoringOptions";
+import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions";
 
 export interface UserGroupsMonitoringConfigRepository {
     get(): Promise<UserGroupsMonitoringOptions>;
diff --git a/src/domain/repositories/user-monitoring/user-template-monitoring/UserRepository.ts b/src/domain/repositories/user-monitoring/user-templates-monitoring/UserRepository.ts
similarity index 91%
rename from src/domain/repositories/user-monitoring/user-template-monitoring/UserRepository.ts
rename to src/domain/repositories/user-monitoring/user-templates-monitoring/UserRepository.ts
index bbad455..c57889e 100644
--- a/src/domain/repositories/user-monitoring/user-template-monitoring/UserRepository.ts
+++ b/src/domain/repositories/user-monitoring/user-templates-monitoring/UserRepository.ts
@@ -1,6 +1,6 @@
 import { Username } from "domain/entities/Base";
 import { Async } from "domain/entities/Async";
-import { User } from "domain/entities/user-monitoring/user-template-monitoring/Users";
+import { User } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
 
 export interface UserRepository {
     getByUsername(usernames: Username[]): Async<User[]>;
diff --git a/src/domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository.ts b/src/domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository.ts
similarity index 76%
rename from src/domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository.ts
rename to src/domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository.ts
index 797371d..0e5af56 100644
--- a/src/domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository.ts
+++ b/src/domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository.ts
@@ -1,4 +1,4 @@
-import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-template-monitoring/UserTemplatesMonitoringOptions";
+import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions";
 
 export interface UserTemplatesMonitoringConfigRepository {
     get(): Promise<UserTemplatesMonitoringOptions>;
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/CompareUserGroupsUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/CompareUserGroupsUseCase.ts
similarity index 98%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/CompareUserGroupsUseCase.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/CompareUserGroupsUseCase.ts
index c6dfb1a..f4cc99d 100644
--- a/src/domain/usecases/user-monitoring/user-group-monitoring/CompareUserGroupsUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/CompareUserGroupsUseCase.ts
@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { UserGroup, UserGroupDiff } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
+import { UserGroup, UserGroupDiff } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
 
 export class CompareUserGroupsUseCase {
     constructor() {}
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/GetUserGroupsMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/GetUserGroupsMonitoringConfigUseCase.ts
similarity index 75%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/GetUserGroupsMonitoringConfigUseCase.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/GetUserGroupsMonitoringConfigUseCase.ts
index fedbedd..9e6ee6d 100644
--- a/src/domain/usecases/user-monitoring/user-group-monitoring/GetUserGroupsMonitoringConfigUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/GetUserGroupsMonitoringConfigUseCase.ts
@@ -1,4 +1,4 @@
-import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository";
+import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository";
 
 export class GetUserGroupsMonitoringConfigUseCase {
     constructor(private configRepository: UserGroupsMonitoringConfigRepository) {}
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/GetUserGroupsUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/GetUserGroupsUseCase.ts
similarity index 83%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/GetUserGroupsUseCase.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/GetUserGroupsUseCase.ts
index 13c45df..78b95a0 100644
--- a/src/domain/usecases/user-monitoring/user-group-monitoring/GetUserGroupsUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/GetUserGroupsUseCase.ts
@@ -1,7 +1,7 @@
 import { Id } from "domain/entities/Base";
 import { Async } from "domain/entities/Async";
-import { UserGroup } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
-import { UserGroupRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupRepository";
+import { UserGroup } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
+import { UserGroupRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupRepository";
 
 export class GetUserGroupsUseCase {
     constructor(private userGroupRepository: UserGroupRepository) {}
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/MonitorUserGroupsUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts
similarity index 95%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/MonitorUserGroupsUseCase.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts
index 2493284..a83ad66 100644
--- a/src/domain/usecases/user-monitoring/user-group-monitoring/MonitorUserGroupsUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts
@@ -2,12 +2,12 @@ import _ from "lodash";
 import log from "utils/log";
 
 import { Async } from "domain/entities/Async";
-import { UserGroup, UserGroupDiff } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
-import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-group-monitoring/UserGroupsMonitoringOptions";
+import { UserGroup, UserGroupDiff } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
+import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions";
 
 import { MessageRepository } from "domain/repositories/user-monitoring/common/MessageRepository";
-import { UserGroupRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupRepository";
-import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository";
+import { UserGroupRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupRepository";
+import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository";
 
 import { GetUserGroupsUseCase } from "./GetUserGroupsUseCase";
 import { CompareUserGroupsUseCase } from "./CompareUserGroupsUseCase";
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts
similarity index 80%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts
index 7071cdb..c07411a 100644
--- a/src/domain/usecases/user-monitoring/user-group-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts
@@ -1,8 +1,8 @@
-import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigRepository";
+import { UserGroupsMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigRepository";
 
 import { Async } from "domain/entities/Async";
-import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-group-monitoring/UserGroupsMonitoringOptions";
-import { UserGroup } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
+import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions";
+import { UserGroup } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
 
 import { GetLogFormatDateUseCase } from "../GetLogFormatDateUseCase";
 
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/__tests__/CompareUserGroupsUseCase.data.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.data.ts
similarity index 99%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/__tests__/CompareUserGroupsUseCase.data.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.data.ts
index d66256c..1fb7b36 100644
--- a/src/domain/usecases/user-monitoring/user-group-monitoring/__tests__/CompareUserGroupsUseCase.data.ts
+++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.data.ts
@@ -1,4 +1,4 @@
-import { UserGroup, UserGroupDiff } from "domain/entities/user-monitoring/user-group-monitoring/UserGroups";
+import { UserGroup, UserGroupDiff } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups";
 
 export const emptyDiff: UserGroupDiff = {
     id: "id123",
diff --git a/src/domain/usecases/user-monitoring/user-group-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts
similarity index 100%
rename from src/domain/usecases/user-monitoring/user-group-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts
rename to src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/CompareUserTemplatesUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/CompareUserTemplatesUseCase.ts
similarity index 98%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/CompareUserTemplatesUseCase.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/CompareUserTemplatesUseCase.ts
index 06c25b7..ea3fc52 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/CompareUserTemplatesUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/CompareUserTemplatesUseCase.ts
@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-template-monitoring/Users";
+import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
 
 export class CompareUserTemplatesUseCase {
     constructor() {}
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/GetUserTemplatesMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/GetUserTemplatesMonitoringConfigUseCase.ts
similarity index 74%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/GetUserTemplatesMonitoringConfigUseCase.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/GetUserTemplatesMonitoringConfigUseCase.ts
index 785f93b..8c0e084 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/GetUserTemplatesMonitoringConfigUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/GetUserTemplatesMonitoringConfigUseCase.ts
@@ -1,4 +1,4 @@
-import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository";
+import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository";
 
 export class GetUserTemplatesMonitoringConfigUseCase {
     constructor(private configRepository: UserTemplatesMonitoringConfigRepository) {}
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/GetUserTemplatesUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/GetUserTemplatesUseCase.ts
similarity index 86%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/GetUserTemplatesUseCase.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/GetUserTemplatesUseCase.ts
index 9c58de2..b31e043 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/GetUserTemplatesUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/GetUserTemplatesUseCase.ts
@@ -1,7 +1,7 @@
 import { Username } from "domain/entities/Base";
 import { Async } from "domain/entities/Async";
-import { User } from "domain/entities/user-monitoring/user-template-monitoring/Users";
-import { UserRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserRepository";
+import { User } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
+import { UserRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserRepository";
 
 export class GetUserTemplatesUseCase {
     constructor(private userGroupRepository: UserRepository) {}
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/MonitorUserTemplatesUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts
similarity index 95%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/MonitorUserTemplatesUseCase.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts
index 039c91c..538415a 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/MonitorUserTemplatesUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts
@@ -3,12 +3,12 @@ import log from "utils/log";
 
 import { Async } from "domain/entities/Async";
 import { NamedRef } from "domain/entities/Base";
-import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-template-monitoring/Users";
-import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-template-monitoring/UserTemplatesMonitoringOptions";
+import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
+import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions";
 
 import { MessageRepository } from "domain/repositories/user-monitoring/common/MessageRepository";
-import { UserRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserRepository";
-import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository";
+import { UserRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserRepository";
+import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository";
 
 import { GetUserTemplatesUseCase } from "./GetUserTemplatesUseCase";
 import { CompareUserTemplatesUseCase } from "./CompareUserTemplatesUseCase";
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts
similarity index 79%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts
index bb9fc0c..6a37f11 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts
@@ -1,8 +1,8 @@
-import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigRepository";
+import { UserTemplatesMonitoringConfigRepository } from "domain/repositories/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigRepository";
 
 import { Async } from "domain/entities/Async";
-import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-template-monitoring/UserTemplatesMonitoringOptions";
-import { User } from "domain/entities/user-monitoring/user-template-monitoring/Users";
+import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions";
+import { User } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
 
 import { GetLogFormatDateUseCase } from "../GetLogFormatDateUseCase";
 
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts
similarity index 99%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts
index 4eb376f..37208ca 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts
@@ -1,4 +1,4 @@
-import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-template-monitoring/Users";
+import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
 
 export const user1: User = {
     lastUpdated: "2024-06-10T10:25:27.228",
diff --git a/src/domain/usecases/user-monitoring/user-template-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts
similarity index 96%
rename from src/domain/usecases/user-monitoring/user-template-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts
rename to src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts
index 2e1ddfe..3f5c00b 100644
--- a/src/domain/usecases/user-monitoring/user-template-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts
+++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts
@@ -3,7 +3,7 @@ import { describe, it, expect, beforeEach } from "vitest";
 import { user1, user1Updated, expectedDiff } from "./CompareUserTemplatesUseCase.data";
 
 import { CompareUserTemplatesUseCase } from "../CompareUserTemplatesUseCase";
-import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-template-monitoring/Users";
+import { User, UserTemplateDiff } from "domain/entities/user-monitoring/user-templates-monitoring/Users";
 
 describe("CompareUserTemplatesUseCase", () => {
     let useCase: CompareUserTemplatesUseCase;
diff --git a/src/scripts/commands/usermonitoring.ts b/src/scripts/commands/usermonitoring.ts
index e923933..dc02917 100644
--- a/src/scripts/commands/usermonitoring.ts
+++ b/src/scripts/commands/usermonitoring.ts
@@ -23,13 +23,13 @@ import { MessageMSTeamsRepository } from "data/user-monitoring/common/MessageMST
 import { MSTeamsWebhookOptions } from "data/user-monitoring/entities/MSTeamsWebhookOptions";
 import { MonitorUsersByAuthorityUseCase } from "domain/usecases/user-monitoring/authorities-monitoring/MonitorUsersByAuthorityUseCase";
 
-import { UserGroupD2Repository } from "data/user-monitoring/user-group-monitoring/UserGroupD2Repository";
-import { UserGroupsMonitoringConfigD2Repository } from "data/user-monitoring/user-group-monitoring/UserGroupsMonitoringConfigD2Repository";
-import { MonitorUserGroupsUseCase } from "domain/usecases/user-monitoring/user-group-monitoring/MonitorUserGroupsUseCase";
+import { UserGroupD2Repository } from "data/user-monitoring/user-groups-monitoring/UserGroupD2Repository";
+import { UserGroupsMonitoringConfigD2Repository } from "data/user-monitoring/user-groups-monitoring/UserGroupsMonitoringConfigD2Repository";
+import { MonitorUserGroupsUseCase } from "domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase";
 
-import { UserD2Repository } from "data/user-monitoring/user-template-monitoring/UserD2Repository";
-import { UserTemplatesMonitoringConfigD2Repository } from "data/user-monitoring/user-template-monitoring/UserTemplatesMonitoringConfigD2Repository";
-import { MonitorUserTemplatesUseCase } from "domain/usecases/user-monitoring/user-template-monitoring/MonitorUserTemplatesUseCase";
+import { UserD2Repository } from "data/user-monitoring/user-templates-monitoring/UserD2Repository";
+import { UserTemplatesMonitoringConfigD2Repository } from "data/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringConfigD2Repository";
+import { MonitorUserTemplatesUseCase } from "domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase";
 
 export function getCommand() {
     return subcommands({
@@ -38,7 +38,7 @@ export function getCommand() {
             "run-permissions-fixer": runUsersMonitoringCmd,
             "run-2fa-reporter": run2FAReporterCmd,
             "run-authorities-monitoring": runAuthoritiesMonitoring,
-            "run-user-group-monitoring": runUserGroupMonitoringCmd,
+            "run-user-groups-monitoring": runUserGroupMonitoringCmd,
             "run-user-templates-monitoring": runUserTemplateMonitoringCmd,
         },
     });
@@ -143,9 +143,9 @@ const runAuthoritiesMonitoring = command({
 });
 
 const runUserGroupMonitoringCmd = command({
-    name: "run-user-group-monitoring",
+    name: "run-user-groups-monitoring",
     description:
-        "Run user group monitoring, a --config-file must be provided (usermonitoring run-user-group-monitoring --config-file config.json)",
+        "Run user group monitoring, a --config-file must be provided (usermonitoring run-user-groups-monitoring --config-file config.json)",
     args: {
         config_file: option({
             type: string,
@@ -182,7 +182,7 @@ const runUserGroupMonitoringCmd = command({
 const runUserTemplateMonitoringCmd = command({
     name: "run-user-templates-monitoring",
     description:
-        "Run user template monitoring, a --config-file must be provided (usermonitoring run-user-template-monitoring --config-file config.json)",
+        "Run user template monitoring, a --config-file must be provided (usermonitoring run-user-templates-monitoring --config-file config.json)",
     args: {
         config_file: option({
             type: string,
@@ -194,7 +194,7 @@ const runUserTemplateMonitoringCmd = command({
             short: "s",
             long: "set-datastore",
             description:
-                "Write users templates to datastore, use in script setup. It assumes there is a monitoring config in d2-tools/user-groups-monitoring",
+                "Write users templates to datastore, use in script setup. It assumes there is a monitoring config in d2-tools/user-templates-monitoring",
         }),
     },