diff --git a/application/src/main/java/org/gxf/soapbridge/application/configuration/SoapConfiguration.java b/application/src/main/java/org/gxf/soapbridge/application/configuration/SoapEndpointMapping.java
similarity index 83%
rename from application/src/main/java/org/gxf/soapbridge/application/configuration/SoapConfiguration.java
rename to application/src/main/java/org/gxf/soapbridge/application/configuration/SoapEndpointMapping.java
index ac1279b..81136a8 100644
--- a/application/src/main/java/org/gxf/soapbridge/application/configuration/SoapConfiguration.java
+++ b/application/src/main/java/org/gxf/soapbridge/application/configuration/SoapEndpointMapping.java
@@ -11,10 +11,10 @@
 import org.springframework.web.servlet.handler.AbstractHandlerMapping;
 
 @Component
-public class SoapConfiguration extends AbstractHandlerMapping {
+public class SoapEndpointMapping extends AbstractHandlerMapping {
   private final SoapEndpoint soapEndpoint;
 
-  public SoapConfiguration(final SoapEndpoint soapEndpoint) {
+  public SoapEndpointMapping(final SoapEndpoint soapEndpoint) {
     this.soapEndpoint = soapEndpoint;
   }