diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 9cb0625105..ec5eb51b99 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -34,6 +34,7 @@
+
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/Computer.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/Computer.java
similarity index 98%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/Computer.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/Computer.java
index dc0b064013..e3f04d7fee 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/Computer.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/Computer.java
@@ -1,4 +1,4 @@
-package com.baeldung.doublecolon;
+package com.ossez.doublecolon;
public class Computer {
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/ComputerUtils.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/ComputerUtils.java
similarity index 87%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/ComputerUtils.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/ComputerUtils.java
index ea274072ea..1949d62db6 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/ComputerUtils.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/ComputerUtils.java
@@ -1,9 +1,9 @@
-package com.baeldung.doublecolon;
+package com.ossez.doublecolon;
import java.util.ArrayList;
import java.util.List;
-import com.baeldung.doublecolon.function.ComputerPredicate;
+import com.ossez.doublecolon.function.ComputerPredicate;
public class ComputerUtils {
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/MacbookPro.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/MacbookPro.java
similarity index 96%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/MacbookPro.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/MacbookPro.java
index 79c8d9e383..50a206067d 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/MacbookPro.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/MacbookPro.java
@@ -1,4 +1,4 @@
-package com.baeldung.doublecolon;
+package com.ossez.doublecolon;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/function/ComputerPredicate.java
similarity index 53%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/function/ComputerPredicate.java
index 5ce491e86a..fe64ba90df 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/function/ComputerPredicate.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/function/ComputerPredicate.java
@@ -1,6 +1,6 @@
-package com.baeldung.doublecolon.function;
+package com.ossez.doublecolon.function;
-import com.baeldung.doublecolon.Computer;
+import com.ossez.doublecolon.Computer;
@FunctionalInterface
public interface ComputerPredicate {
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/function/TriFunction.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/function/TriFunction.java
similarity index 89%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/function/TriFunction.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/function/TriFunction.java
index d0d6299479..66fc53e908 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/doublecolon/function/TriFunction.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/doublecolon/function/TriFunction.java
@@ -1,4 +1,4 @@
-package com.baeldung.doublecolon.function;
+package com.ossez.doublecolon.function;
import java.util.Objects;
import java.util.function.Function;
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/entity/Human.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/entity/Human.java
similarity index 98%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/entity/Human.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/entity/Human.java
index 98e35d0af2..49f62d7ae4 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/entity/Human.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/entity/Human.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.entity;
+package com.ossez.java8.entity;
public class Human {
private String name;
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/exceptions/LambdaExceptionWrappers.java
similarity index 97%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/exceptions/LambdaExceptionWrappers.java
index db710589e7..21c441b545 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappers.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/exceptions/LambdaExceptionWrappers.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.exceptions;
+package com.ossez.java8.lambda.exceptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/exceptions/ThrowingConsumer.java
similarity index 71%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/exceptions/ThrowingConsumer.java
index c5860e7f6b..36db53e158 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/exceptions/ThrowingConsumer.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/exceptions/ThrowingConsumer.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.exceptions;
+package com.ossez.java8.lambda.exceptions;
@FunctionalInterface
public interface ThrowingConsumer {
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Bar.java
similarity index 86%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Bar.java
index 3ee78bd7a3..698f51c89c 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Bar.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Bar.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
@FunctionalInterface
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Baz.java
similarity index 86%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Baz.java
index 1e1e9ae094..990f2b7149 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Baz.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Baz.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
@FunctionalInterface
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Foo.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Foo.java
similarity index 75%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Foo.java
index b63ba61e7e..7a042bf368 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Foo.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Foo.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
@FunctionalInterface
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/FooExtended.java
similarity index 81%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/FooExtended.java
index 27ab86dca3..55eb83865b 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/FooExtended.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/FooExtended.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
@FunctionalInterface
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Processor.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Processor.java
similarity index 85%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Processor.java
index 7931129cf5..056e6d3f25 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/Processor.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/Processor.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
import java.util.concurrent.Callable;
import java.util.function.Supplier;
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/ProcessorImpl.java
similarity index 76%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/ProcessorImpl.java
index cb1b3dcdd2..db4f67536f 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/ProcessorImpl.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/ProcessorImpl.java
@@ -1,9 +1,7 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-import java.util.function.Function;
import java.util.function.Supplier;
public class ProcessorImpl implements Processor {
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/UseFoo.java
similarity index 95%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/UseFoo.java
index a64d8bb920..d3bb13df0b 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/java8/lambda/tips/UseFoo.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/java8/lambda/tips/UseFoo.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
import java.util.function.Function;
diff --git a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/lambdas/LambdaVariables.java
similarity index 98%
rename from core-java-modules/core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java
rename to core-java-modules/core-java-lambdas/src/main/java/com/ossez/lambdas/LambdaVariables.java
index 5c1201150f..52dca253d2 100644
--- a/core-java-modules/core-java-lambdas/src/main/java/com/baeldung/lambdas/LambdaVariables.java
+++ b/core-java-modules/core-java-lambdas/src/main/java/com/ossez/lambdas/LambdaVariables.java
@@ -1,4 +1,4 @@
-package com.baeldung.lambdas;
+package com.ossez.lambdas;
import java.util.Random;
import java.util.concurrent.ExecutorService;
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/doublecolon/ComputerUtilsUnitTest.java
similarity index 92%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/doublecolon/ComputerUtilsUnitTest.java
index 7157dead6e..0afce2e0e6 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/doublecolon/ComputerUtilsUnitTest.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/doublecolon/ComputerUtilsUnitTest.java
@@ -1,6 +1,9 @@
-package com.baeldung.doublecolon;
+package com.ossez.doublecolon;
-import com.baeldung.doublecolon.function.TriFunction;
+import com.ossez.doublecolon.Computer;
+import com.ossez.doublecolon.ComputerUtils;
+import com.ossez.doublecolon.MacbookPro;
+import com.ossez.doublecolon.function.TriFunction;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -11,7 +14,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.function.BiFunction;
-import static com.baeldung.doublecolon.ComputerUtils.*;
+import static com.ossez.doublecolon.ComputerUtils.*;
public class ComputerUtilsUnitTest {
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/functionalinterface/FunctionalInterfaceUnitTest.java
similarity index 99%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/functionalinterface/FunctionalInterfaceUnitTest.java
index e91cbfcb75..c48b67d2f9 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/FunctionalInterfaceUnitTest.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/functionalinterface/FunctionalInterfaceUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.functionalinterface;
+package com.ossez.functionalinterface;
import com.google.common.util.concurrent.Uninterruptibles;
import org.junit.Test;
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/functionalinterface/ShortToByteFunction.java
similarity index 69%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/functionalinterface/ShortToByteFunction.java
index 3231d6244f..ce34c74e18 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/functionalinterface/ShortToByteFunction.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/functionalinterface/ShortToByteFunction.java
@@ -1,4 +1,4 @@
-package com.baeldung.functionalinterface;
+package com.ossez.functionalinterface;
@FunctionalInterface
public interface ShortToByteFunction {
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/Java8SortUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/Java8SortUnitTest.java
similarity index 99%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/Java8SortUnitTest.java
index e5f876c84b..0ba3e63eaf 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/Java8SortUnitTest.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/Java8SortUnitTest.java
@@ -1,6 +1,6 @@
-package com.baeldung.java8;
+package com.ossez.java8;
-import com.baeldung.java8.entity.Human;
+import com.ossez.java8.entity.Human;
import com.google.common.collect.Lists;
import com.google.common.primitives.Ints;
import org.junit.Assert;
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
similarity index 91%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
index fe10266043..d23ec4caf9 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.exceptions;
+package com.ossez.java8.lambda.exceptions;
import org.junit.Before;
import org.junit.Test;
@@ -9,7 +9,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import static com.baeldung.java8.lambda.exceptions.LambdaExceptionWrappers.*;
+import static com.ossez.java8.lambda.exceptions.LambdaExceptionWrappers.*;
public class LambdaExceptionWrappersUnitTest {
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/Bicycle.java
similarity index 92%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/Bicycle.java
index 26f9f8bc46..a83d76faae 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/Bicycle.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/Bicycle.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.methodreference;
+package com.ossez.java8.lambda.methodreference;
public class Bicycle {
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/BicycleComparator.java
similarity index 82%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/BicycleComparator.java
index 153a7d105a..4406ef4faa 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/BicycleComparator.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/BicycleComparator.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.methodreference;
+package com.ossez.java8.lambda.methodreference;
import java.util.Comparator;
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/MethodReferenceUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/MethodReferenceUnitTest.java
index 87c01c3ded..f3cc99951e 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/methodreference/MethodReferenceUnitTest.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/methodreference/MethodReferenceUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8.lambda.methodreference;
+package com.ossez.java8.lambda.methodreference;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
similarity index 93%
rename from core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
rename to core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
index acc3bc8fa3..19d7b5a8ae 100644
--- a/core-java-modules/core-java-lambdas/src/test/java/com/baeldung/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
+++ b/core-java-modules/core-java-lambdas/src/test/java/com/ossez/java8/lambda/tips/Java8FunctionalInteracesLambdasUnitTest.java
@@ -1,8 +1,8 @@
-package com.baeldung.java8.lambda.tips;
+package com.ossez.java8.lambda.tips;
-import com.baeldung.java8.lambda.tips.Foo;
-import com.baeldung.java8.lambda.tips.FooExtended;
-import com.baeldung.java8.lambda.tips.UseFoo;
+import com.ossez.java8.lambda.tips.Foo;
+import com.ossez.java8.lambda.tips.FooExtended;
+import com.ossez.java8.lambda.tips.UseFoo;
import org.junit.Before;
import org.junit.Test;