Index: /trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/eventcore/SOAPEventTypeTest.java
===================================================================
--- /trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/eventcore/SOAPEventTypeTest.java	(revision 1909)
+++ /trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/eventcore/SOAPEventTypeTest.java	(revision 1910)
@@ -112,5 +112,5 @@
         SOAPMessage dummyMessage = createDummySOAPMessage();
         Properties properties = new Properties();
-        properties.put("clientName.receiver.receiver", "replacedSender");
+        properties.put("clientName.receiver.server.receiver", "replacedSender");
         
         SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
@@ -127,5 +127,5 @@
         SOAPMessage dummyMessage = createDummySOAPMessage();
         Properties properties = new Properties();
-        properties.put("clientName.receiver.receiver:5678", "replacedSender");
+        properties.put("clientName.receiver.server.receiver:5678", "replacedSender");
         
         SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
@@ -142,4 +142,19 @@
         SOAPMessage dummyMessage = createDummySOAPMessage();
         Properties properties = new Properties();
+        properties.put("clientName.receiver.port.5678", "replacedSender");
+        
+        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
+        
+        assertEquals("replacedSender", fixture.getClientName());
+    }
+
+    /**
+     * 
+     */
+    @Test
+    public void test_ClientName_08() throws Exception {
+        HttpExchange exchange = createDummyExchange();
+        SOAPMessage dummyMessage = createDummySOAPMessage();
+        Properties properties = new Properties();
         properties.put("clientName.sender.othersender", "replacedSender");
         
@@ -153,5 +168,5 @@
      */
     @Test
-    public void test_ClientName_08() throws Exception {
+    public void test_ClientName_09() throws Exception {
         HttpExchange exchange = createDummyExchange();
         SOAPMessage dummyMessage = createDummySOAPMessage();
@@ -168,24 +183,39 @@
      */
     @Test
-    public void test_ClientName_09() throws Exception {
-        HttpExchange exchange = createDummyExchange();
-        SOAPMessage dummyMessage = createDummySOAPMessage();
-        Properties properties = new Properties();
-        properties.put("clientName.receiver.otherreceiver", "replacedSender");
-        
-        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
-        
-        assertEquals("sender:1234", fixture.getClientName());
-    }
-
-    /**
-     * 
-     */
-    @Test
     public void test_ClientName_10() throws Exception {
         HttpExchange exchange = createDummyExchange();
         SOAPMessage dummyMessage = createDummySOAPMessage();
         Properties properties = new Properties();
-        properties.put("clientName.receiver.otherreceiver:5678", "replacedSender");
+        properties.put("clientName.receiver.server.otherreceiver", "replacedSender");
+        
+        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
+        
+        assertEquals("sender:1234", fixture.getClientName());
+    }
+
+    /**
+     * 
+     */
+    @Test
+    public void test_ClientName_11() throws Exception {
+        HttpExchange exchange = createDummyExchange();
+        SOAPMessage dummyMessage = createDummySOAPMessage();
+        Properties properties = new Properties();
+        properties.put("clientName.receiver.server.otherreceiver:5678", "replacedSender");
+        
+        SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
+        
+        assertEquals("sender:1234", fixture.getClientName());
+    }
+
+    /**
+     * 
+     */
+    @Test
+    public void test_ClientName_12() throws Exception {
+        HttpExchange exchange = createDummyExchange();
+        SOAPMessage dummyMessage = createDummySOAPMessage();
+        Properties properties = new Properties();
+        properties.put("clientName.receiver.port.5679", "replacedSender");
         
         SOAPEventType fixture = new SOAPEventType(exchange, dummyMessage, null, properties);
Index: /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java
===================================================================
--- /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java	(revision 1909)
+++ /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SOAPEventType.java	(revision 1910)
@@ -131,5 +131,5 @@
             
             if (value == null) {
-                key = "clientName.receiver." + exchange.getReceiver().getHost();
+                key = "clientName.receiver.server." + exchange.getReceiver().getHost();
                 value = urlNameMap.getProperty(key);
             }
@@ -137,4 +137,9 @@
             if (value == null) {
                 key += ":" + exchange.getReceiver().getPort();
+                value = urlNameMap.getProperty(key);
+            }
+            
+            if (value == null) {
+                key = "clientName.receiver.port." + exchange.getReceiver().getPort();
                 value = urlNameMap.getProperty(key);
             }