diff --git a/lightrun/api-service/.gitignore b/lightrun/lightrun-api-service/.gitignore
similarity index 100%
rename from lightrun/api-service/.gitignore
rename to lightrun/lightrun-api-service/.gitignore
diff --git a/lightrun/api-service/pom.xml b/lightrun/lightrun-api-service/pom.xml
similarity index 94%
rename from lightrun/api-service/pom.xml
rename to lightrun/lightrun-api-service/pom.xml
index f44ad07edb..b7ed5f951b 100644
--- a/lightrun/api-service/pom.xml
+++ b/lightrun/lightrun-api-service/pom.xml
@@ -4,9 +4,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>api-service</artifactId>
+    <artifactId>lightrun-api-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>api-service</name>
+    <name>lightrun-api-service</name>
     <description>Aggregator Service for LightRun Article</description>
 
     <parent>
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/ApiServiceApplication.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/RequestIdGenerator.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/RestTemplateConfig.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/WebConfig.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/WebConfig.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/WebConfig.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/WebConfig.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/TaskResponse.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/TasksController.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/UnknownTaskException.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/UnknownTaskException.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/UnknownTaskException.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/UnknownTaskException.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/UserResponse.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/UserResponse.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/http/UserResponse.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/http/UserResponse.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/Task.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/tasks/TaskRepository.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/User.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/users/User.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/User.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/users/User.java
diff --git a/lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java b/lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java
similarity index 100%
rename from lightrun/api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java
rename to lightrun/lightrun-api-service/src/main/java/com/baeldung/apiservice/adapters/users/UserRepository.java
diff --git a/lightrun/api-service/src/main/resources/application.properties b/lightrun/lightrun-api-service/src/main/resources/application.properties
similarity index 100%
rename from lightrun/api-service/src/main/resources/application.properties
rename to lightrun/lightrun-api-service/src/main/resources/application.properties
diff --git a/lightrun/tasks-service/.gitignore b/lightrun/lightrun-tasks-service/.gitignore
similarity index 100%
rename from lightrun/tasks-service/.gitignore
rename to lightrun/lightrun-tasks-service/.gitignore
diff --git a/lightrun/tasks-service/pom.xml b/lightrun/lightrun-tasks-service/pom.xml
similarity index 96%
rename from lightrun/tasks-service/pom.xml
rename to lightrun/lightrun-tasks-service/pom.xml
index c3542b0089..2689a9794d 100644
--- a/lightrun/tasks-service/pom.xml
+++ b/lightrun/lightrun-tasks-service/pom.xml
@@ -4,9 +4,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>tasks-service</artifactId>
+    <artifactId>lightrun-tasks-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>tasks-service</name>
+    <name>lightrun-tasks-service</name>
     <description>Tasks Service for LightRun Article</description>
 
     <parent>
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/ArtemisConfig.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/ArtemisConfig.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/ArtemisConfig.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/ArtemisConfig.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/SimpleCacheCustomizer.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/SimpleCacheCustomizer.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/SimpleCacheCustomizer.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/SimpleCacheCustomizer.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/TasksServiceApplication.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/CreateTaskRequest.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/CreateTaskRequest.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/CreateTaskRequest.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/CreateTaskRequest.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/PatchTaskRequest.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/PatchTaskRequest.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/PatchTaskRequest.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/PatchTaskRequest.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TaskResponse.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/TasksController.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/http-client.env.json b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/http-client.env.json
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/http-client.env.json
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/http-client.env.json
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/tasks.http b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/tasks.http
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/tasks.http
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/http/tasks.http
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/jms/JmsConsumer.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TaskRecord.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TasksRepository.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TasksRepository.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TasksRepository.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/adapters/repository/TasksRepository.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/service/DeletedUserService.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/service/TasksService.java
diff --git a/lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/UnknownTaskException.java b/lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/service/UnknownTaskException.java
similarity index 100%
rename from lightrun/tasks-service/src/main/java/com/baeldung/tasksservice/service/UnknownTaskException.java
rename to lightrun/lightrun-tasks-service/src/main/java/com/baeldung/tasksservice/service/UnknownTaskException.java
diff --git a/lightrun/tasks-service/src/main/resources/application.properties b/lightrun/lightrun-tasks-service/src/main/resources/application.properties
similarity index 100%
rename from lightrun/tasks-service/src/main/resources/application.properties
rename to lightrun/lightrun-tasks-service/src/main/resources/application.properties
diff --git a/lightrun/tasks-service/src/main/resources/db/migration/V1_0_0__create-tasks-table.sql b/lightrun/lightrun-tasks-service/src/main/resources/db/migration/V1_0_0__create-tasks-table.sql
similarity index 100%
rename from lightrun/tasks-service/src/main/resources/db/migration/V1_0_0__create-tasks-table.sql
rename to lightrun/lightrun-tasks-service/src/main/resources/db/migration/V1_0_0__create-tasks-table.sql
diff --git a/lightrun/users-service/.gitignore b/lightrun/lightrun-users-service/.gitignore
similarity index 100%
rename from lightrun/users-service/.gitignore
rename to lightrun/lightrun-users-service/.gitignore
diff --git a/lightrun/users-service/README.md b/lightrun/lightrun-users-service/README.md
similarity index 100%
rename from lightrun/users-service/README.md
rename to lightrun/lightrun-users-service/README.md
diff --git a/lightrun/users-service/pom.xml b/lightrun/lightrun-users-service/pom.xml
similarity index 95%
rename from lightrun/users-service/pom.xml
rename to lightrun/lightrun-users-service/pom.xml
index 9560dcf23b..40594db725 100644
--- a/lightrun/users-service/pom.xml
+++ b/lightrun/lightrun-users-service/pom.xml
@@ -4,9 +4,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>users-service</artifactId>
+    <artifactId>lightrun-users-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>users-service</name>
+    <name>lightrun-users-service</name>
     <description>Users Service for LightRun Article</description>
 
     <parent>
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/JmsConfig.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/JmsConfig.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/JmsConfig.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/JmsConfig.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/UsersServiceApplication.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/CreateUserRequest.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/CreateUserRequest.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/CreateUserRequest.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/CreateUserRequest.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/PatchUserRequest.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/PatchUserRequest.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/PatchUserRequest.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/PatchUserRequest.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/UserResponse.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/UsersController.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/http-client.env.json b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/http-client.env.json
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/http-client.env.json
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/http-client.env.json
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/users.http b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/users.http
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/http/users.http
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/http/users.http
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/jms/JmsSender.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/jms/JmsSender.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/jms/JmsSender.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/jms/JmsSender.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UserRecord.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UserRecord.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UserRecord.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UserRecord.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UsersRepository.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UsersRepository.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UsersRepository.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/adapters/repository/UsersRepository.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UnknownUserException.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/service/UnknownUserException.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UnknownUserException.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/service/UnknownUserException.java
diff --git a/lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java b/lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java
similarity index 100%
rename from lightrun/users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java
rename to lightrun/lightrun-users-service/src/main/java/com/baeldung/usersservice/service/UsersService.java
diff --git a/lightrun/users-service/src/main/resources/application.properties b/lightrun/lightrun-users-service/src/main/resources/application.properties
similarity index 100%
rename from lightrun/users-service/src/main/resources/application.properties
rename to lightrun/lightrun-users-service/src/main/resources/application.properties
diff --git a/lightrun/users-service/src/main/resources/db/migration/V1_0_0__create-users-table.sql b/lightrun/lightrun-users-service/src/main/resources/db/migration/V1_0_0__create-users-table.sql
similarity index 100%
rename from lightrun/users-service/src/main/resources/db/migration/V1_0_0__create-users-table.sql
rename to lightrun/lightrun-users-service/src/main/resources/db/migration/V1_0_0__create-users-table.sql
diff --git a/lightrun/pom.xml b/lightrun/pom.xml
index 3fcec48cbd..78534922f6 100644
--- a/lightrun/pom.xml
+++ b/lightrun/pom.xml
@@ -18,9 +18,9 @@
     </parent>
 
     <modules>
