diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml
index 8756085849..8e5ca6b3b5 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-common.xml
@@ -19,7 +19,7 @@
 		<schedule period="10000"/>
 	</channel-adapter>
 
-	<handler-endpoint input-channel="channel1" output-channel="channel2"
+	<service-activator input-channel="channel1" output-channel="channel2"
               ref="exclaimer" method="exclaim"/>
 
 	<channel-adapter channel="channel2" target="fileTarget"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
index 937eedce60..404b10075e 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/oddEvenDemo.xml
@@ -20,9 +20,9 @@
 
 	<router ref="parityResolver" method="getParity" input-channel="numbers"/>
 
-	<handler-endpoint ref="oddLogger" input-channel="odd"/>
+	<service-activator ref="oddLogger" input-channel="odd"/>
 
-	<handler-endpoint ref="evenLogger" input-channel="even"/>
+	<service-activator ref="evenLogger" input-channel="even"/>
 
 	<beans:bean id="counter" class="org.springframework.integration.samples.oddeven.Counter"/>