diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/AddAddressController.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/AddAddressController.java
similarity index 84%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/AddAddressController.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/AddAddressController.java
index 2f8f7af..64e6606 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/AddAddressController.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/AddAddressController.java
@@ -1,9 +1,9 @@
-package de.strasser.peter.hexagonal.webadapter;
+package de.strasser.peter.hexagonal.web;
 
 import de.strasser.peter.hexagonal.application.customer.port.in.AddAddressUseCase;
 import de.strasser.peter.hexagonal.application.customer.port.in.commands.AddAddressCommand;
-import de.strasser.peter.hexagonal.webadapter.mapper.AddAddressRequestMapper;
-import de.strasser.peter.hexagonal.webadapter.model.AddAddressRequest;
+import de.strasser.peter.hexagonal.web.mapper.AddAddressRequestMapper;
+import de.strasser.peter.hexagonal.web.model.AddAddressRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/RegisterCustomerController.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/RegisterCustomerController.java
similarity index 78%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/RegisterCustomerController.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/RegisterCustomerController.java
index 19214a9..2d8ae9e 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/RegisterCustomerController.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/RegisterCustomerController.java
@@ -1,8 +1,8 @@
-package de.strasser.peter.hexagonal.webadapter;
+package de.strasser.peter.hexagonal.web;
 
 import de.strasser.peter.hexagonal.application.customer.port.in.RegisterCustomerUseCase;
-import de.strasser.peter.hexagonal.webadapter.mapper.RegisterCustomerRequestMapper;
-import de.strasser.peter.hexagonal.webadapter.model.RegisterCustomerRequest;
+import de.strasser.peter.hexagonal.web.mapper.RegisterCustomerRequestMapper;
+import de.strasser.peter.hexagonal.web.model.RegisterCustomerRequest;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/config/WebConfig.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/config/WebConfig.java
similarity index 65%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/config/WebConfig.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/config/WebConfig.java
index 276c3f5..0dd9b19 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/config/WebConfig.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/config/WebConfig.java
@@ -1,4 +1,4 @@
-package de.strasser.peter.hexagonal.webadapter.config;
+package de.strasser.peter.hexagonal.web.config;
 
 import org.springframework.context.annotation.Configuration;
 
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/errors/ErrorHandling.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/errors/ErrorHandling.java
similarity index 94%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/errors/ErrorHandling.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/errors/ErrorHandling.java
index b521da9..548fcde 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/errors/ErrorHandling.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/errors/ErrorHandling.java
@@ -1,4 +1,4 @@
-package de.strasser.peter.hexagonal.webadapter.errors;
+package de.strasser.peter.hexagonal.web.errors;
 
 import de.strasser.peter.hexagonal.application.customer.exception.BusinessException;
 import lombok.Value;
@@ -38,7 +38,7 @@ public class ErrorHandling {
                     code.value(),
                     e.getClass().getName(),
                     e.getMessage(),
-                    req.getContextPath());
+                    req.getRequestURI());
             return ResponseEntity.status(code).body(errResponse);
         }
     }
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/mapper/AddAddressRequestMapper.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/mapper/AddAddressRequestMapper.java
similarity index 65%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/mapper/AddAddressRequestMapper.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/mapper/AddAddressRequestMapper.java
index e8a1fb2..7d3881d 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/mapper/AddAddressRequestMapper.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/mapper/AddAddressRequestMapper.java
@@ -1,7 +1,7 @@
-package de.strasser.peter.hexagonal.webadapter.mapper;
+package de.strasser.peter.hexagonal.web.mapper;
 
 import de.strasser.peter.hexagonal.application.customer.port.in.commands.AddAddressCommand;
-import de.strasser.peter.hexagonal.webadapter.model.AddAddressRequest;
+import de.strasser.peter.hexagonal.web.model.AddAddressRequest;
 import org.mapstruct.Mapper;
 
 @Mapper
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/mapper/RegisterCustomerRequestMapper.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/mapper/RegisterCustomerRequestMapper.java
similarity index 73%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/mapper/RegisterCustomerRequestMapper.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/mapper/RegisterCustomerRequestMapper.java
index afd2346..3e1dfa7 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/mapper/RegisterCustomerRequestMapper.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/mapper/RegisterCustomerRequestMapper.java
@@ -1,7 +1,7 @@
-package de.strasser.peter.hexagonal.webadapter.mapper;
+package de.strasser.peter.hexagonal.web.mapper;
 
 import de.strasser.peter.hexagonal.application.customer.port.in.commands.RegisterCustomerCommand;
-import de.strasser.peter.hexagonal.webadapter.model.RegisterCustomerRequest;
+import de.strasser.peter.hexagonal.web.model.RegisterCustomerRequest;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/model/AddAddressRequest.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/model/AddAddressRequest.java
similarity index 84%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/model/AddAddressRequest.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/model/AddAddressRequest.java
index d2c579a..bde6bf7 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/model/AddAddressRequest.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/model/AddAddressRequest.java
@@ -1,4 +1,4 @@
-package de.strasser.peter.hexagonal.webadapter.model;
+package de.strasser.peter.hexagonal.web.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/model/RegisterCustomerRequest.java b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/model/RegisterCustomerRequest.java
similarity index 83%
rename from adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/model/RegisterCustomerRequest.java
rename to adapter/web/src/main/java/de/strasser/peter/hexagonal/web/model/RegisterCustomerRequest.java
index 8e64f49..50edead 100644
--- a/adapter/web/src/main/java/de/strasser/peter/hexagonal/webadapter/model/RegisterCustomerRequest.java
+++ b/adapter/web/src/main/java/de/strasser/peter/hexagonal/web/model/RegisterCustomerRequest.java
@@ -1,4 +1,4 @@
-package de.strasser.peter.hexagonal.webadapter.model;
+package de.strasser.peter.hexagonal.web.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/application/src/main/java/de/strasser/peter/hexagonal/application/customer/exception/UserIsTooYoungExc.java b/application/src/main/java/de/strasser/peter/hexagonal/application/customer/exception/UserIsTooYoungExc.java
index 9265327..8c15f0b 100644
--- a/application/src/main/java/de/strasser/peter/hexagonal/application/customer/exception/UserIsTooYoungExc.java
+++ b/application/src/main/java/de/strasser/peter/hexagonal/application/customer/exception/UserIsTooYoungExc.java
@@ -4,6 +4,6 @@ import java.text.MessageFormat;
 
 public class UserIsTooYoungExc extends BusinessException {
     public UserIsTooYoungExc(int age) {
-        super(MessageFormat.format("Customer is too young. Expected: > 18 yrs, Actual {0}", age));
+        super(MessageFormat.format("Customer is too young. Expected: > 18 yrs, Actual: {0}", age));
     }
 }