-        <module>tasks-service</module>
-        <module>users-service</module>
-        <module>api-service</module>
+        <module>lightrun-tasks-service</module>
+        <module>lightrun-users-service</module>
+        <module>lightrun-api-service</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-aggregate-report/pom.xml
similarity index 95%
rename from maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-aggregate-report/pom.xml
index 1a076cacae..627a9f3206 100644
--- a/maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml
+++ b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-aggregate-report/pom.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.jacoco-coverage-aggregation</groupId>
-    <artifactId>aggregate-report</artifactId>
-    <name>aggregate-report</name>
+    <artifactId>jacoco-coverage-aggregate-report</artifactId>
+    <name>jacoco-coverage-aggregate-report</name>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/maven-modules/jacoco-coverage-aggregation/controllers/pom.xml b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/pom.xml
similarity index 94%
rename from maven-modules/jacoco-coverage-aggregation/controllers/pom.xml
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/pom.xml
index 5aa54f042f..886e931224 100644
--- a/maven-modules/jacoco-coverage-aggregation/controllers/pom.xml
+++ b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/pom.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.jacoco-coverage-aggregation</groupId>
-    <artifactId>controllers</artifactId>
-    <name>controllers</name>
+    <artifactId>jacoco-coverage-controllers-example</artifactId>
+    <name>jacoco-coverage-controllers-example</name>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/maven-modules/jacoco-coverage-aggregation/controllers/src/main/java/com/baeldung/coverageaggregation/MyApplication.java b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/src/main/java/com/baeldung/coverageaggregation/MyApplication.java
similarity index 100%
rename from maven-modules/jacoco-coverage-aggregation/controllers/src/main/java/com/baeldung/coverageaggregation/MyApplication.java
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/src/main/java/com/baeldung/coverageaggregation/MyApplication.java
diff --git a/maven-modules/jacoco-coverage-aggregation/controllers/src/main/java/com/baeldung/coverageaggregation/MyController.java b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/src/main/java/com/baeldung/coverageaggregation/MyController.java
similarity index 100%
rename from maven-modules/jacoco-coverage-aggregation/controllers/src/main/java/com/baeldung/coverageaggregation/MyController.java
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/src/main/java/com/baeldung/coverageaggregation/MyController.java
diff --git a/maven-modules/jacoco-coverage-aggregation/controllers/src/test/java/com/baeldung/coverageaggregation/MyControllerIntegrationTest.java b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/src/test/java/com/baeldung/coverageaggregation/MyControllerIntegrationTest.java
similarity index 100%
rename from maven-modules/jacoco-coverage-aggregation/controllers/src/test/java/com/baeldung/coverageaggregation/MyControllerIntegrationTest.java
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-controllers-example/src/test/java/com/baeldung/coverageaggregation/MyControllerIntegrationTest.java
diff --git a/maven-modules/jacoco-coverage-aggregation/services/pom.xml b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/pom.xml
similarity index 93%
rename from maven-modules/jacoco-coverage-aggregation/services/pom.xml
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/pom.xml
index 50c8c87f54..2c06694b46 100644
--- a/maven-modules/jacoco-coverage-aggregation/services/pom.xml
+++ b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/pom.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.jacoco-coverage-aggregation</groupId>
-    <artifactId>services</artifactId>
-    <name>services</name>
+    <artifactId>jacoco-coverage-services-example</artifactId>
+    <name>jacoco-coverage-services-example</name>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/maven-modules/jacoco-coverage-aggregation/services/src/main/java/com/baeldung/coverageaggregation/MyService.java b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/src/main/java/com/baeldung/coverageaggregation/MyService.java
similarity index 100%
rename from maven-modules/jacoco-coverage-aggregation/services/src/main/java/com/baeldung/coverageaggregation/MyService.java
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/src/main/java/com/baeldung/coverageaggregation/MyService.java
diff --git a/maven-modules/jacoco-coverage-aggregation/services/src/test/java/com/baeldung/coverageaggregation/MyServiceUnitTest.java b/maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/src/test/java/com/baeldung/coverageaggregation/MyServiceUnitTest.java
similarity index 100%
rename from maven-modules/jacoco-coverage-aggregation/services/src/test/java/com/baeldung/coverageaggregation/MyServiceUnitTest.java
rename to maven-modules/jacoco-coverage-aggregation/jacoco-coverage-services-example/src/test/java/com/baeldung/coverageaggregation/MyServiceUnitTest.java
diff --git a/maven-modules/jacoco-coverage-aggregation/pom.xml b/maven-modules/jacoco-coverage-aggregation/pom.xml
index d85f41968d..70243973e8 100644
--- a/maven-modules/jacoco-coverage-aggregation/pom.xml
+++ b/maven-modules/jacoco-coverage-aggregation/pom.xml
@@ -17,9 +17,9 @@
     </parent>
 
     <modules>
