diff --git a/core-java-modules/java-numbers/.gitignore b/core-java-modules/core-java-numbers/.gitignore
similarity index 100%
rename from core-java-modules/java-numbers/.gitignore
rename to core-java-modules/core-java-numbers/.gitignore
diff --git a/core-java-modules/java-numbers/README.md b/core-java-modules/core-java-numbers/README.md
similarity index 100%
rename from core-java-modules/java-numbers/README.md
rename to core-java-modules/core-java-numbers/README.md
diff --git a/core-java-modules/java-numbers/pom.xml b/core-java-modules/core-java-numbers/pom.xml
similarity index 91%
rename from core-java-modules/java-numbers/pom.xml
rename to core-java-modules/core-java-numbers/pom.xml
index 9bd0f33a85..4b2cae8ee9 100644
--- a/core-java-modules/java-numbers/pom.xml
+++ b/core-java-modules/core-java-numbers/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</artifactId>
+    <artifactId>core-java-numbers</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>java-numbers</name>
+    <name>core-java-numbers</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -33,7 +33,7 @@
     </dependencies>
 
     <build>
-        <finalName>java-numbers</finalName>
+        <finalName>core-java-numbers</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/BigDecimalDemo.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/FloatingPointArithmetic.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/maths/Round.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/Round.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/maths/Round.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/maths/Round.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/calculator/NthRootCalculator.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/nth/root/main/Main.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/Benchmarking.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigits.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/DifferentPairs.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/ExistingPairs.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/pairsaddupnumber/FindPairs.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java
diff --git a/core-java-modules/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java b/core-java-modules/core-java-numbers/src/main/java/com/baeldung/string/DoubleToString.java
similarity index 100%
rename from core-java-modules/java-numbers/src/main/java/com/baeldung/string/DoubleToString.java
rename to core-java-modules/core-java-numbers/src/main/java/com/baeldung/string/DoubleToString.java
diff --git a/core-java-modules/java-numbers/src/main/resources/log4j.properties b/core-java-modules/core-java-numbers/src/main/resources/log4j.properties
similarity index 100%
rename from core-java-modules/java-numbers/src/main/resources/log4j.properties
rename to core-java-modules/core-java-numbers/src/main/resources/log4j.properties
diff --git a/core-java-modules/java-numbers/src/main/resources/logback.xml b/core-java-modules/core-java-numbers/src/main/resources/logback.xml
similarity index 100%
rename from core-java-modules/java-numbers/src/main/resources/logback.xml
rename to core-java-modules/core-java-numbers/src/main/resources/logback.xml
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/decimalformat/DecimalFormatExamplesUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalDemoUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigDecimalImplUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerDemoUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/BigIntegerImplUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/FloatingPointArithmeticUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/MathSinUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/maths/RoundUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/nth/root/calculator/NthRootCalculatorUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/numberofdigits/NumberOfDigitsIntegrationTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/DifferentPairsUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/pairsaddupnumber/ExistingPairsUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/random/JavaRandomUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsManualTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/removingdecimals/RemovingDecimalsUnitTest.java
diff --git a/core-java-modules/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java b/core-java-modules/core-java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java
similarity index 100%
rename from core-java-modules/java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java
rename to core-java-modules/core-java-numbers/src/test/java/com/baeldung/string/DoubleToStringUnitTest.java