diff --git a/java-security/apache-shiro/.gitignore b/java-security/apache-shiro-security/.gitignore
similarity index 100%
rename from java-security/apache-shiro/.gitignore
rename to java-security/apache-shiro-security/.gitignore
diff --git a/java-security/apache-shiro/pom.xml b/java-security/apache-shiro-security/pom.xml
similarity index 93%
rename from java-security/apache-shiro/pom.xml
rename to java-security/apache-shiro-security/pom.xml
index ad8bf67afc..14468a5d49 100644
--- a/java-security/apache-shiro/pom.xml
+++ b/java-security/apache-shiro-security/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>apache-shiro</artifactId>
-    <name>apache-shiro</name>
+    <artifactId>apache-shiro-security</artifactId>
+    <name>apache-shiro-security</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/java-security/apache-shiro/src/main/java/com/baeldung/shiro/CustomRealm.java b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/CustomRealm.java
similarity index 100%
rename from java-security/apache-shiro/src/main/java/com/baeldung/shiro/CustomRealm.java
rename to java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/CustomRealm.java
diff --git a/java-security/apache-shiro/src/main/java/com/baeldung/shiro/ShiroApplication.java b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/ShiroApplication.java
similarity index 100%
rename from java-security/apache-shiro/src/main/java/com/baeldung/shiro/ShiroApplication.java
rename to java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/ShiroApplication.java
diff --git a/java-security/apache-shiro/src/main/java/com/baeldung/shiro/controllers/ShiroController.java b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/controllers/ShiroController.java
similarity index 100%
rename from java-security/apache-shiro/src/main/java/com/baeldung/shiro/controllers/ShiroController.java
rename to java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/controllers/ShiroController.java
diff --git a/java-security/apache-shiro/src/main/java/com/baeldung/shiro/models/UserCredentials.java b/java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/models/UserCredentials.java
similarity index 100%
rename from java-security/apache-shiro/src/main/java/com/baeldung/shiro/models/UserCredentials.java
rename to java-security/apache-shiro-security/src/main/java/com/baeldung/shiro/models/UserCredentials.java
diff --git a/java-security/apache-shiro/src/main/resources/application.yml b/java-security/apache-shiro-security/src/main/resources/application.yml
similarity index 100%
rename from java-security/apache-shiro/src/main/resources/application.yml
rename to java-security/apache-shiro-security/src/main/resources/application.yml
diff --git a/java-security/apache-shiro/src/main/resources/templates/home.ftl b/java-security/apache-shiro-security/src/main/resources/templates/home.ftl
similarity index 100%
rename from java-security/apache-shiro/src/main/resources/templates/home.ftl
rename to java-security/apache-shiro-security/src/main/resources/templates/home.ftl
diff --git a/java-security/apache-shiro/src/main/resources/templates/index.ftl b/java-security/apache-shiro-security/src/main/resources/templates/index.ftl
similarity index 100%
rename from java-security/apache-shiro/src/main/resources/templates/index.ftl
rename to java-security/apache-shiro-security/src/main/resources/templates/index.ftl
diff --git a/java-security/apache-shiro/src/main/resources/templates/login.ftl b/java-security/apache-shiro-security/src/main/resources/templates/login.ftl
similarity index 100%
rename from java-security/apache-shiro/src/main/resources/templates/login.ftl
rename to java-security/apache-shiro-security/src/main/resources/templates/login.ftl
diff --git a/java-security/apache-shiro/src/test/java/com/baeldung/shiro/SpringContextTest.java b/java-security/apache-shiro-security/src/test/java/com/baeldung/shiro/SpringContextTest.java
similarity index 100%
rename from java-security/apache-shiro/src/test/java/com/baeldung/shiro/SpringContextTest.java
rename to java-security/apache-shiro-security/src/test/java/com/baeldung/shiro/SpringContextTest.java
diff --git a/java-security/pom.xml b/java-security/pom.xml
index f6e0df3990..b09fdf4b4a 100644
--- a/java-security/pom.xml
+++ b/java-security/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <modules>
-        <module>apache-shiro</module>
+        <module>apache-shiro-security</module>
         <module>spring-security</module>
     </modules>