diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesConfig.java
similarity index 94%
rename from spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
rename to spring-all/src/main/java/org/baeldung/scopes/ScopesConfig.java
index b5fe494ee2..11d3806b6e 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesConfig.java
@@ -1,7 +1,5 @@
-package org.baeldung.spring.config;
+package org.baeldung.scopes;
 
-import org.baeldung.scopes.HelloMessageGenerator;
-import org.baeldung.scopes.Person;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/main/java/com/baeldung/validation/application/Application.java b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/Application.java
similarity index 78%
rename from spring-boot/src/main/java/com/baeldung/validation/application/Application.java
rename to spring-boot/src/main/java/com/baeldung/beanvalidation/application/Application.java
index af8f768193..b37eec9da0 100644
--- a/spring-boot/src/main/java/com/baeldung/validation/application/Application.java
+++ b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/Application.java
@@ -1,7 +1,8 @@
-package com.baeldung.validation.application;
+package com.baeldung.beanvalidation.application;
+
+import com.baeldung.beanvalidation.application.entities.User;
+import com.baeldung.beanvalidation.application.repositories.UserRepository;
 
-import com.baeldung.validation.application.entities.User;
-import com.baeldung.validation.application.repositories.UserRepository;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot/src/main/java/com/baeldung/validation/application/controllers/UserController.java b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java
similarity index 87%
rename from spring-boot/src/main/java/com/baeldung/validation/application/controllers/UserController.java
rename to spring-boot/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java
index a4aeefb70b..0c47e27e25 100644
--- a/spring-boot/src/main/java/com/baeldung/validation/application/controllers/UserController.java
+++ b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/controllers/UserController.java
@@ -1,7 +1,8 @@
-package com.baeldung.validation.application.controllers;
+package com.baeldung.beanvalidation.application.controllers;
+
+import com.baeldung.beanvalidation.application.entities.User;
+import com.baeldung.beanvalidation.application.repositories.UserRepository;
 
-import com.baeldung.validation.application.entities.User;
-import com.baeldung.validation.application.repositories.UserRepository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/spring-boot/src/main/java/com/baeldung/validation/application/entities/User.java b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/entities/User.java
similarity index 90%
rename from spring-boot/src/main/java/com/baeldung/validation/application/entities/User.java
rename to spring-boot/src/main/java/com/baeldung/beanvalidation/application/entities/User.java
index 529368f132..8233d08f4e 100644
--- a/spring-boot/src/main/java/com/baeldung/validation/application/entities/User.java
+++ b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/entities/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.validation.application.entities;
+package com.baeldung.beanvalidation.application.entities;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-boot/src/main/java/com/baeldung/validation/application/repositories/UserRepository.java b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/repositories/UserRepository.java
similarity index 59%
rename from spring-boot/src/main/java/com/baeldung/validation/application/repositories/UserRepository.java
rename to spring-boot/src/main/java/com/baeldung/beanvalidation/application/repositories/UserRepository.java
index b579addcaa..8bf7a9f8b2 100644
--- a/spring-boot/src/main/java/com/baeldung/validation/application/repositories/UserRepository.java
+++ b/spring-boot/src/main/java/com/baeldung/beanvalidation/application/repositories/UserRepository.java
@@ -1,8 +1,9 @@
-package com.baeldung.validation.application.repositories;
+package com.baeldung.beanvalidation.application.repositories;
 
-import com.baeldung.validation.application.entities.User;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.beanvalidation.application.entities.User;
+
 @Repository
 public interface UserRepository extends CrudRepository<User, Long> {}
diff --git a/spring-boot/src/test/java/com/baeldung/validation/application/UserControllerIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java
similarity index 91%
rename from spring-boot/src/test/java/com/baeldung/validation/application/UserControllerIntegrationTest.java
rename to spring-boot/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java
index 77a230ee6c..07d9b0807e 100644
--- a/spring-boot/src/test/java/com/baeldung/validation/application/UserControllerIntegrationTest.java
+++ b/spring-boot/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java
@@ -1,7 +1,8 @@
-package com.baeldung.validation.application;
+package com.baeldung.beanvalidation.application;
+
+import com.baeldung.beanvalidation.application.controllers.UserController;
+import com.baeldung.beanvalidation.application.repositories.UserRepository;
 
-import com.baeldung.validation.application.controllers.UserController;
-import com.baeldung.validation.application.repositories.UserRepository;
 import java.nio.charset.Charset;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.hamcrest.core.Is;