diff --git a/spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/Application.java b/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/Application.java
similarity index 88%
rename from spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/Application.java
rename to spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/Application.java
index 14e46b2306..51598aeacb 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/Application.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/Application.java
@@ -1,4 +1,4 @@
-package com.baeldung.swaggerboot;
+package com.baeldung.swagger2boot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/configuration/SpringFoxConfig.java b/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java
similarity index 97%
rename from spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/configuration/SpringFoxConfig.java
rename to spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java
index 3041dfdcc8..68e2c55deb 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/configuration/SpringFoxConfig.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.swaggerboot.configuration;
+package com.baeldung.swagger2boot.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/controller/RegularRestController.java b/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java
similarity index 85%
rename from spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/controller/RegularRestController.java
rename to spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java
index 676937f7d7..df8714d041 100644
--- a/spring-boot-mvc/src/main/java/com/baeldung/swaggerboot/controller/RegularRestController.java
+++ b/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java
@@ -1,4 +1,4 @@
-package com.baeldung.swaggerboot.controller;
+package com.baeldung.swagger2boot.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java b/spring-resttemplate/src/test/java/org/baeldung/resttemplate/RestTemplateBasicLiveTest.java
similarity index 99%
rename from spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
rename to spring-resttemplate/src/test/java/org/baeldung/resttemplate/RestTemplateBasicLiveTest.java
index ff3034a50d..54e416d008 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/resttemplate/RestTemplateBasicLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.client;
+package org.baeldung.resttemplate;
 
 import static org.apache.commons.codec.binary.Base64.encodeBase64;
 import static org.baeldung.client.Consts.APPLICATION_PORT;
diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java b/spring-security-rest/src/main/java/org/baeldung/swagger2/SwaggerConfig.java
similarity index 98%
rename from spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java
rename to spring-security-rest/src/main/java/org/baeldung/swagger2/SwaggerConfig.java
index aa00e8455e..67c760353d 100644
--- a/spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java
+++ b/spring-security-rest/src/main/java/org/baeldung/swagger2/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package org.baeldung.swagger2;
 
 import static com.google.common.collect.Lists.newArrayList;