diff --git a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/persistence/SmurfsRepository.java b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/persistence/SmurfsRepository.java
similarity index 92%
rename from libraries-testing/src/main/java/com/baldung/archunit/smurfs/persistence/SmurfsRepository.java
rename to libraries-testing/src/main/java/com/baeldung/archunit/smurfs/persistence/SmurfsRepository.java
index 8107e6317a..1dee45087a 100644
--- a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/persistence/SmurfsRepository.java
+++ b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/persistence/SmurfsRepository.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.baldung.archunit.smurfs.persistence;
+package com.baeldung.archunit.smurfs.persistence;
 
 import java.util.Collections;
 import java.util.List;
@@ -9,7 +9,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
 
-import com.baldung.archunit.smurfs.persistence.domain.Smurf;
+import com.baeldung.archunit.smurfs.persistence.domain.Smurf;
 
 import static java.util.stream.Collectors.toList;
 
diff --git a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/persistence/domain/Smurf.java b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/persistence/domain/Smurf.java
similarity index 94%
rename from libraries-testing/src/main/java/com/baldung/archunit/smurfs/persistence/domain/Smurf.java
rename to libraries-testing/src/main/java/com/baeldung/archunit/smurfs/persistence/domain/Smurf.java
index 468266cf9a..6e0f586a5b 100644
--- a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/persistence/domain/Smurf.java
+++ b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/persistence/domain/Smurf.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.baldung.archunit.smurfs.persistence.domain;
+package com.baeldung.archunit.smurfs.persistence.domain;
 
 /**
  * @author Philippe
diff --git a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/presentation/SmurfsController.java b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/presentation/SmurfsController.java
similarity index 78%
rename from libraries-testing/src/main/java/com/baldung/archunit/smurfs/presentation/SmurfsController.java
rename to libraries-testing/src/main/java/com/baeldung/archunit/smurfs/presentation/SmurfsController.java
index c0aff4ec03..7e31980d89 100644
--- a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/presentation/SmurfsController.java
+++ b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/presentation/SmurfsController.java
@@ -1,4 +1,4 @@
-package com.baldung.archunit.smurfs.presentation;
+package com.baeldung.archunit.smurfs.presentation;
 
 import java.util.List;
 
@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baldung.archunit.smurfs.service.SmurfsService;
-import com.baldung.archunit.smurfs.service.dto.SmurfDTO;
+import com.baeldung.archunit.smurfs.service.SmurfsService;
+import com.baeldung.archunit.smurfs.service.dto.SmurfDTO;
 
 @RequestMapping(value = "/smurfs", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @RestController
diff --git a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/service/SmurfsService.java b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/service/SmurfsService.java
similarity index 74%
rename from libraries-testing/src/main/java/com/baldung/archunit/smurfs/service/SmurfsService.java
rename to libraries-testing/src/main/java/com/baeldung/archunit/smurfs/service/SmurfsService.java
index 40ffcc955c..e2c73ef77e 100644
--- a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/service/SmurfsService.java
+++ b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/service/SmurfsService.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package com.baldung.archunit.smurfs.service;
+package com.baeldung.archunit.smurfs.service;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Component;
 
-import com.baldung.archunit.smurfs.persistence.SmurfsRepository;
-import com.baldung.archunit.smurfs.persistence.domain.Smurf;
-import com.baldung.archunit.smurfs.service.dto.SmurfDTO;
+import com.baeldung.archunit.smurfs.persistence.SmurfsRepository;
+import com.baeldung.archunit.smurfs.persistence.domain.Smurf;
+import com.baeldung.archunit.smurfs.service.dto.SmurfDTO;
 
 /**
  * @author Philippe
diff --git a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/service/dto/SmurfDTO.java b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/service/dto/SmurfDTO.java
similarity index 90%
rename from libraries-testing/src/main/java/com/baldung/archunit/smurfs/service/dto/SmurfDTO.java
rename to libraries-testing/src/main/java/com/baeldung/archunit/smurfs/service/dto/SmurfDTO.java
index 3c49262f9d..948d0b349a 100644
--- a/libraries-testing/src/main/java/com/baldung/archunit/smurfs/service/dto/SmurfDTO.java
+++ b/libraries-testing/src/main/java/com/baeldung/archunit/smurfs/service/dto/SmurfDTO.java
@@ -1,9 +1,9 @@
 /**
  * 
  */
-package com.baldung.archunit.smurfs.service.dto;
+package com.baeldung.archunit.smurfs.service.dto;
 
-import com.baldung.archunit.smurfs.persistence.domain.Smurf;
+import com.baeldung.archunit.smurfs.persistence.domain.Smurf;
 
 /**
  * @author Philippe
diff --git a/libraries-testing/src/test/java/com/baeldung/archunit/smurfs/SmurfsArchUnitTest.java b/libraries-testing/src/test/java/com/baeldung/archunit/smurfs/SmurfsArchUnitTest.java
index fa4428e599..0231a2c51a 100644
--- a/libraries-testing/src/test/java/com/baeldung/archunit/smurfs/SmurfsArchUnitTest.java
+++ b/libraries-testing/src/test/java/com/baeldung/archunit/smurfs/SmurfsArchUnitTest.java
@@ -25,7 +25,7 @@ public class SmurfsArchUnitTest {
     
     @Test
     public void givenPresentationLayerClasses_thenWrongCheckFails() {        
-        JavaClasses jc = new ClassFileImporter().importPackages("com.baldung.archunit.smurfs");
+        JavaClasses jc = new ClassFileImporter().importPackages("com.baeldung.archunit.smurfs");
         
         ArchRule r1 = classes()
           .that()
@@ -40,7 +40,7 @@ public class SmurfsArchUnitTest {
 
     @Test
     public void givenPresentationLayerClasses_thenCheckWithFrameworkDependenciesSuccess() {        
-        JavaClasses jc = new ClassFileImporter().importPackages("com.baldung.archunit.smurfs");
+        JavaClasses jc = new ClassFileImporter().importPackages("com.baeldung.archunit.smurfs");
         
         ArchRule r1 = classes()
           .that()
@@ -54,7 +54,7 @@ public class SmurfsArchUnitTest {
 
     @Test
     public void givenPresentationLayerClasses_thenNoPersistenceLayerAccess() {        
-        JavaClasses jc = new ClassFileImporter().importPackages("com.baldung.archunit.smurfs");
+        JavaClasses jc = new ClassFileImporter().importPackages("com.baeldung.archunit.smurfs");
         
         ArchRule r1 = noClasses()
           .that()
@@ -69,7 +69,7 @@ public class SmurfsArchUnitTest {
     @Test
     public void givenApplicationClasses_thenNoLayerViolationsShouldExist() {
         
-        JavaClasses jc = new ClassFileImporter().importPackages("com.baldung.archunit.smurfs");
+        JavaClasses jc = new ClassFileImporter().importPackages("com.baeldung.archunit.smurfs");
         
         LayeredArchitecture arch = layeredArchitecture()
            // Define layers