diff --git a/spring-boot-modules/spring-boot-hexagonal/pom.xml b/spring-boot-modules/spring-boot-hexagonal/pom.xml
index 4d6109d24f..54d61fa806 100644
--- a/spring-boot-modules/spring-boot-hexagonal/pom.xml
+++ b/spring-boot-modules/spring-boot-hexagonal/pom.xml
@@ -24,12 +24,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/Application.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/Application.java
index 5e4bcc0435..a898f9cf05 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/Application.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/Application.java
@@ -4,10 +4,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class DocumentserviceApplication {
+public class Application {
 	
 	public static void main(String[] args) {
-		SpringApplication.run(DocumentserviceApplication.class, args);
+		SpringApplication.run(Application.class, args);
 	}
 	
 }
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRepositoryImpl.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRepositoryImpl.java
index eabdaa63b8..1248133665 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRepositoryImpl.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRepositoryImpl.java
@@ -1,9 +1,10 @@
 package com.baeldung.adapter;
 
-import com.ajay.documentservice.domain.Document;
-import com.ajay.documentservice.port.DocumentRepo;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.domain.Document;
+import com.baeldung.port.DocumentRepo;
+
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRestAdapter.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRestAdapter.java
index d8c89d5c6e..e7fa5d0b42 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRestAdapter.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/adapter/DocumentRestAdapter.java
@@ -1,10 +1,12 @@
 package com.baeldung.adapter;
 
-import com.ajay.documentservice.domain.Document;
-import com.ajay.documentservice.port.DocumentService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import com.baeldung.domain.Document;
+import com.baeldung.port.DocumentService;
+
 @RestController
 @RequestMapping("/doc")
 public class DocumentRestAdapter {
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/domain/Document.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/domain/Document.java
index 77c1079cdc..58381d536d 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/domain/Document.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/domain/Document.java
@@ -1,13 +1,21 @@
 package com.baeldung.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-@Builder
 public class Document {
 	private String id;
 	private String data;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getData() {
+		return data;
+	}
+	public void setData(String data) {
+		this.data = data;
+	}
+	
+	
 }
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentRepo.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentRepo.java
index d5591f9aa4..96dba3d954 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentRepo.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentRepo.java
@@ -1,7 +1,6 @@
 package com.baeldung.port;
 
-
-import com.ajay.documentservice.domain.Document;
+import com.baeldung.domain.Document;
 
 public interface DocumentRepo {
 	void storeDocument(Document document);
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentService.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentService.java
index 5df49efa88..5d5bfb2035 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentService.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/DocumentService.java
@@ -1,6 +1,6 @@
 package com.baeldung.port;
 
-import com.ajay.documentservice.domain.Document;
+import com.baeldung.domain.Document;
 
 public interface DocumentService {
 	
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/impl/DocumentServiceImpl.java b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/impl/DocumentServiceImpl.java
index a2942b2d59..1b50e1efe2 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/impl/DocumentServiceImpl.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/main/java/com/baeldung/port/impl/DocumentServiceImpl.java
@@ -1,11 +1,12 @@
 package com.baeldung.port.impl;
 
-import com.ajay.documentservice.domain.Document;
-import com.ajay.documentservice.port.DocumentRepo;
-import com.ajay.documentservice.port.DocumentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.baeldung.domain.Document;
+import com.baeldung.port.DocumentRepo;
+import com.baeldung.port.DocumentService;
+
 @Service
 public class DocumentServiceImpl implements DocumentService {
 	
diff --git a/spring-boot-modules/spring-boot-hexagonal/src/test/java/com/baeldung/ApplicationTests.java b/spring-boot-modules/spring-boot-hexagonal/src/test/java/com/baeldung/ApplicationUnitTest.java
similarity index 91%
rename from spring-boot-modules/spring-boot-hexagonal/src/test/java/com/baeldung/ApplicationTests.java
rename to spring-boot-modules/spring-boot-hexagonal/src/test/java/com/baeldung/ApplicationUnitTest.java
index f531a9fba0..f7592c0cc8 100644
--- a/spring-boot-modules/spring-boot-hexagonal/src/test/java/com/baeldung/ApplicationTests.java
+++ b/spring-boot-modules/spring-boot-hexagonal/src/test/java/com/baeldung/ApplicationUnitTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
-class ApplicationTests {
+class ApplicationUnitTest {
 	
 	@Test
 	public void contextLoads() {