diff --git a/test/src/main/java/org/springframework/ws/mock/client2/DiffMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/DiffMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/DiffMatcher.java
rename to test/src/main/java/org/springframework/ws/mock/client/DiffMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/ErrorResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/ErrorResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/ExceptionResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/ExceptionResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/MockSenderConnection.java b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/MockSenderConnection.java
rename to test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/MockWebServiceMessageSender.java b/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/MockWebServiceMessageSender.java
rename to test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/MockWebServiceMessageSenderHolder.java b/test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderHolder.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/MockWebServiceMessageSenderHolder.java
rename to test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderHolder.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/PayloadMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/PayloadMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/PayloadMatcher.java
rename to test/src/main/java/org/springframework/ws/mock/client/PayloadMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/PayloadResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/PayloadResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/RequestMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/RequestMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/RequestMatcher.java
rename to test/src/main/java/org/springframework/ws/mock/client/RequestMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/ResponseActions.java b/test/src/main/java/org/springframework/ws/mock/client/ResponseActions.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/ResponseActions.java
rename to test/src/main/java/org/springframework/ws/mock/client/ResponseActions.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/ResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/ResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/SoapFaultResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/SoapFaultResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/SoapHeaderMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/SoapHeaderMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/SoapHeaderMatcher.java
rename to test/src/main/java/org/springframework/ws/mock/client/SoapHeaderMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/UriMatcher.java b/test/src/main/java/org/springframework/ws/mock/client/UriMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/UriMatcher.java
rename to test/src/main/java/org/springframework/ws/mock/client/UriMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/mock/client2/WebServiceMock.java b/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/mock/client2/WebServiceMock.java
rename to test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/ExceptionResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/ExceptionResponseCallbackTest.java
rename to test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/PayloadMatcherTest.java b/test/src/test/java/org/springframework/ws/mock/client/PayloadMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/PayloadMatcherTest.java
rename to test/src/test/java/org/springframework/ws/mock/client/PayloadMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/SoapFaultResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/SoapFaultResponseCallbackTest.java
rename to test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/SoapHeaderMatcherTest.java b/test/src/test/java/org/springframework/ws/mock/client/SoapHeaderMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/SoapHeaderMatcherTest.java
rename to test/src/test/java/org/springframework/ws/mock/client/SoapHeaderMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/WebServiceMockTest.java b/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/WebServiceMockTest.java
rename to test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/integration/CustomerCountRequest.java b/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountRequest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/integration/CustomerCountRequest.java
rename to test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountRequest.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/integration/CustomerCountResponse.java b/test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountResponse.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/integration/CustomerCountResponse.java
rename to test/src/test/java/org/springframework/ws/mock/client/integration/CustomerCountResponse.java
diff --git a/test/src/test/java/org/springframework/ws/mock/client2/integration/IntegrationTest.java b/test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/mock/client2/integration/IntegrationTest.java
rename to test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java
diff --git a/test/src/test/resources/org/springframework/ws/mock/client2/integration/integration-test.xml b/test/src/test/resources/org/springframework/ws/mock/client/integration/integration-test.xml
similarity index 100%
rename from test/src/test/resources/org/springframework/ws/mock/client2/integration/integration-test.xml
rename to test/src/test/resources/org/springframework/ws/mock/client/integration/integration-test.xml