diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
index 179ebd6d..1ebb81f5 100644
--- a/gatewayservice/gateway-service.js
+++ b/gatewayservice/gateway-service.js
@@ -54,9 +54,9 @@ app.use("/admin", adminMiddleware)
 // Routes
 require("./routes/gatewayRoutes")(app)
 require("./routes/jordiRoutes")(app, axios)
-require("./routes/usersRoutes")(app, axios, authTokenMiddleware)
-require("./routes/authRoutes")(app, axios)
-require("./routes/historyRoutes")(app, axios, authTokenMiddleware)
+require("./routes/gatewayUsersRoutes")(app, axios, authTokenMiddleware)
+require("./routes/gatewayAuthRoutes")(app, axios)
+require("./routes/gatewayHistoryRoutes")(app, axios, authTokenMiddleware)
 
 // Open API
 const openapiPath='./GatewayAPI.yaml'
diff --git a/gatewayservice/routes/authRoutes.test.js b/gatewayservice/routes/authRoutes.test.js
index 0f9f9aa7..b7ea2050 100644
--- a/gatewayservice/routes/authRoutes.test.js
+++ b/gatewayservice/routes/authRoutes.test.js
@@ -1,7 +1,7 @@
 const request = require('supertest');
 const express = require('express');
 const axios = require('axios');
-const authRoutes = require('./authRoutes');
+const authRoutes = require('./gatewayAuthRoutes');
 
 jest.mock('axios');
 
diff --git a/gatewayservice/routes/authRoutes.js b/gatewayservice/routes/gatewayAuthRoutes.js
similarity index 100%
rename from gatewayservice/routes/authRoutes.js
rename to gatewayservice/routes/gatewayAuthRoutes.js
diff --git a/gatewayservice/routes/historyRoutes.js b/gatewayservice/routes/gatewayHistoryRoutes.js
similarity index 100%
rename from gatewayservice/routes/historyRoutes.js
rename to gatewayservice/routes/gatewayHistoryRoutes.js
diff --git a/gatewayservice/routes/usersRoutes.js b/gatewayservice/routes/gatewayUsersRoutes.js
similarity index 100%
rename from gatewayservice/routes/usersRoutes.js
rename to gatewayservice/routes/gatewayUsersRoutes.js
diff --git a/users/authservice/auth-service.js b/users/authservice/auth-service.js
index a730c616..b8e99df3 100644
--- a/users/authservice/auth-service.js
+++ b/users/authservice/auth-service.js
@@ -30,7 +30,7 @@ const metricsMiddleware = promBundle({includeMethod: true});
 app.use(metricsMiddleware);
 
 // Initialize the user repository
-const userRepository = require('./repositories/userRepository');
+const userRepository = require('./repositories/authUserRepository');
 userRepository.init(mongoose, mongoUri);
 
 // Middleware to parse JSON in request body
diff --git a/users/authservice/repositories/userRepository.js b/users/authservice/repositories/authUserRepository.js
similarity index 100%
rename from users/authservice/repositories/userRepository.js
rename to users/authservice/repositories/authUserRepository.js