-        <module>services</module>
-        <module>controllers</module>
-        <module>aggregate-report</module>
+        <module>jacoco-coverage-services-example</module>
+        <module>jacoco-coverage-controllers-example</module>
+        <module>jacoco-coverage-aggregate-report</module>
     </modules>
     
     <build>
diff --git a/maven-modules/maven-parent-pom-resolution/aggregator/module1/pom.xml b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module1/pom.xml
similarity index 83%
rename from maven-modules/maven-parent-pom-resolution/aggregator/module1/pom.xml
rename to maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module1/pom.xml
index 67e60fb386..94164b472c 100644
--- a/maven-modules/maven-parent-pom-resolution/aggregator/module1/pom.xml
+++ b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module1/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>module1</artifactId>
+    <artifactId>parent-pom-module1</artifactId>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung.maven-parent-pom-resolution</groupId>
-        <artifactId>aggregator</artifactId>
+        <artifactId>maven-parent-pom-aggregator</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <!-- The parent pom is resolved to project a's pom.xml -->
     </parent>
diff --git a/maven-modules/maven-parent-pom-resolution/aggregator/module2/module3/pom.xml b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module2/parent-pom-module3/pom.xml
similarity index 86%
rename from maven-modules/maven-parent-pom-resolution/aggregator/module2/module3/pom.xml
rename to maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module2/parent-pom-module3/pom.xml
index f4e3e81e7d..533157d621 100644
--- a/maven-modules/maven-parent-pom-resolution/aggregator/module2/module3/pom.xml
+++ b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module2/parent-pom-module3/pom.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>module3</artifactId>
+    <artifactId>parent-pom-module3</artifactId>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung.maven-parent-pom-resolution</groupId>
-        <artifactId>aggregator</artifactId>
+        <artifactId>maven-parent-pom-aggregator</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <!-- removing relativePath won't work even if project-a is the aggregator project -->
         <!-- it only works in IntelliJ IDEA when project-a is registered as a Maven Project -->
