diff --git a/core-java-modules/java-collections-maps-3/README.md b/core-java-modules/core-java-collections-maps-5/README.md
similarity index 100%
rename from core-java-modules/java-collections-maps-3/README.md
rename to core-java-modules/core-java-collections-maps-5/README.md
diff --git a/core-java-modules/java-collections-maps-3/pom.xml b/core-java-modules/core-java-collections-maps-5/pom.xml
similarity index 93%
rename from core-java-modules/java-collections-maps-3/pom.xml
rename to core-java-modules/core-java-collections-maps-5/pom.xml
index ab80a9e2fd..ba7083e42e 100644
--- a/core-java-modules/java-collections-maps-3/pom.xml
+++ b/core-java-modules/core-java-collections-maps-5/pom.xml
@@ -3,9 +3,9 @@
     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>java-collections-maps-3</artifactId>
+    <artifactId>core-java-collections-maps-5</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>java-collections-maps-3</name>
+    <name>core-java-collections-maps-5</name>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/bytearrays/BytesKey.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/bytearrays/BytesKey.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/bytearrays/BytesKey.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/bytearrays/BytesKey.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/Book.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/Book.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/Book.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/Book.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryEfficiencyExample.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/entry/MapEntryTupleExample.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/Member.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/Member.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/Member.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/Member.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithBadHashing.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithGuavaHashing.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithId.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithId.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithId.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithId.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithIdAndName.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/hashing/MemberWithObjects.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java
diff --git a/core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java
rename to core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/invert/InvertHashMapExample.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/bytearrays/ByteArrayKeyUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/caseinsensitivekeys/CaseInsensitiveMapUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/entry/MapEntryUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashMapUpdateUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/hashing/HashingUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/invert/InvertHashMapUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java
diff --git a/core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java
similarity index 100%
rename from core-java-modules/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java
rename to core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java