diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
index c8f903c49a..b818e53a87 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
@@ -9,10 +9,10 @@
 
 	<message-bus auto-create-channels="true"/>
 
-	<handler-endpoint input-channel="inputChannel"
-	          output-channel="outputChannel"
-	          ref="helloService"
-	          method="sayHello"/>
+	<service-activator input-channel="inputChannel"
+	                   output-channel="outputChannel"
+	                   ref="helloService"
+	                   method="sayHello"/>
 
 	<beans:bean id="helloService" class="org.springframework.integration.samples.helloworld.HelloService"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
index 565dcc3daf..c44886aad2 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
@@ -12,11 +12,11 @@
 	<channel id="fahrenheitChannel"/>
 	<channel id="celsiusChannel"/>
 
-	<!-- The handler endpoint receives from the 'fahrenheitChannel',
+	<!-- The service activator receives from the 'fahrenheitChannel',
 	     invokes the handler, and sends the reply Message to the 'celsiusChannel'. -->
-	<handler-endpoint input-channel="fahrenheitChannel"
-	                  ref="temperatureConverter"
-	                  output-channel="celsiusChannel"/>
+	<service-activator input-channel="fahrenheitChannel"
+	                   ref="temperatureConverter"
+	                   output-channel="celsiusChannel"/>
 
 	<!-- The handler invokes the WebService for the given URI and returns a reply Message. -->
 	<ws-handler id="temperatureConverter" 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
deleted file mode 100644
index 6164ffae96..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointConcurrencyTests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
-
-	<message-bus/>
-
-	<channel id="testChannel"/>
-
-	<handler-endpoint id="defaultConcurrencyEndpoint" input-channel="testChannel" handler="testHandler">
-		<concurrency/>
-	</handler-endpoint>
-
-	<handler-endpoint id="configuredConcurrencyEndpoint" input-channel="testChannel" handler="testHandler">
-		<concurrency core="7" max="77" queue-capacity="777" keep-alive="7777"/>
-	</handler-endpoint>
-
-	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
-		<beans:constructor-arg value="1"/>
-	</beans:bean>
-
-</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
deleted file mode 100644
index b91142890a..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaultConcurrencyTests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
-
-	<message-bus>
-		<default-concurrency core="4" max="7"/>
-	</message-bus>
-
-	<channel id="channel"/>
-
-	<handler-endpoint id="endpoint1" handler="testHandler" input-channel="channel"/>
-
-	<handler-endpoint id="endpoint2" handler="testHandler" input-channel="channel">
-		<concurrency core="14" max="17"/>
-	</handler-endpoint>
-
-	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
-		<beans:constructor-arg value="3"/>
-	</beans:bean>
-
-</beans:beans>