diff --git a/services/web/modules/launchpad/test/unit/src/LaunchpadControllerTests.mjs b/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
similarity index 100%
rename from services/web/modules/launchpad/test/unit/src/LaunchpadControllerTests.mjs
rename to services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
diff --git a/services/web/modules/user-activate/test/unit/src/UserActivateControllerTests.mjs b/services/web/modules/user-activate/test/unit/src/UserActivateController.test.mjs
similarity index 100%
rename from services/web/modules/user-activate/test/unit/src/UserActivateControllerTests.mjs
rename to services/web/modules/user-activate/test/unit/src/UserActivateController.test.mjs
diff --git a/services/web/test/unit/src/Analytics/AnalyticsControllerTests.mjs b/services/web/test/unit/src/Analytics/AnalyticsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Analytics/AnalyticsControllerTests.mjs
rename to services/web/test/unit/src/Analytics/AnalyticsController.test.mjs
diff --git a/services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddlewareTests.mjs b/services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddleware.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddlewareTests.mjs
rename to services/web/test/unit/src/Analytics/AnalyticsUTMTrackingMiddleware.test.mjs
diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramControllerTests.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/BetaProgram/BetaProgramControllerTests.mjs
rename to services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramHandlerTests.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/BetaProgram/BetaProgramHandlerTests.mjs
rename to services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsControllerTests.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Collaborators/CollaboratorsControllerTests.mjs
rename to services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.mjs
rename to services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.mjs
rename to services/web/test/unit/src/Collaborators/CollaboratorsInviteHandler.test.mjs
diff --git a/services/web/test/unit/src/Contact/ContactControllerTests.mjs b/services/web/test/unit/src/Contact/ContactController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Contact/ContactControllerTests.mjs
rename to services/web/test/unit/src/Contact/ContactController.test.mjs
diff --git a/services/web/test/unit/src/Cooldown/CooldownMiddlewareTests.mjs b/services/web/test/unit/src/Cooldown/CooldownMiddleware.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Cooldown/CooldownMiddlewareTests.mjs
rename to services/web/test/unit/src/Cooldown/CooldownMiddleware.test.mjs
diff --git a/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterControllerTests.mjs b/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/DocumentUpdater/DocumentUpdaterControllerTests.mjs
rename to services/web/test/unit/src/DocumentUpdater/DocumentUpdaterController.test.mjs
diff --git a/services/web/test/unit/src/Documents/DocumentControllerTests.mjs b/services/web/test/unit/src/Documents/DocumentController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Documents/DocumentControllerTests.mjs
rename to services/web/test/unit/src/Documents/DocumentController.test.mjs
diff --git a/services/web/test/unit/src/Downloads/ProjectDownloadsControllerTests.mjs b/services/web/test/unit/src/Downloads/ProjectDownloadsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Downloads/ProjectDownloadsControllerTests.mjs
rename to services/web/test/unit/src/Downloads/ProjectDownloadsController.test.mjs
diff --git a/services/web/test/unit/src/Downloads/ProjectZipStreamManagerTests.mjs b/services/web/test/unit/src/Downloads/ProjectZipStreamManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Downloads/ProjectZipStreamManagerTests.mjs
rename to services/web/test/unit/src/Downloads/ProjectZipStreamManager.test.mjs
diff --git a/services/web/test/unit/src/Exports/ExportsControllerTests.mjs b/services/web/test/unit/src/Exports/ExportsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Exports/ExportsControllerTests.mjs
rename to services/web/test/unit/src/Exports/ExportsController.test.mjs
diff --git a/services/web/test/unit/src/Exports/ExportsHandlerTests.mjs b/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Exports/ExportsHandlerTests.mjs
rename to services/web/test/unit/src/Exports/ExportsHandler.test.mjs
diff --git a/services/web/test/unit/src/FileStore/FileStoreControllerTests.mjs b/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/FileStore/FileStoreControllerTests.mjs
rename to services/web/test/unit/src/FileStore/FileStoreController.test.mjs
diff --git a/services/web/test/unit/src/LinkedFiles/LinkedFilesControllerTests.mjs b/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/LinkedFiles/LinkedFilesControllerTests.mjs
rename to services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
diff --git a/services/web/test/unit/src/Metadata/MetaControllerTests.mjs b/services/web/test/unit/src/Metadata/MetaController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Metadata/MetaControllerTests.mjs
rename to services/web/test/unit/src/Metadata/MetaController.test.mjs
diff --git a/services/web/test/unit/src/Metadata/MetaHandlerTests.mjs b/services/web/test/unit/src/Metadata/MetaHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Metadata/MetaHandlerTests.mjs
rename to services/web/test/unit/src/Metadata/MetaHandler.test.mjs
diff --git a/services/web/test/unit/src/Notifications/NotificationsControllerTests.mjs b/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Notifications/NotificationsControllerTests.mjs
rename to services/web/test/unit/src/Notifications/NotificationsController.test.mjs
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetControllerTests.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/PasswordReset/PasswordResetControllerTests.mjs
rename to services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetHandlerTests.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/PasswordReset/PasswordResetHandlerTests.mjs
rename to services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
diff --git a/services/web/test/unit/src/Project/DocLinesComparitorTests.mjs b/services/web/test/unit/src/Project/DocLinesComparitor.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/DocLinesComparitorTests.mjs
rename to services/web/test/unit/src/Project/DocLinesComparitor.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectApiControllerTests.mjs b/services/web/test/unit/src/Project/ProjectApiController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectApiControllerTests.mjs
rename to services/web/test/unit/src/Project/ProjectApiController.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectListControllerTests.mjs b/services/web/test/unit/src/Project/ProjectListController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectListControllerTests.mjs
rename to services/web/test/unit/src/Project/ProjectListController.test.mjs
diff --git a/services/web/test/unit/src/Referal/ReferalConnectTests.mjs b/services/web/test/unit/src/Referal/ReferalConnect.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Referal/ReferalConnectTests.mjs
rename to services/web/test/unit/src/Referal/ReferalConnect.test.mjs
diff --git a/services/web/test/unit/src/Referal/ReferalControllerTests.mjs b/services/web/test/unit/src/Referal/ReferalController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Referal/ReferalControllerTests.mjs
rename to services/web/test/unit/src/Referal/ReferalController.test.mjs
diff --git a/services/web/test/unit/src/Referal/ReferalHandlerTests.mjs b/services/web/test/unit/src/Referal/ReferalHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Referal/ReferalHandlerTests.mjs
rename to services/web/test/unit/src/Referal/ReferalHandler.test.mjs
diff --git a/services/web/test/unit/src/References/ReferencesControllerTests.mjs b/services/web/test/unit/src/References/ReferencesController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/References/ReferencesControllerTests.mjs
rename to services/web/test/unit/src/References/ReferencesController.test.mjs
diff --git a/services/web/test/unit/src/References/ReferencesHandlerTests.mjs b/services/web/test/unit/src/References/ReferencesHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/References/ReferencesHandlerTests.mjs
rename to services/web/test/unit/src/References/ReferencesHandler.test.mjs
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupControllerTests.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Subscription/SubscriptionGroupControllerTests.mjs
rename to services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
diff --git a/services/web/test/unit/src/Subscription/TeamInvitesControllerTests.mjs b/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Subscription/TeamInvitesControllerTests.mjs
rename to services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
diff --git a/services/web/test/unit/src/Tags/TagsControllerTests.mjs b/services/web/test/unit/src/Tags/TagsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Tags/TagsControllerTests.mjs
rename to services/web/test/unit/src/Tags/TagsController.test.mjs
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsControllerTests.mjs b/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/ThirdPartyDataStore/TpdsControllerTests.mjs
rename to services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandlerTests.mjs b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandlerTests.mjs
rename to services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
diff --git a/services/web/test/unit/src/TokenAccess/TokenAccessControllerTests.mjs b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/TokenAccess/TokenAccessControllerTests.mjs
rename to services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
diff --git a/services/web/test/unit/src/Uploads/ProjectUploadControllerTests.mjs b/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Uploads/ProjectUploadControllerTests.mjs
rename to services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
diff --git a/services/web/test/unit/src/User/UserPagesControllerTests.mjs b/services/web/test/unit/src/User/UserPagesController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/User/UserPagesControllerTests.mjs
rename to services/web/test/unit/src/User/UserPagesController.test.mjs
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipControllerTests.mjs b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/UserMembership/UserMembershipControllerTests.mjs
rename to services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
diff --git a/services/web/test/unit/src/infrastructure/ServeStaticWrapperTests.mjs b/services/web/test/unit/src/infrastructure/ServeStaticWrapper.test.mjs
similarity index 100%
rename from services/web/test/unit/src/infrastructure/ServeStaticWrapperTests.mjs
rename to services/web/test/unit/src/infrastructure/ServeStaticWrapper.test.mjs