diff --git a/tests/auto_build/testcases/client/c/RpcHttpHeaderTest2Client.c b/tests/auto_build/testcases/client/c/RpcHttpHeaderTest2Client.c
index 7c12408..664fafa 100644
--- a/tests/auto_build/testcases/client/c/RpcHttpHeaderTest2Client.c
+++ b/tests/auto_build/testcases/client/c/RpcHttpHeaderTest2Client.c
@@ -59,8 +59,8 @@
 
     //set HTTP headers
     axiscStubSetTransportProperty(ws,"Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    axiscStubSetTransportProperty(ws,"Accept-Language", "lang2");
-    axiscStubSetTransportProperty(ws,"Accept-Language", "lang3");
+    axiscStubSetTransportProperty(ws,"Accept-Language2", "lang2");
+    axiscStubSetTransportProperty(ws,"Accept-Language3", "lang3");
     axiscStubSetTransportProperty(ws,"Date", "Sat, 26 Jun 2004 13:32:19 GMT");
 
     printf( "invoking echoString...\n" );
diff --git a/tests/auto_build/testcases/client/c/RpcHttpHeaderTest3Client.c b/tests/auto_build/testcases/client/c/RpcHttpHeaderTest3Client.c
index f284d2f..cccadf4 100644
--- a/tests/auto_build/testcases/client/c/RpcHttpHeaderTest3Client.c
+++ b/tests/auto_build/testcases/client/c/RpcHttpHeaderTest3Client.c
@@ -61,8 +61,8 @@
 
     //set HTTP headers
     axiscStubSetTransportProperty(ws,"Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    axiscStubSetTransportProperty(ws,"Accept-Language", "lang2");
-    axiscStubSetTransportProperty(ws,"Accept-Language", "lang3");
+    axiscStubSetTransportProperty(ws,"Accept-Language2", "lang2");
+    axiscStubSetTransportProperty(ws,"Accept-Language3", "lang3");
 
     printf( "invoking echoString...\n" );
 
diff --git a/tests/auto_build/testcases/client/c/RpcHttpHeaderTest4Client.c b/tests/auto_build/testcases/client/c/RpcHttpHeaderTest4Client.c
index 7159b35..b335384 100644
--- a/tests/auto_build/testcases/client/c/RpcHttpHeaderTest4Client.c
+++ b/tests/auto_build/testcases/client/c/RpcHttpHeaderTest4Client.c
@@ -60,9 +60,9 @@
 
     //set HTTP headers
     axiscStubSetTransportProperty(ws,"Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    axiscStubSetTransportProperty(ws,"Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    axiscStubSetTransportProperty(ws,"Accept-Language", "lang2");
-    axiscStubSetTransportProperty(ws,"Accept-Language", "lang2");
+    axiscStubSetTransportProperty(ws,"Accept-Language1", " da, en-gb;q=0.8, en;q=0.7");
+    axiscStubSetTransportProperty(ws,"Accept-Language2", "lang2");
+    axiscStubSetTransportProperty(ws,"Accept-Language3", "lang3");
 
     printf( "invoking echoString...\n" );
 
diff --git a/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest2Client.cpp b/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest2Client.cpp
index 7e65375..bef2776 100644
--- a/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest2Client.cpp
+++ b/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest2Client.cpp
@@ -64,8 +64,8 @@
 
     //set HTTP headers
     ws.setTransportProperty("Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    ws.setTransportProperty("Accept-Language", "lang2");
-    ws.setTransportProperty("Accept-Language", "lang3");
+    ws.setTransportProperty("Accept-Language2", "lang2");
+    ws.setTransportProperty("Accept-Language3", "lang3");
     ws.setTransportProperty("Date", "Sat, 26 Jun 2004 13:32:19 GMT");
 
     cout << "invoking echoString..." << endl;
diff --git a/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest3Client.cpp b/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest3Client.cpp
index b0b4cab..bfbe2ca 100644
--- a/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest3Client.cpp
+++ b/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest3Client.cpp
@@ -63,8 +63,8 @@
 
     //set HTTP headers
     ws.setTransportProperty("Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    ws.setTransportProperty("Accept-Language", "lang2");
-    ws.setTransportProperty("Accept-Language", "lang3");
+    ws.setTransportProperty("Accept-Language2", "lang2");
+    ws.setTransportProperty("Accept-Language3", "lang3");
 
     cout << "invoking echoString..." << endl;
     //testing echoString
diff --git a/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest4Client.cpp b/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest4Client.cpp
index 79d5e7d..3259f9f 100644
--- a/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest4Client.cpp
+++ b/tests/auto_build/testcases/client/cpp/RpcHttpHeaderTest4Client.cpp
@@ -62,9 +62,9 @@
 
     //set HTTP headers
     ws.setTransportProperty("Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    ws.setTransportProperty("Accept-Language", " da, en-gb;q=0.8, en;q=0.7");
-    ws.setTransportProperty("Accept-Language", "lang2");
-    ws.setTransportProperty("Accept-Language", "lang2");
+    ws.setTransportProperty("Accept-Language1", " da, en-gb;q=0.8, en;q=0.7");
+    ws.setTransportProperty("Accept-Language2", "lang2");
+    ws.setTransportProperty("Accept-Language3", "lang3");
 
     cout << "invoking echoString..." << endl;
     //testing echoString
diff --git a/tests/auto_build/testcases/output/RpcHttpHeaderTest2.cpp.out b/tests/auto_build/testcases/output/RpcHttpHeaderTest2.cpp.out
index 9de237b..d571fb6 100644
--- a/tests/auto_build/testcases/output/RpcHttpHeaderTest2.cpp.out
+++ b/tests/auto_build/testcases/output/RpcHttpHeaderTest2.cpp.out
@@ -3,9 +3,9 @@
 Test transport property accessors
 First transport key = Accept-Language
 First transport value =  da, en-gb;q=0.8, en;q=0.7
-Next transport key = Accept-Language
+Next transport key = Accept-Language2
 Next transport value = lang2
-Next transport key = Accept-Language
+Next transport key = Accept-Language3
 Next transport value = lang3
 Next transport key = Date
 Next transport value = Sat, 26 Jun 2004 13:32:19 GMT
diff --git a/tests/auto_build/testcases/output/RpcHttpHeaderTest3.cpp.out b/tests/auto_build/testcases/output/RpcHttpHeaderTest3.cpp.out
index fd111e9..0dea276 100644
--- a/tests/auto_build/testcases/output/RpcHttpHeaderTest3.cpp.out
+++ b/tests/auto_build/testcases/output/RpcHttpHeaderTest3.cpp.out
@@ -3,9 +3,9 @@
 Test transport property accessors
 First transport key = Accept-Language
 First transport value =  da, en-gb;q=0.8, en;q=0.7
-Next transport key = Accept-Language
+Next transport key = Accept-Language2
 Next transport value = lang2
-Next transport key = Accept-Language
+Next transport key = Accept-Language3
 Next transport value = lang3
 Next transport key = Content-Length
 Next transport value = 405
diff --git a/tests/auto_build/testcases/output/RpcHttpHeaderTest4.cpp.out b/tests/auto_build/testcases/output/RpcHttpHeaderTest4.cpp.out
index dcf240a..925b2a4 100644
--- a/tests/auto_build/testcases/output/RpcHttpHeaderTest4.cpp.out
+++ b/tests/auto_build/testcases/output/RpcHttpHeaderTest4.cpp.out
@@ -3,12 +3,12 @@
 Test transport property accessors
 First transport key = Accept-Language
 First transport value =  da, en-gb;q=0.8, en;q=0.7
-Next transport key = Accept-Language
+Next transport key = Accept-Language1
 Next transport value =  da, en-gb;q=0.8, en;q=0.7
-Next transport key = Accept-Language
+Next transport key = Accept-Language2
 Next transport value = lang2
-Next transport key = Accept-Language
-Next transport value = lang2
+Next transport key = Accept-Language3
+Next transport value = lang3
 Next transport key = Content-Length
 Next transport value = 405
 successful
diff --git a/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected b/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected
index c7b7491..d7f6c4e 100644
--- a/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected
+++ b/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected
@@ -23,7 +23,7 @@
 POST /axis/ValidXMLCharIsInterpretedAsCPPCommand HTTP/1.1
 Host: 127.0.0.1:13260
 Content-Type: text/xml; charset=UTF-8
-SOAPAction: "ValidXMLCharIsInterpretedAsCPPCommand#test1"
+SOAPAction: "ValidXMLCharIsInterpretedAsCPPCommand#Test1WithComplexResponse"
 Content-Length: 840
 
 <?xml version='1.0' encoding='utf-8' ?>