diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiHandlerParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiHandlerParserTests.xml
index c0086b1c91..4107f76495 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiHandlerParserTests.xml
+++ b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/rmiHandlerParserTests.xml
@@ -11,7 +11,7 @@
 
 	<channel id="localChannel"/>
 
-	<handler-endpoint input-channel="localChannel" ref="handler"/>
+	<service-activator input-channel="localChannel" ref="handler"/>
 
 	<rmi-handler id="handler" remote-channel="testChannel" host="localhost"/>
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultHandlerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultHandlerEndpointParser.java
deleted file mode 100644
index 62698b3846..0000000000
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultHandlerEndpointParser.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.config;
-
-import org.springframework.integration.handler.DefaultMessageHandlerAdapter;
-import org.springframework.integration.handler.MessageHandler;
-
-/**
- * @author Mark Fisher
- */
-public class DefaultHandlerEndpointParser extends AbstractHandlerEndpointParser {
-
-	@Override
-	protected Class<? extends MessageHandler> getHandlerAdapterClass() {
-		return DefaultMessageHandlerAdapter.class;
-	}
-
-}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
index 0ae596cc50..8fec84e14c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
@@ -61,7 +61,6 @@ public class IntegrationNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("priority-channel", new PriorityChannelParser());
 		registerBeanDefinitionParser("rendezvous-channel", new RendezvousChannelParser());
 		registerBeanDefinitionParser("thread-local-channel", new ThreadLocalChannelParser());
-		registerBeanDefinitionParser("handler-endpoint", new DefaultHandlerEndpointParser());
 		registerBeanDefinitionParser("service-activator", new ServiceActivatorParser());
 		registerBeanDefinitionParser("channel-adapter", new ChannelAdapterParser());
 		registerBeanDefinitionParser("gateway", new GatewayParser());
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
index 31ccfb5f91..1f6dc3576c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
@@ -203,14 +203,6 @@
 		</xsd:annotation>
 	</xsd:element>
 
-	<xsd:element name="handler-endpoint" type="inputOutputHandlerEndpointType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an endpoint for a MessageHandler.
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-
 	<xsd:complexType name="inputOutputHandlerEndpointType">
 		<xsd:annotation>
 			<xsd:documentation>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/handlerAnnotationPostProcessorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/handlerAnnotationPostProcessorTests.xml
index 19379dad8f..2116d70e45 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/handlerAnnotationPostProcessorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/handlerAnnotationPostProcessorTests.xml
@@ -12,7 +12,7 @@
 	<channel id="inputChannel"/>
 	<channel id="outputChannel"/>
 
-	<handler-endpoint input-channel="inputChannel" ref="simpleHandler" output-channel="outputChannel"/>
+	<service-activator input-channel="inputChannel" ref="simpleHandler" output-channel="outputChannel"/>
 
 	<beans:bean class="org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor">
 		<beans:constructor-arg ref="internal.MessageBus"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
index bff19a71c6..b49e67a9f2 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
@@ -11,7 +11,7 @@
 
 	<channel id="testChannel"/>
 
-	<handler-endpoint id="endpoint" input-channel="testChannel" handler="testHandler" error-handler="errorHandler"/>
+	<service-activator id="endpoint" input-channel="testChannel" ref="testHandler" error-handler="errorHandler"/>
 
 	<beans:bean id="testHandler" class="org.springframework.integration.config.ExceptionThrowingTestHandler"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
index e92b9ba6a1..7db153c6cd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml
@@ -19,9 +19,9 @@
 		<handler ref="handler3"/>
 	</handler-chain>
 
-	<handler-endpoint input-channel="testChannel" ref="chain" output-channel="replyChannel">
+	<service-activator input-channel="testChannel" ref="chain" output-channel="replyChannel">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="handler1" class="org.springframework.integration.config.TestConcatenatingHandler">
 		<beans:constructor-arg value="-1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
index 51753dd386..4f5c4d78f4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
@@ -11,10 +11,10 @@
 
 	<queue-channel id="testChannel" capacity="50"/>
 
