diff --git a/modules/users/SCsub b/modules/users/SCsub
index 219cc67c5..099d987bc 100644
--- a/modules/users/SCsub
+++ b/modules/users/SCsub
@@ -17,7 +17,7 @@ sources = [
 ]
 
 if env['module_web_enabled']:
-  sources.append("web/middleware/user_session_setup_middleware.cpp")
+  sources.append("web/middleware/user_session_setup_web_server_middleware.cpp")
 
 if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
     # Shared lib compilation
diff --git a/modules/users/register_types.cpp b/modules/users/register_types.cpp
index b23c22a02..5ec7a5031 100644
--- a/modules/users/register_types.cpp
+++ b/modules/users/register_types.cpp
@@ -35,7 +35,7 @@ SOFTWARE.
 #include "../modules_enabled.gen.h"
 
 #ifdef MODULE_WEB_ENABLED
-#include "web/middleware/user_session_setup_middleware.h"
+#include "web/middleware/user_session_setup_web_server_middleware.h"
 #endif
 
 UserDB *_user_db = nullptr;
diff --git a/modules/users/web/middleware/user_session_setup_middleware.cpp b/modules/users/web/middleware/user_session_setup_web_server_middleware.cpp
similarity index 93%
rename from modules/users/web/middleware/user_session_setup_middleware.cpp
rename to modules/users/web/middleware/user_session_setup_web_server_middleware.cpp
index ed1797542..b2e05ecb3 100644
--- a/modules/users/web/middleware/user_session_setup_middleware.cpp
+++ b/modules/users/web/middleware/user_session_setup_web_server_middleware.cpp
@@ -1,4 +1,4 @@
-#include "user_session_setup_middleware.h"
+#include "user_session_setup_web_server_middleware.h"
 
 #include "../../singleton/user_db.h"
 #include "../../users/user.h"
diff --git a/modules/users/web/middleware/user_session_setup_middleware.h b/modules/users/web/middleware/user_session_setup_web_server_middleware.h
similarity index 100%
rename from modules/users/web/middleware/user_session_setup_middleware.h
rename to modules/users/web/middleware/user_session_setup_web_server_middleware.h