diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/handler/AbstractWebServiceHandler.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/handler/AbstractWebServiceHandler.java
index fb41e8165c..0afd0c44d1 100644
--- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/handler/AbstractWebServiceHandler.java
+++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/handler/AbstractWebServiceHandler.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.net.URI;
 
 import org.springframework.integration.endpoint.AbstractInOutEndpoint;
-import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.util.Assert;
@@ -33,7 +32,7 @@ import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.client.core.SoapActionCallback;
 
 /**
- * Base class for Web Service {@link MessageHandler} adapters.
+ * Base class for outbound Web Service-invoking adapters.
  * 
  * @author Mark Fisher
  */
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
index a8ce3ccd13..85abac8b86 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/marshallingWebServiceHandlerParserTests.xml
@@ -7,30 +7,37 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd">
 
-	<si:ws-handler id="handlerWithAllInOneMarshaller"
-	               uri="http://example.org"
-	               marshaller="marshallerAndUnmarshaller"/>
+	<si:channel id="inputChannel"/>
 
-	<si:ws-handler id="handlerWithSeparateMarshallerAndUnmarshaller"
-	               uri="http://example.org"
-	               marshaller="marshaller"
-	               unmarshaller="unmarshaller"/>
+	<si:ws-service-activator id="handlerWithAllInOneMarshaller"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         marshaller="marshallerAndUnmarshaller"/>
 
-	<si:ws-handler id="handlerWithCustomRequestCallback"
-	               uri="http://example.org"
-	               marshaller="marshallerAndUnmarshaller"
-	               request-callback="requestCallback"/>
+	<si:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshaller"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         marshaller="marshaller"
+	                         unmarshaller="unmarshaller"/>
 
-	<si:ws-handler id="handlerWithAllInOneMarshallerAndMessageFactory"
-	               uri="http://example.org"
-	               marshaller="marshallerAndUnmarshaller"
-	               message-factory="messageFactory"/>
+	<si:ws-service-activator id="handlerWithCustomRequestCallback"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         marshaller="marshallerAndUnmarshaller"
+	                         request-callback="requestCallback"/>
 
-	<si:ws-handler id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
-	               uri="http://example.org"
-	               marshaller="marshaller"
-	               unmarshaller="unmarshaller"
-	               message-factory="messageFactory"/>
+	<si:ws-service-activator id="handlerWithAllInOneMarshallerAndMessageFactory"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         marshaller="marshallerAndUnmarshaller"
+	                         message-factory="messageFactory"/>
+
+	<si:ws-service-activator id="handlerWithSeparateMarshallerAndUnmarshallerAndMessageFactory"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         marshaller="marshaller"
+	                         unmarshaller="unmarshaller"
+	                         message-factory="messageFactory"/>
 
 	<bean id="marshallerAndUnmarshaller" class="org.springframework.integration.ws.config.StubMarshallerAndUnmarshaller"/>
 
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
index b499d6829a..ea5d634970 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml
@@ -7,29 +7,37 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-ws-1.0.xsd">
 
-	<si:ws-handler id="handlerWithDefaultSourceExtractor"
-	               uri="http://example.org"/>
+	<si:channel id="inputChannel"/>
 
-	<si:ws-handler id="handlerWithCustomSourceExtractor"
-	               uri="http://example.org"
-	               source-extractor="sourceExtractor"/>
+	<si:ws-service-activator id="handlerWithDefaultSourceExtractor"
+		                     input-channel="inputChannel"
+	                         uri="http://example.org"/>
 
-	<si:ws-handler id="handlerWithCustomRequestCallback"
-	               uri="http://example.org"
-	               request-callback="requestCallback"/>
+	<si:ws-service-activator id="handlerWithCustomSourceExtractor"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         source-extractor="sourceExtractor"/>
 
-	<si:ws-handler id="handlerWithCustomMessageFactory"
-	               uri="http://example.org"
-	               message-factory="messageFactory"/>
+	<si:ws-service-activator id="handlerWithCustomRequestCallback"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         request-callback="requestCallback"/>
 
-	<si:ws-handler id="handlerWithCustomSourceExtractorAndMessageFactory"
-	               uri="http://example.org"
-	               source-extractor="sourceExtractor"
-	               message-factory="messageFactory"/>
+	<si:ws-service-activator id="handlerWithCustomMessageFactory"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         message-factory="messageFactory"/>
 
-	<si:ws-handler id="handlerWithCustomFaultMessageResolver"
-	               uri="http://example.org"
-	               fault-message-resolver="faultMessageResolver"/>
+	<si:ws-service-activator id="handlerWithCustomSourceExtractorAndMessageFactory"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         source-extractor="sourceExtractor"
+	                         message-factory="messageFactory"/>
+
+	<si:ws-service-activator id="handlerWithCustomFaultMessageResolver"
+	                         input-channel="inputChannel"
+	                         uri="http://example.org"
+	                         fault-message-resolver="faultMessageResolver"/>
 
 	<bean id="sourceExtractor" class="org.springframework.integration.ws.config.StubSourceExtractor"/>