diff --git a/message-channel/.gitignore b/eip-message-channel/.gitignore
similarity index 100%
rename from message-channel/.gitignore
rename to eip-message-channel/.gitignore
diff --git a/message-channel/README.md b/eip-message-channel/README.md
similarity index 84%
rename from message-channel/README.md
rename to eip-message-channel/README.md
index 09361dd4a..606619619 100644
--- a/message-channel/README.md
+++ b/eip-message-channel/README.md
@@ -1,8 +1,8 @@
 ---
 layout: pattern
-title: Message Channel
-folder: message-channel
-permalink: /patterns/message-channel/
+title: EIP Message Channel
+folder: eip-message-channel
+permalink: /patterns/eip-message-channel/
 categories: Integration
 tags:
  - Java
diff --git a/message-channel/etc/message-channel.png b/eip-message-channel/etc/message-channel.png
similarity index 100%
rename from message-channel/etc/message-channel.png
rename to eip-message-channel/etc/message-channel.png
diff --git a/message-channel/etc/message-channel.ucls b/eip-message-channel/etc/message-channel.ucls
similarity index 100%
rename from message-channel/etc/message-channel.ucls
rename to eip-message-channel/etc/message-channel.ucls
diff --git a/message-channel/pom.xml b/eip-message-channel/pom.xml
similarity index 97%
rename from message-channel/pom.xml
rename to eip-message-channel/pom.xml
index 28568e6c6..84cde7e2e 100644
--- a/message-channel/pom.xml
+++ b/eip-message-channel/pom.xml
@@ -32,7 +32,7 @@
 		<artifactId>java-design-patterns</artifactId>
 		<version>1.20.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>message-channel</artifactId>
+	<artifactId>eip-message-channel</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
diff --git a/message-channel/src/main/java/com/iluwatar/message/channel/App.java b/eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/App.java
similarity index 98%
rename from message-channel/src/main/java/com/iluwatar/message/channel/App.java
rename to eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/App.java
index d2974e20b..d5929d0db 100644
--- a/message-channel/src/main/java/com/iluwatar/message/channel/App.java
+++ b/eip-message-channel/src/main/java/com/iluwatar/eip/message/channel/App.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.message.channel;
+package com.iluwatar.eip.message.channel;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java b/eip-message-channel/src/test/java/com/iluwatar/eip/message/channel/AppTest.java
similarity index 96%
rename from publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
rename to eip-message-channel/src/test/java/com/iluwatar/eip/message/channel/AppTest.java
index 128385faf..127f427b8 100644
--- a/publish-subscribe/src/test/java/com/iluwatar/publish/subscribe/AppTest.java
+++ b/eip-message-channel/src/test/java/com/iluwatar/eip/message/channel/AppTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.publish.subscribe;
+package com.iluwatar.eip.message.channel;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/publish-subscribe/.gitignore b/eip-publish-subscribe/.gitignore
similarity index 100%
rename from publish-subscribe/.gitignore
rename to eip-publish-subscribe/.gitignore
diff --git a/publish-subscribe/README.md b/eip-publish-subscribe/README.md
similarity index 83%
rename from publish-subscribe/README.md
rename to eip-publish-subscribe/README.md
index 462209074..90ac02c9b 100644
--- a/publish-subscribe/README.md
+++ b/eip-publish-subscribe/README.md
@@ -1,8 +1,8 @@
 ---
 layout: pattern
-title: Publish Subscribe
-folder: publish-subscribe
-permalink: /patterns/publish-subscribe/
+title: EIP Publish Subscribe
+folder: eip-publish-subscribe
+permalink: /patterns/eip-publish-subscribe/
 categories: Integration
 tags:
  - Java
diff --git a/publish-subscribe/etc/publish-subscribe.png b/eip-publish-subscribe/etc/publish-subscribe.png
similarity index 100%
rename from publish-subscribe/etc/publish-subscribe.png
rename to eip-publish-subscribe/etc/publish-subscribe.png
diff --git a/publish-subscribe/etc/publish-subscribe.ucls b/eip-publish-subscribe/etc/publish-subscribe.ucls
similarity index 100%
rename from publish-subscribe/etc/publish-subscribe.ucls
rename to eip-publish-subscribe/etc/publish-subscribe.ucls
diff --git a/publish-subscribe/pom.xml b/eip-publish-subscribe/pom.xml
similarity index 97%
rename from publish-subscribe/pom.xml
rename to eip-publish-subscribe/pom.xml
index 6edc98dbf..82763b22b 100644
--- a/publish-subscribe/pom.xml
+++ b/eip-publish-subscribe/pom.xml
@@ -30,7 +30,7 @@
 		<artifactId>java-design-patterns</artifactId>
 		<version>1.20.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>publish-subscribe</artifactId>
+	<artifactId>eip-publish-subscribe</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
@@ -51,4 +51,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/App.java b/eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/App.java
similarity index 98%
rename from publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/App.java
rename to eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/App.java
index d642846fb..7c7e77a18 100644
--- a/publish-subscribe/src/main/java/com/iluwatar/publish/subscribe/App.java
+++ b/eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe/App.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.publish.subscribe;
+package com.iluwatar.eip.publish.subscribe;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/publish-subscribe/src/main/resources/logback.xml b/eip-publish-subscribe/src/main/resources/logback.xml
similarity index 100%
rename from publish-subscribe/src/main/resources/logback.xml
rename to eip-publish-subscribe/src/main/resources/logback.xml
diff --git a/message-channel/src/test/java/com/iluwatar/message/channel/AppTest.java b/eip-publish-subscribe/src/test/java/com/iluwatar/eip/publish/subscribe/AppTest.java
similarity index 96%
rename from message-channel/src/test/java/com/iluwatar/message/channel/AppTest.java
rename to eip-publish-subscribe/src/test/java/com/iluwatar/eip/publish/subscribe/AppTest.java
index 97094b864..783c796ac 100644
--- a/message-channel/src/test/java/com/iluwatar/message/channel/AppTest.java
+++ b/eip-publish-subscribe/src/test/java/com/iluwatar/eip/publish/subscribe/AppTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.message.channel;
+package com.iluwatar.eip.publish.subscribe;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/pom.xml b/pom.xml
index 7f1ff2208..965c8f37c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,11 +117,11 @@
         <module>business-delegate</module>
         <module>half-sync-half-async</module>
         <module>layers</module>
-        <module>message-channel</module>
+        <module>eip-message-channel</module>
         <module>fluentinterface</module>
         <module>reactor</module>
         <module>caching</module>
-        <module>publish-subscribe</module>
+        <module>eip-publish-subscribe</module>
         <module>delegation</module>
         <module>event-driven-architecture</module>
         <module>api-gateway</module>
@@ -475,4 +475,4 @@
         </plugins>
     </reporting>
 
-</project>
\ No newline at end of file
+</project>