diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullLazyEvaluateUnitTest.java b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullLazyEvaluateUnitTest.java
index fff348052a..56c846eb0e 100644
--- a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullLazyEvaluateUnitTest.java
+++ b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullLazyEvaluateUnitTest.java
@@ -19,7 +19,7 @@ public class ReturnFirstNonNullLazyEvaluateUnitTest {
     private final LazyEvaluate spy = Mockito.spy(new LazyEvaluate());
 
     @Test
-    void givenChainOfMethods_thenLazilyEvaluateMethodsUntilFirstNonNull() {
+    void givenChainOfMethods_whenUsingIfStatements_thenLazilyEvaluateMethodsUntilFirstNonNull() {
         String object = spy.methodA();
         if (object == null) {
             object = spy.methodB();
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullUnitTest.java b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullUnitTest.java
index e7bb4d399f..32c95f0e84 100644
--- a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullUnitTest.java
+++ b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/returnfirstnonnull/ReturnFirstNonNullUnitTest.java
@@ -26,7 +26,7 @@ public class ReturnFirstNonNullUnitTest {
     }
 
     @Test
-    void givenListOfObjects_whenFilterIsLambdaNullCheck_thenReturnFirstNonNull() {
+    void givenListOfObjects_whenFilterIsLambdaNullCheckInStream_thenReturnFirstNonNull() {
         Optional<String> object = objects.stream()
           .filter(o -> o != null)
           .findFirst();
@@ -35,7 +35,7 @@ public class ReturnFirstNonNullUnitTest {
     }
 
     @Test
-    void givenListOfObjects_whenFilterIsMethodRefNullCheck_thenReturnFirstNonNull() {
+    void givenListOfObjects_whenFilterIsMethodRefNullCheckInStream_thenReturnFirstNonNull() {
         Optional<String> object = objects.stream()
           .filter(Objects::nonNull)
           .findFirst();