-	<handler-endpoint id="endpoint" input-channel="testChannel"
+	<service-activator id="endpoint" input-channel="testChannel"
 	                  ref="testHandler" selector="typeSelector">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="typeSelector" class="org.springframework.integration.message.selector.PayloadTypeSelector">
 		<beans:constructor-arg value="java.lang.String"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
index d1327fd0bc..10b9613034 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
@@ -11,9 +11,9 @@
 
 	<queue-channel id="testChannel" capacity="50"/>
 
-	<handler-endpoint input-channel="testChannel" ref="testBean" method="store">
+	<service-activator input-channel="testChannel" ref="testBean" method="store">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="testBean" class="org.springframework.integration.config.TestBean">
 		<beans:constructor-arg value="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index 66f2f826f9..827d49c7ec 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -11,9 +11,9 @@
 
 	<queue-channel id="testChannel" capacity="50"/>
 
-	<handler-endpoint input-channel="testChannel" ref="testHandler">
+	<service-activator input-channel="testChannel" ref="testHandler">
 		<schedule period="100"/>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
 		<beans:constructor-arg value="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorPropagationTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorPropagationTests.xml
index f80db357fa..10434ba1c6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorPropagationTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorPropagationTests.xml
@@ -12,7 +12,7 @@
 	<channel id="input"/>
 	<channel id="output"/>
 
-	<handler-endpoint id="required"
+	<service-activator id="required"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -21,9 +21,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="REQUIRED"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="requiresNew"
+	<service-activator id="requiresNew"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -32,9 +32,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="REQUIRES_NEW"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="supports"
+	<service-activator id="supports"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -43,9 +43,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="SUPPORTS"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="notSupported"
+	<service-activator id="notSupported"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -54,9 +54,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="NOT_SUPPORTED"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint id="mandatory"
+	<service-activator id="mandatory"
 	                  input-channel="input"
 	                  ref="testBean"
 	                  method="good"
@@ -65,7 +65,7 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="MANDATORY"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
 	<beans:bean id="testBean" class="org.springframework.integration.endpoint.interceptor.TestBean"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorTests.xml
index 02b8400d35..56be721c69 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/interceptor/transactionInterceptorTests.xml
@@ -13,7 +13,7 @@
 	<channel id="goodInput"/>
 	<channel id="output"/>
 
-	<handler-endpoint input-channel="badInput"
+	<service-activator input-channel="badInput"
 	                  ref="testBean"
 	                  method="bad"
                       output-channel="output">
@@ -21,9 +21,9 @@
     	<interceptors>
 			<transaction-interceptor transaction-manager="txManager"/>
     	</interceptors>
-    </handler-endpoint>
+    </service-activator>
 
-	<handler-endpoint input-channel="goodInput"
+	<service-activator input-channel="goodInput"
 	                  ref="testBean"
 	                  method="good"
                       output-channel="output">
@@ -31,7 +31,7 @@
 		<interceptors>
 			<transaction-interceptor transaction-manager="txManager" propagation="REQUIRED"/>
 		</interceptors>
-	</handler-endpoint>
+	</service-activator>
 
 	<beans:bean id="testBean" class="org.springframework.integration.endpoint.interceptor.TestBean"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
index e0e0143d86..5d46ebaab6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
@@ -11,7 +11,7 @@
 
 	<channel id="requestChannel"/>
 
-	<handler-endpoint ref="handler" input-channel="requestChannel"/>
+	<service-activator ref="handler" input-channel="requestChannel"/>
 
 	<beans:bean id="proxy" class="org.springframework.integration.gateway.GatewayProxyFactoryBean">
 		<beans:property name="serviceInterface" value="org.springframework.integration.gateway.TestService"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
index cd57632c47..50283b97fa 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
@@ -15,7 +15,7 @@
 		<interceptor ref="interceptor"/>
 	</channel>
 
-	<handler-endpoint ref="handler" input-channel="requestChannel"/>
+	<service-activator ref="handler" input-channel="requestChannel"/>
 
 	<beans:bean id="proxy" class="org.springframework.integration.gateway.GatewayProxyFactoryBean">
 		<beans:property name="serviceInterface" value="org.springframework.integration.gateway.TestService"/>