diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreator.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreator.java
deleted file mode 100644
index 39308c8982..0000000000
--- a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.timebaseduuid;
-
-import com.fasterxml.uuid.Generators;
-import com.github.f4b6a3.uuid.UuidCreator;
-
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class JavaUUIDCreator {
-
-    public static void main(String[] args) throws InterruptedException {
-
-        int threadCount = 128;
-        int iterationCount = 100_000;
-        ConcurrentMap<UUID, Long> uuidMap = new ConcurrentHashMap<>();
-        AtomicLong collisionCount = new AtomicLong();
-        long startNanos = System.nanoTime();
-        CountDownLatch endLatch = new CountDownLatch(threadCount);
-
-        for (long i = 0; i < threadCount; i++) {
-            final long threadId = i;
-            new Thread(() -> {
-                for (long j = 0; j < iterationCount; j++) {
-                    UUID uuid = Generators.timeBasedGenerator().generate();
-                    Long existingUUID = uuidMap.put(uuid, (threadId * iterationCount) + j);
-                    if(existingUUID != null) {
-                        collisionCount.incrementAndGet();
-                    }
-                }
-                endLatch.countDown();
-            }).start();
-        }
-
-        endLatch.await();
-        System.out.println(threadCount * iterationCount + " UUIDs generated, " + collisionCount + " collisions in "
-                + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos) + "ms");
-    }
-}
diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreatorBenchmark.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreatorBenchmark.java
new file mode 100644
index 0000000000..20b2c127bd
--- /dev/null
+++ b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreatorBenchmark.java
@@ -0,0 +1,42 @@
+package com.baeldung.timebaseduuid;
+
+import com.fasterxml.uuid.Generators;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class JavaUUIDCreatorBenchmark {
+
+public static void main(String[] args) throws InterruptedException {
+
+    int threadCount = 128;
+    int iterationCount = 100_000;
+    Map<UUID, Long> uuidMap = new ConcurrentHashMap<>();
+    AtomicLong collisionCount = new AtomicLong();
+    long startNanos = System.nanoTime();
+    CountDownLatch endLatch = new CountDownLatch(threadCount);
+
+    for (long i = 0; i < threadCount; i++) {
+        long threadId = i;
+        new Thread(() -> {
+            for (long j = 0; j < iterationCount; j++) {
+                UUID uuid = Generators.timeBasedGenerator().generate();
+                Long existingUUID = uuidMap.put(uuid, (threadId * iterationCount) + j);
+                if(existingUUID != null) {
+                    collisionCount.incrementAndGet();
+                }
+            }
+            endLatch.countDown();
+        }).start();
+    }
+
+    endLatch.await();
+    System.out.println(threadCount * iterationCount + " UUIDs generated, " + collisionCount + " collisions in "
+            + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos) + "ms");
+}
+}
+
diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreatorExample.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreatorExample.java
new file mode 100644
index 0000000000..b59d7e236a
--- /dev/null
+++ b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/JavaUUIDCreatorExample.java
@@ -0,0 +1,13 @@
+package com.baeldung.timebaseduuid;
+
+import com.fasterxml.uuid.Generators;
+
+public class JavaUUIDCreatorExample {
+
+    public static void main(String[] args) {
+        System.out.println("UUID Version 1: " + Generators.timeBasedGenerator().generate());
+        System.out.println("UUID Version 6: " + Generators.timeBasedReorderedGenerator().generate());
+        System.out.println("UUID Version 7: " + Generators.timeBasedEpochGenerator().generate());
+
+    }
+}
diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreator.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreatorBenchmark.java
similarity index 97%
rename from core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreator.java
rename to core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreatorBenchmark.java
index 8695a54bae..04779c3590 100644
--- a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreator.java
+++ b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreatorBenchmark.java
@@ -9,7 +9,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-public class UUIDCreator {
+public class UUIDCreatorBenchmark {
 
     public static void main(String[] args) throws InterruptedException {
 
diff --git a/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreatorExample.java b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreatorExample.java
new file mode 100644
index 0000000000..fad2f55c93
--- /dev/null
+++ b/core-java-modules/core-java-uuid/src/main/java/com/baeldung/timebaseduuid/UUIDCreatorExample.java
@@ -0,0 +1,13 @@
+package com.baeldung.timebaseduuid;
+
+import com.github.f4b6a3.uuid.UuidCreator;
+
+public class UUIDCreatorExample {
+
+    public static void main(String[] args) {
+        System.out.println("UUID Version 1: " + UuidCreator.getTimeBased());
+        System.out.println("UUID Version 6: " + UuidCreator.getTimeOrdered());
+        System.out.println("UUID Version 7: " + UuidCreator.getTimeOrderedEpoch());
+    }
+}
+