diff --git a/pom.xml b/pom.xml
index 1326fdffa..7e590a318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
     <module>page-object</module>
     <module>event-based-asynchronous</module>
     <module>event-queue</module>
-    <module>queue-load-leveling</module>
+    <module>queue-based-load-leveling</module>
     <module>object-mother</module>
     <module>data-bus</module>
     <module>converter</module>
diff --git a/queue-load-leveling/README.md b/queue-based-load-leveling/README.md
similarity index 99%
rename from queue-load-leveling/README.md
rename to queue-based-load-leveling/README.md
index e5091d971..cc94cb4fa 100644
--- a/queue-load-leveling/README.md
+++ b/queue-based-load-leveling/README.md
@@ -48,7 +48,9 @@ First, let's look at the `MessageQueue` and `Message` classes. The `MessageQueue
 public class Message {
   // Message details
 }
+```
 
+```java
 public class MessageQueue {
   private Queue<Message> queue;
 
@@ -72,6 +74,7 @@ Next, we have the `TaskGenerator` class. This class represents the task producer
 
 ```java
 public class TaskGenerator implements Runnable {
+    
   private MessageQueue msgQueue;
   private int taskCount;
 
@@ -94,6 +97,7 @@ The `ServiceExecutor` class represents the task consumer. It retrieves tasks fro
 
 ```java
 public class ServiceExecutor implements Runnable {
+    
   private MessageQueue msgQueue;
 
   public ServiceExecutor(MessageQueue msgQueue) {
diff --git a/queue-load-leveling/etc/queue-load-leveling.gif b/queue-based-load-leveling/etc/queue-load-leveling.gif
similarity index 100%
rename from queue-load-leveling/etc/queue-load-leveling.gif
rename to queue-based-load-leveling/etc/queue-load-leveling.gif
diff --git a/queue-load-leveling/etc/queue-load-leveling.ucls b/queue-based-load-leveling/etc/queue-load-leveling.ucls
similarity index 100%
rename from queue-load-leveling/etc/queue-load-leveling.ucls
rename to queue-based-load-leveling/etc/queue-load-leveling.ucls
diff --git a/queue-load-leveling/etc/queue-load-leveling.urm.puml b/queue-based-load-leveling/etc/queue-load-leveling.urm.puml
similarity index 100%
rename from queue-load-leveling/etc/queue-load-leveling.urm.puml
rename to queue-based-load-leveling/etc/queue-load-leveling.urm.puml
diff --git a/queue-load-leveling/pom.xml b/queue-based-load-leveling/pom.xml
similarity index 97%
rename from queue-load-leveling/pom.xml
rename to queue-based-load-leveling/pom.xml
index dd376f308..c789c6a39 100644
--- a/queue-load-leveling/pom.xml
+++ b/queue-based-load-leveling/pom.xml
@@ -32,7 +32,7 @@
     <artifactId>java-design-patterns</artifactId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
-  <artifactId>queue-load-leveling</artifactId>
+  <artifactId>queue-based-load-leveling</artifactId>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/App.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/App.java
similarity index 100%
rename from queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/App.java
rename to queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/App.java
diff --git a/queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Message.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Message.java
similarity index 100%
rename from queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Message.java
rename to queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Message.java
diff --git a/queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/MessageQueue.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/MessageQueue.java
similarity index 100%
rename from queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/MessageQueue.java
rename to queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/MessageQueue.java
diff --git a/queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java
similarity index 100%
rename from queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java
rename to queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/ServiceExecutor.java
diff --git a/queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Task.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Task.java
similarity index 100%
rename from queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Task.java
rename to queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/Task.java
diff --git a/queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/TaskGenerator.java b/queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/TaskGenerator.java
similarity index 100%
rename from queue-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/TaskGenerator.java
rename to queue-based-load-leveling/src/main/java/com/iluwatar/queue/load/leveling/TaskGenerator.java
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java b/queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java
similarity index 100%
rename from queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java
rename to queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/AppTest.java
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java b/queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java
similarity index 100%
rename from queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java
rename to queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageQueueTest.java
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java b/queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java
similarity index 100%
rename from queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java
rename to queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/MessageTest.java
diff --git a/queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java b/queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java
similarity index 100%
rename from queue-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java
rename to queue-based-load-leveling/src/test/java/com/iluwatar/queue/load/leveling/TaskGenSrvExeTest.java