diff --git a/core-java-modules/core-java-datetime-java8-2/README.md b/core-java-modules/core-java-datetime-java8-2/README.md
index e53d0236c2..f16563aacc 100644
--- a/core-java-modules/core-java-datetime-java8-2/README.md
+++ b/core-java-modules/core-java-datetime-java8-2/README.md
@@ -1,3 +1,5 @@
 ### Relevant Articles:
 
+- [Generating Random Dates in Java](https://www.baeldung.com/java-random-dates)
 - [Creating a LocalDate with Values in Java](https://www.baeldung.com/java-creating-localdate-with-values)
+- [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)
\ No newline at end of file
diff --git a/core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/LegacyRandomDateTimes.java b/core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/LegacyRandomDateTimes.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/LegacyRandomDateTimes.java
rename to core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/LegacyRandomDateTimes.java
diff --git a/core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/RandomDateTimes.java b/core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/RandomDateTimes.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/RandomDateTimes.java
rename to core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/RandomDateTimes.java
diff --git a/core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/RandomDates.java b/core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/RandomDates.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/RandomDates.java
rename to core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/RandomDates.java
diff --git a/core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/RandomTimes.java b/core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/RandomTimes.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/random/RandomTimes.java
rename to core-java-modules/core-java-datetime-java8-2/src/main/java/com/baeldung/random/RandomTimes.java
diff --git a/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/localdate/LocalDateExampleUnitTest.java b/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/localdate/LocalDateExampleUnitTest.java
index dff15486a4..d65118ba3a 100644
--- a/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/localdate/LocalDateExampleUnitTest.java
+++ b/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/localdate/LocalDateExampleUnitTest.java
@@ -11,31 +11,31 @@ public class LocalDateExampleUnitTest {
 
     @Test
     public void givenValues_whenUsingOfMethod_thenLocalDate() {
-        assertEquals("2020-01-08", date.getCustomDateOne(2020, 1, 8));
+        assertEquals("2020-01-08", date.getCustomDateOne(2020, 1, 8).toString());
     }
 
     @Test
     public void givenValuesWithMonthEnum_whenUsingOfMethod_thenLocalDate() {
-        assertEquals("2020-01-08", date.getCustomDateTwo(2020, Month.JANUARY, 8));
+        assertEquals("2020-01-08", date.getCustomDateTwo(2020, Month.JANUARY, 8).toString());
     }
 
     @Test
     public void givenValues_whenUsingEpochDay_thenLocalDate() {
-        assertEquals("2020-01-08", date.getDateFromEpochDay(18269));
+        assertEquals("2020-01-08", date.getDateFromEpochDay(18269).toString());
     }
 
     @Test
     public void givenValues_whenUsingYearDay_thenLocalDate() {
-        assertEquals("2020-01-08", date.getDateFromYearAndDayOfYear(2020, 8));
+        assertEquals("2020-01-08", date.getDateFromYearAndDayOfYear(2020, 8).toString());
     }
 
     @Test
     public void givenValues_whenUsingParse_thenLocalDate() {
-        assertEquals("2020-01-08", date.getDateFromString("2020-01-08"));
+        assertEquals("2020-01-08", date.getDateFromString("2020-01-08").toString());
     }
 
     @Test
     public void givenValuesWithFormatter_whenUsingParse_thenLocalDate() {
-        assertEquals("2020-01-08", date.getDateFromStringAndFormatter("8-Jan-2020", "d-MMM-yyyy"));
+        assertEquals("2020-01-08", date.getDateFromStringAndFormatter("8-Jan-2020", "d-MMM-yyyy").toString());
     }
 }
diff --git a/core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/LegacyRandomDateTimesUnitTest.java b/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/LegacyRandomDateTimesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/LegacyRandomDateTimesUnitTest.java
rename to core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/LegacyRandomDateTimesUnitTest.java
diff --git a/core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/RandomDateTimesUnitTest.java b/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/RandomDateTimesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/RandomDateTimesUnitTest.java
rename to core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/RandomDateTimesUnitTest.java
diff --git a/core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/RandomDatesUnitTest.java b/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/RandomDatesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/RandomDatesUnitTest.java
rename to core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/RandomDatesUnitTest.java
diff --git a/core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/RandomTimesUnitTest.java b/core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/RandomTimesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/random/RandomTimesUnitTest.java
rename to core-java-modules/core-java-datetime-java8-2/src/test/java/com/baeldung/random/RandomTimesUnitTest.java
diff --git a/core-java-modules/core-java-datetime-java8/README.md b/core-java-modules/core-java-datetime-java8/README.md
index dfbe9c997f..c35683a589 100644
--- a/core-java-modules/core-java-datetime-java8/README.md
+++ b/core-java-modules/core-java-datetime-java8/README.md
@@ -13,4 +13,4 @@ This module contains articles about the Date and Time API introduced with Java 8
 - [How to Get the Start and the End of a Day using Java](http://www.baeldung.com/java-day-start-end)
 - [Set the Time Zone of a Date in Java](https://www.baeldung.com/java-set-date-time-zone)
 - [Comparing Dates in Java](https://www.baeldung.com/java-comparing-dates)
-- [Generating Random Dates in Java](https://www.baeldung.com/java-random-dates)
+- [[Next -->]](/core-java-modules/core-java-datetime-java8-2)