diff --git a/core-java-modules/java-numbers-2/README.md b/core-java-modules/core-java-numbers-2/README.md
similarity index 100%
rename from core-java-modules/java-numbers-2/README.md
rename to core-java-modules/core-java-numbers-2/README.md
diff --git a/core-java-modules/java-numbers-2/pom.xml b/core-java-modules/core-java-numbers-2/pom.xml
similarity index 89%
rename from core-java-modules/java-numbers-2/pom.xml
rename to core-java-modules/core-java-numbers-2/pom.xml
index b41348e375..ac3843607e 100644
--- a/core-java-modules/java-numbers-2/pom.xml
+++ b/core-java-modules/core-java-numbers-2/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-numbers-2</artifactId>
+    <artifactId>core-java-numbers-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>java-numbers-2</name>
+    <name>core-java-numbers-2</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -28,7 +28,7 @@
     </dependencies>
 
     <build>
-        <finalName>java-numbers-2</finalName>
+        <finalName>core-java-numbers-2</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BigIntegerPrimeChecker.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/BruteForcePrimeChecker.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/OptimisedPrimeChecker.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimeChecker.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/algorithms/primechecker/PrimesPrimeChecker.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/Circle.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/area/circle/CircleArea.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/BigIntegerLCM.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/EuclideanAlgorithm.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/PrimeFactorizationAlgorithm.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/lcm/SimpleAlgorithm.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/nan/NaNExample.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/pow/PowerExample.java
diff --git a/core-java-modules/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java b/core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java
rename to core-java-modules/core-java-numbers-2/src/main/java/com/baeldung/prime/PrimeGenerator.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/java/math/MathUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/BigIntegerLCMUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/EuclideanAlgorithmUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/PrimeFactorizationAlgorithmUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lcm/SimpleAlgorithmUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java
diff --git a/core-java-modules/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java b/core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java
rename to core-java-modules/core-java-numbers-2/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java