diff --git a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LanguageDetectorAndTrainingDataTest.java b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LanguageDetectorAndTrainingDataUnitTest.java
similarity index 97%
rename from apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LanguageDetectorAndTrainingDataTest.java
rename to apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LanguageDetectorAndTrainingDataUnitTest.java
index 5eb649dae1..82732809a5 100644
--- a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LanguageDetectorAndTrainingDataTest.java
+++ b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LanguageDetectorAndTrainingDataUnitTest.java
@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import org.junit.Test;
 
-public class LanguageDetectorAndTrainingDataTest {
+public class LanguageDetectorAndTrainingDataUnitTest {
 
     @Test
     public void givenLanguageDictionary_whenLanguageDetect_thenLanguageIsDetected() throws FileNotFoundException, IOException {
diff --git a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LemmetizerTest.java b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LemmetizerUnitTest.java
similarity index 97%
rename from apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LemmetizerTest.java
rename to apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LemmetizerUnitTest.java
index bb681fb8d8..05bc6242b2 100644
--- a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LemmetizerTest.java
+++ b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/LemmetizerUnitTest.java
@@ -8,7 +8,7 @@ import opennlp.tools.tokenize.SimpleTokenizer;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
-public class LemmetizerTest {
+public class LemmetizerUnitTest {
 
     @Test
     public void givenEnglishDictionary_whenLemmatize_thenLemmasAreDetected() throws Exception {
diff --git a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/NamedEntityRecognitionTest.java b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/NamedEntityRecognitionUnitTest.java
similarity index 97%
rename from apache-opennlp/src/test/java/com/baeldung/apache/opennlp/NamedEntityRecognitionTest.java
rename to apache-opennlp/src/test/java/com/baeldung/apache/opennlp/NamedEntityRecognitionUnitTest.java
index 94224409d6..6965498e12 100644
--- a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/NamedEntityRecognitionTest.java
+++ b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/NamedEntityRecognitionUnitTest.java
@@ -11,7 +11,7 @@ import opennlp.tools.util.Span;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
-public class NamedEntityRecognitionTest {
+public class NamedEntityRecognitionUnitTest {
 
     @Test
     public void givenEnglishPersonModel_whenNER_thenPersonsAreDetected() throws Exception {
diff --git a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/POSTaggerTest.java b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/POSTaggerUnitTest.java
similarity index 96%
rename from apache-opennlp/src/test/java/com/baeldung/apache/opennlp/POSTaggerTest.java
rename to apache-opennlp/src/test/java/com/baeldung/apache/opennlp/POSTaggerUnitTest.java
index 1bfebe208c..c084dcc1f2 100644
--- a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/POSTaggerTest.java
+++ b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/POSTaggerUnitTest.java
@@ -7,7 +7,7 @@ import opennlp.tools.tokenize.SimpleTokenizer;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
-public class POSTaggerTest {
+public class POSTaggerUnitTest {
 
     @Test
     public void givenPOSModel_whenPOSTagging_thenPOSAreDetected() throws Exception {
diff --git a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/SentenceDetectionTest.java b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/SentenceDetectionUnitTest.java
similarity index 96%
rename from apache-opennlp/src/test/java/com/baeldung/apache/opennlp/SentenceDetectionTest.java
rename to apache-opennlp/src/test/java/com/baeldung/apache/opennlp/SentenceDetectionUnitTest.java
index 0250b12cbf..60ee51e7ca 100644
--- a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/SentenceDetectionTest.java
+++ b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/SentenceDetectionUnitTest.java
@@ -6,7 +6,7 @@ import opennlp.tools.sentdetect.SentenceModel;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
-public class SentenceDetectionTest {
+public class SentenceDetectionUnitTest {
 
     @Test
     public void givenEnglishModel_whenDetect_thenSentencesAreDetected() throws Exception {
diff --git a/bootique/src/test/java/com/baeldung/bootique/AppTest.java b/bootique/src/test/java/com/baeldung/bootique/AppUnitTest.java
similarity index 96%
rename from bootique/src/test/java/com/baeldung/bootique/AppTest.java
rename to bootique/src/test/java/com/baeldung/bootique/AppUnitTest.java
index 8856780ed4..2a113cd1ee 100644
--- a/bootique/src/test/java/com/baeldung/bootique/AppTest.java
+++ b/bootique/src/test/java/com/baeldung/bootique/AppUnitTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class AppTest {
+public class AppUnitTest {
 
     @Rule
     public BQTestFactory bqTestFactory = new BQTestFactory();
diff --git a/core-java-8/src/test/java/com/baeldung/counter/CounterTest.java b/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
similarity index 94%
rename from core-java-8/src/test/java/com/baeldung/counter/CounterTest.java
rename to core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
index 657b510452..ef57fc2c6e 100644
--- a/core-java-8/src/test/java/com/baeldung/counter/CounterTest.java
+++ b/core-java-8/src/test/java/com/baeldung/counter/CounterUnitTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import com.baeldung.counter.CounterUtil.MutableInteger;
 
-public class CounterTest {
+public class CounterUnitTest {
 
     @Test
     public void whenMapWithWrapperAsCounter_runsSuccessfully() {
diff --git a/core-java-8/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListTest.java b/core-java-8/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java
similarity index 99%
rename from core-java-8/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListTest.java
rename to core-java-8/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java
index 45ee6eda33..3c96cf1392 100644
--- a/core-java-8/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListTest.java
+++ b/core-java-8/src/test/java/com/baeldung/findanelement/FindACustomerInGivenListUnitTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-public class FindACustomerInGivenListTest {
+public class FindACustomerInGivenListUnitTest {
 
     private static List<Customer> customers = new ArrayList<>();
 
diff --git a/core-java-8/src/test/java/com/baeldung/iterators/IteratorsTest.java b/core-java-8/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java
similarity index 96%
rename from core-java-8/src/test/java/com/baeldung/iterators/IteratorsTest.java
rename to core-java-8/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java
index 73793da7ae..36e1f4a83c 100644
--- a/core-java-8/src/test/java/com/baeldung/iterators/IteratorsTest.java
+++ b/core-java-8/src/test/java/com/baeldung/iterators/IteratorsUnitTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
  * @author Santosh Thakur
  */
 
-public class IteratorsTest {
+public class IteratorsUnitTest {
 
     @Test
     public void whenFailFast_ThenThrowsException() {
diff --git a/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetTest.java b/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java
similarity index 95%
rename from core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetTest.java
rename to core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java
index 2519a77f1f..c8a631d9f0 100644
--- a/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetTest.java
+++ b/core-java-8/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java
@@ -8,11 +8,11 @@ import static org.junit.Assert.*;
 
 import com.baeldung.optional.OrElseAndOrElseGet;
 
-public class OrElseAndOrElseGetTest {
+public class OrElseAndOrElseGetUnitTest {
 
     private OrElseAndOrElseGet orElsevsOrElseGet = new OrElseAndOrElseGet();
 
-    private static final Logger LOG = LoggerFactory.getLogger(OrElseAndOrElseGetTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OrElseAndOrElseGetUnitTest.class);
 
     @Test
     public void givenNonEmptyOptional_whenOrElseUsed_thenGivenStringReturned() {
diff --git a/core-java-8/src/test/java/com/baeldung/prime/PrimeGeneratorTest.java b/core-java-8/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java
similarity index 93%
rename from core-java-8/src/test/java/com/baeldung/prime/PrimeGeneratorTest.java
rename to core-java-8/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java
index e53e1c183e..0e7396c9dd 100644
--- a/core-java-8/src/test/java/com/baeldung/prime/PrimeGeneratorTest.java
+++ b/core-java-8/src/test/java/com/baeldung/prime/PrimeGeneratorUnitTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class PrimeGeneratorTest {
+public class PrimeGeneratorUnitTest {
     @Test
     public void whenBruteForced_returnsSuccessfully() {
         final List<Integer> primeNumbers = primeNumbersBruteForce(20);
diff --git a/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorTest.java b/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
similarity index 95%
rename from core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorTest.java
rename to core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
index 64dd65cf5e..81fad12eb0 100644
--- a/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorTest.java
+++ b/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorUnitTest.java
@@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.*;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ExecutorTest {
+public class ExecutorUnitTest {
 	Article article;
 	Stream<Author> stream;
 	Spliterator<Author> spliterator;
diff --git a/core-java-8/src/test/java/com/baeldung/stream/StreamApiTest.java b/core-java-8/src/test/java/com/baeldung/stream/StreamApiUnitTest.java
similarity index 97%
rename from core-java-8/src/test/java/com/baeldung/stream/StreamApiTest.java
rename to core-java-8/src/test/java/com/baeldung/stream/StreamApiUnitTest.java
index f4d0ac6b08..71569a1c82 100644
--- a/core-java-8/src/test/java/com/baeldung/stream/StreamApiTest.java
+++ b/core-java-8/src/test/java/com/baeldung/stream/StreamApiUnitTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class StreamApiTest {
+public class StreamApiUnitTest {
 
     @Test
     public void givenList_whenGetLastElementUsingReduce_thenReturnLastElement() {
diff --git a/core-java-8/src/test/java/com/baeldung/stream/StreamToImmutableTest.java b/core-java-8/src/test/java/com/baeldung/stream/StreamToImmutableUnitTest.java
similarity index 98%
rename from core-java-8/src/test/java/com/baeldung/stream/StreamToImmutableTest.java
rename to core-java-8/src/test/java/com/baeldung/stream/StreamToImmutableUnitTest.java
index 69b0b6d3ef..bd540201d2 100644
--- a/core-java-8/src/test/java/com/baeldung/stream/StreamToImmutableTest.java
+++ b/core-java-8/src/test/java/com/baeldung/stream/StreamToImmutableUnitTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
 import com.baeldung.stream.mycollectors.MyImmutableListCollector;
 import com.google.common.collect.ImmutableList;
 
-public class StreamToImmutableTest {
+public class StreamToImmutableUnitTest {
 
     @Test
     public void whenUsingCollectingToImmutableSet_thenSuccess() {
diff --git a/core-java-8/src/test/java/com/baeldung/stream/SupplierStreamTest.java b/core-java-8/src/test/java/com/baeldung/stream/SupplierStreamUnitTest.java
similarity index 93%
rename from core-java-8/src/test/java/com/baeldung/stream/SupplierStreamTest.java
rename to core-java-8/src/test/java/com/baeldung/stream/SupplierStreamUnitTest.java
index d78c9fca35..a496e18b2d 100644
--- a/core-java-8/src/test/java/com/baeldung/stream/SupplierStreamTest.java
+++ b/core-java-8/src/test/java/com/baeldung/stream/SupplierStreamUnitTest.java
@@ -8,7 +8,7 @@ import java.util.stream.Stream;
 
 import org.junit.Test;
 
-public class SupplierStreamTest {
+public class SupplierStreamUnitTest {
 
     @Test(expected = IllegalStateException.class)
     public void givenStream_whenStreamUsedTwice_thenThrowException() {
diff --git a/core-java-8/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java b/core-java-8/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterUnitTest.java
similarity index 96%
rename from core-java-8/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java
rename to core-java-8/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterUnitTest.java
index 513f163da8..5ea0e840a2 100644
--- a/core-java-8/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterTest.java
+++ b/core-java-8/src/test/java/com/baeldung/temporaladjusters/CustomTemporalAdjusterUnitTest.java
@@ -9,7 +9,7 @@ import java.time.temporal.TemporalAdjuster;
 
 import static org.junit.Assert.assertEquals;
 
-public class CustomTemporalAdjusterTest {
+public class CustomTemporalAdjusterUnitTest {
 
     private static final TemporalAdjuster NEXT_WORKING_DAY = new CustomTemporalAdjuster();
 
diff --git a/core-java-8/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java b/core-java-8/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersUnitTest.java
similarity index 92%
rename from core-java-8/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java
rename to core-java-8/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersUnitTest.java
index d06da5a782..175964dd21 100644
--- a/core-java-8/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersTest.java
+++ b/core-java-8/src/test/java/com/baeldung/temporaladjusters/TemporalAdjustersUnitTest.java
@@ -7,7 +7,7 @@ import java.time.temporal.TemporalAdjusters;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class TemporalAdjustersTest {
+public class TemporalAdjustersUnitTest {
 
     @Test
     public void whenAdjust_thenNextSunday() {
diff --git a/core-java-collections/src/test/java/com/baeldung/array/converter/ArrayConvertToListTest.java b/core-java-collections/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java
similarity index 98%
rename from core-java-collections/src/test/java/com/baeldung/array/converter/ArrayConvertToListTest.java
rename to core-java-collections/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java
index a5db46a9b6..cf8710d8a4 100644
--- a/core-java-collections/src/test/java/com/baeldung/array/converter/ArrayConvertToListTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/array/converter/ArrayConvertToListUnitTest.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 import static org.junit.Assert.*;
 
-public class ArrayConvertToListTest {
+public class ArrayConvertToListUnitTest {
 
     @Test
     public void givenAnStringArray_whenConvertArrayToList_thenListCreated() {
diff --git a/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeTest.java b/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
similarity index 92%
rename from core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeTest.java
rename to core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
index 50813a8601..71930eda97 100644
--- a/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/arraydeque/ArrayDequeUnitTest.java
@@ -6,7 +6,7 @@ import java.util.Deque;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-public class ArrayDequeTest {
+public class ArrayDequeUnitTest {
 
     @Test
     public void whenOffer_addsAtLast() {
diff --git a/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeTest.java b/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java
similarity index 97%
rename from core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeTest.java
rename to core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java
index d73e3a0eb5..4bc413dee0 100644
--- a/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/java/iterable/IterableSizeUnitTest.java
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.Lists;
 
-class IterableSizeTest {
+class IterableSizeUnitTest {
 
     private final List<String> list = Lists.newArrayList("Apple", "Orange", "Banana");
 
diff --git a/core-java-collections/src/test/java/com/baeldung/java/map/MapMultipleValuesTest.java b/core-java-collections/src/test/java/com/baeldung/java/map/MapMultipleValuesUnitTest.java
similarity index 98%
rename from core-java-collections/src/test/java/com/baeldung/java/map/MapMultipleValuesTest.java
rename to core-java-collections/src/test/java/com/baeldung/java/map/MapMultipleValuesUnitTest.java
index 88f97f6c19..3a0affa6f3 100644
--- a/core-java-collections/src/test/java/com/baeldung/java/map/MapMultipleValuesTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/java/map/MapMultipleValuesUnitTest.java
@@ -23,8 +23,8 @@ import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 
-public class MapMultipleValuesTest {
-    private static final Logger LOG = LoggerFactory.getLogger(MapMultipleValuesTest.class);
+public class MapMultipleValuesUnitTest {
+    private static final Logger LOG = LoggerFactory.getLogger(MapMultipleValuesUnitTest.class);
 
     @Test
     public void givenHashMap_whenPuttingTwice_thenReturningFirstValue() {
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java
similarity index 93%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterTest.java
rename to core-java-concurrency/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java
index e9b2e164ae..4eead471f8 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/atomic/ThreadSafeCounterIntegrationTest.java
@@ -9,7 +9,7 @@ import java.util.stream.IntStream;
 
 import org.junit.Test;
 
-public class ThreadSafeCounterTest {
+public class ThreadSafeCounterIntegrationTest {
 
     @Test
     public void givenMultiThread_whenSafeCounterWithLockIncrement() throws InterruptedException {
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
similarity index 95%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
rename to core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
index 3ca69d8847..2d8b91d846 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadUnitTest.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class DaemonThreadTest {
+public class DaemonThreadUnitTest {
 
     @Test
     @Ignore
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java
similarity index 96%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockTest.java
rename to core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java
index 9c56fa64be..553b8c9906 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSychronizedBlockUnitTest.java
@@ -9,7 +9,7 @@ import java.util.stream.IntStream;
 
 import static org.junit.Assert.assertEquals;
 
-public class BaeldungSychronizedBlockTest {
+public class BaeldungSychronizedBlockUnitTest {
 
     @Test
     public void givenMultiThread_whenBlockSync() throws InterruptedException {
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java
similarity index 97%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsTest.java
rename to core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java
index ba7c1f0a7b..32648729d5 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/synchronize/BaeldungSynchronizeMethodsUnitTest.java
@@ -10,7 +10,7 @@ import java.util.stream.IntStream;
 
 import static org.junit.Assert.assertEquals;
 
-public class BaeldungSynchronizeMethodsTest {
+public class BaeldungSynchronizeMethodsUnitTest {
 
     @Test
     @Ignore
diff --git a/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierTest.java b/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
similarity index 96%
rename from core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
rename to core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
index 6d96d2fc0b..4603644bf5 100644
--- a/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierTest.java
+++ b/core-java-io/src/test/java/com/baeldung/copyfiles/FileCopierIntegrationTest.java
@@ -18,7 +18,7 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.assertj.core.api.Assertions.*;
 
-public class FileCopierTest {
+public class FileCopierIntegrationTest {
     File original = new File("src/test/resources/original.txt");
 
     @Before
diff --git a/core-java-io/src/test/java/com/baeldung/file/FilesTest.java b/core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java
similarity index 98%
rename from core-java-io/src/test/java/com/baeldung/file/FilesTest.java
rename to core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java
index a35cda8b23..8322106c24 100644
--- a/core-java-io/src/test/java/com/baeldung/file/FilesTest.java
+++ b/core-java-io/src/test/java/com/baeldung/file/FilesManualTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 import com.baeldung.util.StreamUtils;
 
-public class FilesTest {
+public class FilesManualTest {
 
     public static final String fileName = "src/main/resources/countries.properties";
 
diff --git a/core-java/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java b/core-java/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java
index 977587a06a..f35064b783 100644
--- a/core-java/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java
+++ b/core-java/src/main/java/com/baeldung/array/ArrayBenchmarkRunner.java
@@ -9,7 +9,7 @@ public class ArrayBenchmarkRunner {
   public static void main(String[] args) throws Exception {
 
     Options options = new OptionsBuilder()
-        .include(SearchArrayTest.class.getSimpleName()).threads(1)
+        .include(SearchArrayUnitTest.class.getSimpleName()).threads(1)
         .forks(1).shouldFailOnError(true).shouldDoGC(true)
         .jvmArgs("-server").build();
 
diff --git a/core-java/src/main/java/com/baeldung/array/SearchArrayTest.java b/core-java/src/main/java/com/baeldung/array/SearchArrayUnitTest.java
similarity index 98%
rename from core-java/src/main/java/com/baeldung/array/SearchArrayTest.java
rename to core-java/src/main/java/com/baeldung/array/SearchArrayUnitTest.java
index 199ebdf036..bed58356cb 100644
--- a/core-java/src/main/java/com/baeldung/array/SearchArrayTest.java
+++ b/core-java/src/main/java/com/baeldung/array/SearchArrayUnitTest.java
@@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit;
 @BenchmarkMode(Mode.AverageTime)
 @Warmup(iterations = 5)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
-public class SearchArrayTest {
+public class SearchArrayUnitTest {
 
     @State(Scope.Benchmark)
     public static class SearchData {
diff --git a/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java b/core-java/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java
rename to core-java/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java
index 7265fa20e5..5e764da174 100644
--- a/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java
+++ b/core-java/src/test/java/com/baeldung/array/ArrayInitializerUnitTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertArrayEquals;
 
 import org.junit.Test;
 
-public class ArrayInitializerTest {
+public class ArrayInitializerUnitTest {
 
     @Test
     public void whenInitializeArrayInLoop_thenCorrect() {
diff --git a/core-java/src/test/java/com/baeldung/array/Find2ndLargestInArrayTest.java b/core-java/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java
similarity index 90%
rename from core-java/src/test/java/com/baeldung/array/Find2ndLargestInArrayTest.java
rename to core-java/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java
index ec916af092..4493f3fbf5 100644
--- a/core-java/src/test/java/com/baeldung/array/Find2ndLargestInArrayTest.java
+++ b/core-java/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java
@@ -3,7 +3,7 @@ package com.baeldung.array;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class Find2ndLargestInArrayTest {
+public class Find2ndLargestInArrayUnitTest {
     @Test
     public void givenAnIntArray_thenFind2ndLargestElement() {
         int[] array = { 1, 3, 24, 16, 87, 20 };
diff --git a/core-java/src/test/java/com/baeldung/array/FindElementInArrayTest.java b/core-java/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/array/FindElementInArrayTest.java
rename to core-java/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java
index ba9188fa7b..887f50ebcc 100644
--- a/core-java/src/test/java/com/baeldung/array/FindElementInArrayTest.java
+++ b/core-java/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java
@@ -3,7 +3,7 @@ package com.baeldung.array;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class FindElementInArrayTest {
+public class FindElementInArrayUnitTest {
     @Test
     public void givenAnIntArray_whenNotUsingStream_thenFindAnElement() {
         int[] array = { 1, 3, 4, 8, 19, 20 };
diff --git a/core-java/src/test/java/com/baeldung/array/SumAndAverageInArrayTest.java b/core-java/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/array/SumAndAverageInArrayTest.java
rename to core-java/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java
index 208075cb57..0f38316ce3 100644
--- a/core-java/src/test/java/com/baeldung/array/SumAndAverageInArrayTest.java
+++ b/core-java/src/test/java/com/baeldung/array/SumAndAverageInArrayUnitTest.java
@@ -3,7 +3,7 @@ package com.baeldung.array;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class SumAndAverageInArrayTest {
+public class SumAndAverageInArrayUnitTest {
     @Test
     public void givenAnIntArray_whenNotUsingStream_thenFindSum() {
         int[] array = { 1, 3, 4, 8, 19, 20 };
diff --git a/core-java/src/test/java/com/baeldung/asciiart/AsciiArtTest.java b/core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java
similarity index 92%
rename from core-java/src/test/java/com/baeldung/asciiart/AsciiArtTest.java
rename to core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java
index 103681894e..8ab1695395 100644
--- a/core-java/src/test/java/com/baeldung/asciiart/AsciiArtTest.java
+++ b/core-java/src/test/java/com/baeldung/asciiart/AsciiArtIntegrationTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import com.baeldung.asciiart.AsciiArt.Settings;
 
-public class AsciiArtTest {
+public class AsciiArtIntegrationTest {
 
     @Test
     public void givenTextWithAsciiCharacterAndSettings_shouldPrintAsciiArt() {
diff --git a/core-java/src/test/java/com/baeldung/breakcontinue/BreakContinueTest.java b/core-java/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/breakcontinue/BreakContinueTest.java
rename to core-java/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java
index 1980497cd3..2a2f3be2a9 100644
--- a/core-java/src/test/java/com/baeldung/breakcontinue/BreakContinueTest.java
+++ b/core-java/src/test/java/com/baeldung/breakcontinue/BreakContinueUnitTest.java
@@ -9,7 +9,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-public class BreakContinueTest {
+public class BreakContinueUnitTest {
 
     @Test
     public void whenUnlabeledBreak_ThenEqual() {
diff --git a/core-java/src/test/java/com/baeldung/casting/CastingTest.java b/core-java/src/test/java/com/baeldung/casting/CastingUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/casting/CastingTest.java
rename to core-java/src/test/java/com/baeldung/casting/CastingUnitTest.java
index dd95e0dd80..41eaa5dc1b 100644
--- a/core-java/src/test/java/com/baeldung/casting/CastingTest.java
+++ b/core-java/src/test/java/com/baeldung/casting/CastingUnitTest.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.*;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CastingTest {
+public class CastingUnitTest {
 
     @Test
     public void whenPrimitiveConverted_thenValueChanged() {
diff --git a/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderTest.java b/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java
similarity index 93%
rename from core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderTest.java
rename to core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java
index 9f3c751805..ec35885b84 100644
--- a/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderTest.java
+++ b/core-java/src/test/java/com/baeldung/classloader/CustomClassLoaderUnitTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public class CustomClassLoaderTest {
+public class CustomClassLoaderUnitTest {
 
     @Test
     public void customLoader() throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
diff --git a/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderTest.java b/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java
similarity index 93%
rename from core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderTest.java
rename to core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java
index f44a5cef09..f0d69f4326 100644
--- a/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderTest.java
+++ b/core-java/src/test/java/com/baeldung/classloader/PrintClassLoaderUnitTest.java
@@ -4,7 +4,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-public class PrintClassLoaderTest {
+public class PrintClassLoaderUnitTest {
     @Test(expected = ClassNotFoundException.class)
     public void givenAppClassLoader_whenParentClassLoader_thenClassNotFoundException() throws Exception {
         PrintClassLoader sampleClassLoader = (PrintClassLoader) Class.forName(PrintClassLoader.class.getName()).newInstance();
diff --git a/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionTest.java b/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
similarity index 84%
rename from core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionTest.java
rename to core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
index 8714d084ab..b076b0324a 100644
--- a/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionTest.java
+++ b/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionUnitTest.java
@@ -2,7 +2,7 @@ package com.baeldung.classnotfoundexception;
 
 import org.junit.Test;
 
-public class ClassNotFoundExceptionTest {
+public class ClassNotFoundExceptionUnitTest {
 
     @Test(expected = ClassNotFoundException.class)
     public void givenNoDriversInClassPath_whenLoadDrivers_thenClassNotFoundException() throws ClassNotFoundException {