diff --git a/core/src/main/java/org/springframework/ws/transport/ServerTransportObjectSupport.java b/core/src/main/java/org/springframework/ws/transport/ReceiverObjectSupport.java
similarity index 82%
rename from core/src/main/java/org/springframework/ws/transport/ServerTransportObjectSupport.java
rename to core/src/main/java/org/springframework/ws/transport/ReceiverObjectSupport.java
index 78b9d76e..14996790 100644
--- a/core/src/main/java/org/springframework/ws/transport/ServerTransportObjectSupport.java
+++ b/core/src/main/java/org/springframework/ws/transport/ReceiverObjectSupport.java
@@ -34,7 +34,7 @@ import org.springframework.ws.endpoint.MessageEndpoint;
  * @author Arjen Poutsma
  * @see #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)
  */
-public abstract class ServerTransportObjectSupport implements InitializingBean {
+public abstract class ReceiverObjectSupport implements InitializingBean {
 
     /**
      * Logger available to subclasses.
@@ -87,8 +87,9 @@ public abstract class ServerTransportObjectSupport implements InitializingBean {
     }
 
     /**
-     * Invoked from <code>handle()</code> when no response is given. Default implementation does nothing. Can be
-     * overriden to set certain transport-specific headers.
+     * Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)}
+     * when no response is given. Default implementation does nothing. Can be overriden to set certain
+     * transport-specific response headers.
      *
      * @param tis the transport input stream
      * @param tos the transport output stream
@@ -97,9 +98,9 @@ public abstract class ServerTransportObjectSupport implements InitializingBean {
     }
 
     /**
-     * Handles the sending of the response. Invoked from <code>handle()</code>. Default implementation writes the given
-     * response to the given <code>TransportOutputStream</code>. Can be overriden to set certain transport-specific
-     * headers.
+     * Handles the sending of the response. Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)}.
+     * Default implementation writes the given response to the given <code>TransportOutputStream</code>. Can be
+     * overriden to set certain transport-specific headers.
      *
      * @param tis      the transport input stream
      * @param tos      the transport output stream
@@ -112,8 +113,9 @@ public abstract class ServerTransportObjectSupport implements InitializingBean {
     }
 
     /**
-     * Invoked when no suitable endpoint is found. Default implementation does nothing. Can be overriden to set certain
-     * transport-specific headers.
+     * Invoked from {@link #handle(TransportInputStream,TransportOutputStream,org.springframework.ws.endpoint.MessageEndpoint)}
+     * when no suitable endpoint is found. Default implementation does nothing. Can be overriden to set certain
+     * transport-specific response headers.
      *
      * @param tis the transport input stream
      * @param tos the transport output stream
diff --git a/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java b/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java
index 92f44041..28ef1639 100644
--- a/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java
+++ b/core/src/main/java/org/springframework/ws/transport/http/MessageEndpointHandlerAdapter.java
@@ -25,7 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.endpoint.MessageEndpoint;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.transport.ServerTransportObjectSupport;
+import org.springframework.ws.transport.ReceiverObjectSupport;
 import org.springframework.ws.transport.TransportInputStream;
 import org.springframework.ws.transport.TransportOutputStream;
 
@@ -44,7 +44,7 @@ import org.springframework.ws.transport.TransportOutputStream;
  * @see org.springframework.ws.endpoint.MessageEndpoint
  * @see org.springframework.ws.MessageDispatcher
  */
-public class MessageEndpointHandlerAdapter extends ServerTransportObjectSupport implements HandlerAdapter {
+public class MessageEndpointHandlerAdapter extends ReceiverObjectSupport implements HandlerAdapter {
 
     public long getLastModified(HttpServletRequest request, Object handler) {
         return -1L;