diff --git a/maven-modules/maven-parent-pom-resolution/aggregator/module2/pom.xml b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module2/pom.xml
similarity index 72%
rename from maven-modules/maven-parent-pom-resolution/aggregator/module2/pom.xml
rename to maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module2/pom.xml
index 9b36ef37fb..9cb4407125 100644
--- a/maven-modules/maven-parent-pom-resolution/aggregator/module2/pom.xml
+++ b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/parent-pom-module2/pom.xml
@@ -3,19 +3,19 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>module2</artifactId>
+    <artifactId>parent-pom-module2</artifactId>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung.maven-parent-pom-resolution</groupId>
-        <artifactId>module1</artifactId>
+        <artifactId>parent-pom-module1</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../module1/pom.xml</relativePath>
+        <relativePath>../parent-pom-module1/pom.xml</relativePath>
         <!-- The parent pom is resolved to project a's pom.xml -->
     </parent>
 
     <modules>
-        <module>module3</module>
+        <module>parent-pom-module3</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/maven-modules/maven-parent-pom-resolution/aggregator/pom.xml b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/pom.xml
similarity index 78%
rename from maven-modules/maven-parent-pom-resolution/aggregator/pom.xml
rename to maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/pom.xml
index dde2c46370..8e3a922e76 100644
--- a/maven-modules/maven-parent-pom-resolution/aggregator/pom.xml
+++ b/maven-modules/maven-parent-pom-resolution/maven-parent-pom-aggregator/pom.xml
@@ -4,19 +4,18 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.maven-parent-pom-resolution</groupId>
-    <artifactId>aggregator</artifactId>
+    <artifactId>maven-parent-pom-aggregator</artifactId>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>maven-parent-pom-resolution</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <!-- The parent pom is resolved to ../pom.xml -->
     </parent>
 
     <modules>
-        <module>module1</module>
-        <module>module2</module>
+        <module>parent-pom-module1</module>
+        <module>parent-pom-module2</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/maven-modules/maven-parent-pom-resolution/pom.xml b/maven-modules/maven-parent-pom-resolution/pom.xml
index 288bf5f780..fa3ca3dc9a 100644
--- a/maven-modules/maven-parent-pom-resolution/pom.xml
+++ b/maven-modules/maven-parent-pom-resolution/pom.xml
@@ -9,7 +9,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>aggregator</module>
+        <module>maven-parent-pom-aggregator</module>
         <module>disable-plugin-examples</module>
     </modules>