diff --git a/test/src/main/java/org/springframework/ws/mock/client/AbstractResponseCreator.java b/test/src/main/java/org/springframework/ws/mock/client/AbstractResponseCreator.java
index 70cedca6..a23dc99a 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/AbstractResponseCreator.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/AbstractResponseCreator.java
@@ -35,7 +35,7 @@ import org.springframework.xml.transform.TransformerObjectSupport;
 abstract class AbstractResponseCreator<T extends WebServiceMessage> extends TransformerObjectSupport
         implements ResponseCreator<T> {
 
-    public final T createResponse(URI uri, T request, WebServiceMessageFactory<T> messageFactory) throws IOException {
+    public final T createResponse(URI uri, T request, WebServiceMessageFactory<? extends T> messageFactory) throws IOException {
         T response = messageFactory.createWebServiceMessage();
         doWithResponse(uri, request, response);
         return response;
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCreator.java b/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCreator.java
index cb6063c2..dba1d79e 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCreator.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCreator.java
@@ -39,7 +39,7 @@ class ErrorResponseCreator implements ResponseCreator<WebServiceMessage> {
 
     public WebServiceMessage createResponse(URI uri,
                                             WebServiceMessage request,
-                                            WebServiceMessageFactory<WebServiceMessage> factory) throws IOException {
+                                            WebServiceMessageFactory<? extends WebServiceMessage> factory) throws IOException {
         // Do nothing
         return null;
     }
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCreator.java b/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCreator.java
index 2bbbc9e9..91776f79 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCreator.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCreator.java
@@ -43,7 +43,7 @@ class ExceptionResponseCreator implements ResponseCreator<WebServiceMessage> {
 
     public WebServiceMessage createResponse(URI uri,
                                             WebServiceMessage request,
-                                            WebServiceMessageFactory<WebServiceMessage> factory) throws IOException {
+                                            WebServiceMessageFactory<? extends WebServiceMessage> factory) throws IOException {
         if (exception instanceof IOException) {
             throw (IOException) exception;
         }
diff --git a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
index e76d1f1b..43d33441 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
@@ -115,7 +115,7 @@ class MockSenderConnection implements FaultAwareWebServiceConnection, ResponseAc
     }
 
     public boolean hasFault() throws IOException {
-        return responseCreator instanceof SoapFaultResponseCallback;
+        return responseCreator instanceof SoapFaultResponseCreator;
     }
 
     public void setFault(boolean fault) throws IOException {
diff --git a/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCreator.java
similarity index 91%
rename from test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCreator.java
index 20efe588..4b93da9b 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCreator.java
@@ -29,11 +29,11 @@ import org.springframework.ws.WebServiceMessage;
  * @author Arjen Poutsma
  * @since 2.0
  */
-class PayloadResponseCallback extends AbstractResponseCreator<WebServiceMessage> {
+class PayloadResponseCreator extends AbstractResponseCreator<WebServiceMessage> {
 
     private final Source payload;
 
-    PayloadResponseCallback(Source payload) {
+    PayloadResponseCreator(Source payload) {
         this.payload = payload;
     }
 
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ResponseCreator.java b/test/src/main/java/org/springframework/ws/mock/client/ResponseCreator.java
index 5fbf78a7..d27c31b2 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/ResponseCreator.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/ResponseCreator.java
@@ -39,6 +39,6 @@ public interface ResponseCreator<T extends WebServiceMessage> {
      * @param messageFactory the message that can be used to create responses
      * @throws IOException in case of I/O errors
      */
-    T createResponse(URI uri, T request, WebServiceMessageFactory<T> messageFactory) throws IOException;
+    T createResponse(URI uri, T request, WebServiceMessageFactory<? extends T> messageFactory) throws IOException;
 
 }
diff --git a/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCreator.java
similarity index 79%
rename from test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
rename to test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCreator.java
index 049b0d5c..20b5ef67 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCreator.java
@@ -31,7 +31,7 @@ import static org.springframework.ws.mock.client.Assert.fail;
  * @author Arjen Poutsma
  * @since 2.0
  */
-abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMessage> {
+abstract class SoapFaultResponseCreator extends AbstractResponseCreator<SoapMessage> {
 
     @Override
     protected void doWithResponse(URI uri, SoapMessage request, SoapMessage response) throws IOException {
@@ -44,9 +44,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
 
     public abstract void addSoapFault(SoapBody soapBody);
 
-    public static SoapFaultResponseCallback createMustUnderstandFault(final String faultStringOrReason,
+    public static SoapFaultResponseCreator createMustUnderstandFault(final String faultStringOrReason,
                                                                       final Locale locale) {
-        return new SoapFaultResponseCallback() {
+        return new SoapFaultResponseCreator() {
             @Override
             public void addSoapFault(SoapBody soapBody) {
                 soapBody.addMustUnderstandFault(faultStringOrReason, locale);
@@ -55,9 +55,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
 
     }
 
-    public static SoapFaultResponseCallback createClientOrSenderFault(final String faultStringOrReason,
+    public static SoapFaultResponseCreator createClientOrSenderFault(final String faultStringOrReason,
                                                                       final Locale locale) {
-        return new SoapFaultResponseCallback() {
+        return new SoapFaultResponseCreator() {
             @Override
             public void addSoapFault(SoapBody soapBody) {
                 soapBody.addClientOrSenderFault(faultStringOrReason, locale);
@@ -65,9 +65,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
         };
     }
 
-    public static SoapFaultResponseCallback createServerOrReceiverFault(final String faultStringOrReason,
+    public static SoapFaultResponseCreator createServerOrReceiverFault(final String faultStringOrReason,
                                                                         final Locale locale) {
-        return new SoapFaultResponseCallback() {
+        return new SoapFaultResponseCreator() {
             @Override
             public void addSoapFault(SoapBody soapBody) {
                 soapBody.addServerOrReceiverFault(faultStringOrReason, locale);
@@ -76,9 +76,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
 
     }
 
-    public static SoapFaultResponseCallback createVersionMismatchFault(final String faultStringOrReason,
+    public static SoapFaultResponseCreator createVersionMismatchFault(final String faultStringOrReason,
                                                                        final Locale locale) {
-        return new SoapFaultResponseCallback() {
+        return new SoapFaultResponseCreator() {
             @Override
             public void addSoapFault(SoapBody soapBody) {
                 soapBody.addVersionMismatchFault(faultStringOrReason, locale);
diff --git a/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java b/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
index bed929c3..a1cf9695 100644
--- a/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
+++ b/test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
@@ -260,7 +260,7 @@ public abstract class WebServiceMock {
      */
     public static ResponseCreator withPayload(Source payload) {
         Assert.notNull(payload, "'payload' must not be null");
-        return new PayloadResponseCallback(payload);
+        return new PayloadResponseCreator(payload);
     }
 
     /**
@@ -271,7 +271,7 @@ public abstract class WebServiceMock {
      */
     public static ResponseCreator withPayload(Resource payload) {
         Assert.notNull(payload, "'payload' must not be null");
-        return new PayloadResponseCallback(createResourceSource(payload));
+        return new PayloadResponseCreator(createResourceSource(payload));
     }
 
     /**
@@ -318,7 +318,7 @@ public abstract class WebServiceMock {
      */
     public static ResponseCreator withMustUnderstandFault(String faultStringOrReason, Locale locale) {
         Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
-        return SoapFaultResponseCallback.createMustUnderstandFault(faultStringOrReason, locale);
+        return SoapFaultResponseCreator.createMustUnderstandFault(faultStringOrReason, locale);
     }
 
     /**
@@ -330,7 +330,7 @@ public abstract class WebServiceMock {
      */
     public static ResponseCreator withClientOrSenderFault(String faultStringOrReason, Locale locale) {
         Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
-        return SoapFaultResponseCallback.createClientOrSenderFault(faultStringOrReason, locale);
+        return SoapFaultResponseCreator.createClientOrSenderFault(faultStringOrReason, locale);
     }
 
     /**
@@ -342,7 +342,7 @@ public abstract class WebServiceMock {
      */
     public static ResponseCreator withServerOrReceiverFault(String faultStringOrReason, Locale locale) {
         Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
-        return SoapFaultResponseCallback.createServerOrReceiverFault(faultStringOrReason, locale);
+        return SoapFaultResponseCreator.createServerOrReceiverFault(faultStringOrReason, locale);
     }
 
     /**
@@ -354,7 +354,7 @@ public abstract class WebServiceMock {
      */
     public static ResponseCreator withVersionMismatchFault(String faultStringOrReason, Locale locale) {
         Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
-        return SoapFaultResponseCallback.createVersionMismatchFault(faultStringOrReason, locale);
+        return SoapFaultResponseCreator.createVersionMismatchFault(faultStringOrReason, locale);
     }
 
     // Verification
diff --git a/test/src/test/java/org/springframework/ws/mock/client/MockSenderConnectionTest.java b/test/src/test/java/org/springframework/ws/mock/client/MockSenderConnectionTest.java
index db34791c..ce447b1d 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/MockSenderConnectionTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/MockSenderConnectionTest.java
@@ -38,7 +38,7 @@ public class MockSenderConnectionTest {
     @Test
     public void normal() throws IOException {
         MockSenderConnection connection = new MockSenderConnection();
-        connection.andRespond(new PayloadResponseCallback(new StringSource("<response/>")));
+        connection.andRespond(new PayloadResponseCreator(new StringSource("<response/>")));
         assertFalse(connection.hasError());
         assertNull(connection.getErrorMessage());
     }
@@ -46,7 +46,7 @@ public class MockSenderConnectionTest {
     @Test(expected = AssertionError.class)
     public void noRequestMatchers() throws IOException {
         MockSenderConnection connection = new MockSenderConnection();
-        connection.andRespond(new PayloadResponseCallback(new StringSource("<response/>")));
+        connection.andRespond(new PayloadResponseCreator(new StringSource("<response/>")));
         connection.send(null);
     }
 }
diff --git a/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
index 1145d62e..21613d96 100644
--- a/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
+++ b/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
@@ -47,8 +47,8 @@ public class SoapFaultResponseCallbackTest {
     @Test
     public void clientOrSenderFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback =
-                SoapFaultResponseCallback.createClientOrSenderFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCreator callback =
+                SoapFaultResponseCreator.createClientOrSenderFault(faultString, Locale.ENGLISH);
 
         callback.doWithResponse(null, null, response);
 
@@ -63,8 +63,8 @@ public class SoapFaultResponseCallbackTest {
     @Test
     public void mustUnderstandFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback =
-                SoapFaultResponseCallback.createMustUnderstandFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCreator callback =
+                SoapFaultResponseCreator.createMustUnderstandFault(faultString, Locale.ENGLISH);
 
         callback.doWithResponse(null, null, response);
 
@@ -79,8 +79,8 @@ public class SoapFaultResponseCallbackTest {
     @Test
     public void serverOrReceiverFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback =
-                SoapFaultResponseCallback.createServerOrReceiverFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCreator callback =
+                SoapFaultResponseCreator.createServerOrReceiverFault(faultString, Locale.ENGLISH);
 
         callback.doWithResponse(null, null, response);
 
@@ -95,8 +95,8 @@ public class SoapFaultResponseCallbackTest {
     @Test
     public void versionMismatchFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback =
-                SoapFaultResponseCallback.createVersionMismatchFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCreator callback =
+                SoapFaultResponseCreator.createVersionMismatchFault(faultString, Locale.ENGLISH);
 
         callback.doWithResponse(null, null, response);