diff --git a/core-java/src/test/java/com/baeldung/datetime/UseLocalDateTimeTest.java b/core-java/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java
similarity index 93%
rename from core-java/src/test/java/com/baeldung/datetime/UseLocalDateTimeTest.java
rename to core-java/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java
index 69a289fd02..906d641632 100644
--- a/core-java/src/test/java/com/baeldung/datetime/UseLocalDateTimeTest.java
+++ b/core-java/src/test/java/com/baeldung/datetime/UseLocalDateTimeUnitTest.java
@@ -7,7 +7,7 @@ import java.time.Month;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class UseLocalDateTimeTest {
+public class UseLocalDateTimeUnitTest {
     
     UseLocalDateTime useLocalDateTime = new UseLocalDateTime();
     
diff --git a/core-java/src/test/java/com/baeldung/datetime/UseLocalDateTest.java b/core-java/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/datetime/UseLocalDateTest.java
rename to core-java/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java
index 0537832586..dcfca792af 100644
--- a/core-java/src/test/java/com/baeldung/datetime/UseLocalDateTest.java
+++ b/core-java/src/test/java/com/baeldung/datetime/UseLocalDateUnitTest.java
@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class UseLocalDateTest {
+public class UseLocalDateUnitTest {
     
     UseLocalDate useLocalDate = new UseLocalDate();
     
diff --git a/core-java/src/test/java/com/baeldung/datetime/UseLocalTimeTest.java b/core-java/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/datetime/UseLocalTimeTest.java
rename to core-java/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java
index 7776fad363..520b79d4bf 100644
--- a/core-java/src/test/java/com/baeldung/datetime/UseLocalTimeTest.java
+++ b/core-java/src/test/java/com/baeldung/datetime/UseLocalTimeUnitTest.java
@@ -5,7 +5,7 @@ import java.time.LocalTime;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class UseLocalTimeTest {
+public class UseLocalTimeUnitTest {
     
     UseLocalTime useLocalTime = new UseLocalTime();
     
diff --git a/core-java/src/test/java/com/baeldung/datetime/UsePeriodTest.java b/core-java/src/test/java/com/baeldung/datetime/UsePeriodUnitTest.java
similarity index 95%
rename from core-java/src/test/java/com/baeldung/datetime/UsePeriodTest.java
rename to core-java/src/test/java/com/baeldung/datetime/UsePeriodUnitTest.java
index 5237270096..a060d974ed 100644
--- a/core-java/src/test/java/com/baeldung/datetime/UsePeriodTest.java
+++ b/core-java/src/test/java/com/baeldung/datetime/UsePeriodUnitTest.java
@@ -6,7 +6,7 @@ import java.time.Period;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class UsePeriodTest {
+public class UsePeriodUnitTest {
     UsePeriod usingPeriod=new UsePeriod();
     
     @Test
diff --git a/core-java/src/test/java/com/baeldung/datetime/UseZonedDateTimeTest.java b/core-java/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
similarity index 93%
rename from core-java/src/test/java/com/baeldung/datetime/UseZonedDateTimeTest.java
rename to core-java/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
index 5af01ad678..d5652430fe 100644
--- a/core-java/src/test/java/com/baeldung/datetime/UseZonedDateTimeTest.java
+++ b/core-java/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
@@ -7,7 +7,7 @@ import java.time.ZonedDateTime;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class UseZonedDateTimeTest {
+public class UseZonedDateTimeUnitTest {
     
     UseZonedDateTime zonedDateTime=new UseZonedDateTime();
     
diff --git a/core-java/src/test/java/com/baeldung/doublecolon/TestComputerUtils.java b/core-java/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/doublecolon/TestComputerUtils.java
rename to core-java/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
index 85194f5aa6..f69e4b03ee 100644
--- a/core-java/src/test/java/com/baeldung/doublecolon/TestComputerUtils.java
+++ b/core-java/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
@@ -13,7 +13,7 @@ import java.util.function.BiFunction;
 
 import static com.baeldung.doublecolon.ComputerUtils.*;
 
-public class TestComputerUtils {
+public class ComputerUtilsUnitTest {
 
     @Before
     public void setup() {
diff --git a/core-java/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderTest.java b/core-java/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderTest.java
rename to core-java/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java
index 7f32a561e7..0e3ec29dfd 100644
--- a/core-java/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderTest.java
+++ b/core-java/src/test/java/com/baeldung/encoderdecoder/EncoderDecoderUnitTest.java
@@ -17,9 +17,9 @@ import java.util.Map;
 
 import static java.util.stream.Collectors.joining;
 
-public class EncoderDecoderTest {
+public class EncoderDecoderUnitTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EncoderDecoderTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EncoderDecoderUnitTest.class);
     private static final String testUrl = "http://www.baeldung.com?key1=value+1&key2=value%40%21%242&key3=value%253";
 
     private String encodeValue(String value) {
diff --git a/core-java/src/test/java/com/baeldung/enums/PizzaTest.java b/core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/enums/PizzaTest.java
rename to core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java
index deeebaa240..de60becfce 100644
--- a/core-java/src/test/java/com/baeldung/enums/PizzaTest.java
+++ b/core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 import static junit.framework.TestCase.assertTrue;
 
-public class PizzaTest {
+public class PizzaUnitTest {
 
     @Test
     public void givenPizaOrder_whenReady_thenDeliverable() {
diff --git a/core-java/src/test/java/com/baeldung/java/networking/udp/UDPTest.java b/core-java/src/test/java/com/baeldung/java/networking/udp/UDPIntegrationTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/java/networking/udp/UDPTest.java
rename to core-java/src/test/java/com/baeldung/java/networking/udp/UDPIntegrationTest.java
index cf35c07ab3..2ca2d3a0c8 100644
--- a/core-java/src/test/java/com/baeldung/java/networking/udp/UDPTest.java
+++ b/core-java/src/test/java/com/baeldung/java/networking/udp/UDPIntegrationTest.java
@@ -10,7 +10,7 @@ import java.io.IOException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class UDPTest {
+public class UDPIntegrationTest {
     private EchoClient client;
 
     @Before
diff --git a/core-java/src/test/java/com/baeldung/java/networking/url/UrlTest.java b/core-java/src/test/java/com/baeldung/java/networking/url/UrlUnitTest.java
similarity index 99%
rename from core-java/src/test/java/com/baeldung/java/networking/url/UrlTest.java
rename to core-java/src/test/java/com/baeldung/java/networking/url/UrlUnitTest.java
index 053440d655..505d9595ab 100644
--- a/core-java/src/test/java/com/baeldung/java/networking/url/UrlTest.java
+++ b/core-java/src/test/java/com/baeldung/java/networking/url/UrlUnitTest.java
@@ -7,7 +7,7 @@ import java.net.URL;
 
 import org.junit.Test;
 
-public class UrlTest {
+public class UrlUnitTest {
 
     @Test
     public void givenUrl_whenCanIdentifyProtocol_thenCorrect() throws MalformedURLException {