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 de95662586..aa51a65806 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
@@ -15,14 +15,14 @@
 
 	<channel id="channel2"/>
 
-	<source-endpoint source="fileSource" channel="channel1">
+	<channel-adapter source="fileSource" channel="channel1">
 		<schedule period="10000"/>
-	</source-endpoint>
+	</channel-adapter>
 
 	<handler-endpoint input-channel="channel1" output-channel="channel2"
               handler="exclaimer" method="exclaim"/>
 
-	<target-endpoint input-channel="channel2" target="fileTarget"/>
+	<channel-adapter channel="channel2" target="fileTarget"/>
 
 	<file-target id="fileTarget" directory="${java.io.tmpdir}/spring-integration-samples/output"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
index 5312304c2d..6e781ed822 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
@@ -18,7 +18,7 @@
 
 	<beans:bean class="org.springframework.integration.samples.quote.QuoteService"/>
 
-	<target-endpoint input-channel="quotes" target="stdout"/>
+	<channel-adapter channel="quotes" target="stdout"/>
 
 	<console-target id="stdout" append-newline="true"/>
 
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 fb23cdac85..16a5e00f01 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
@@ -23,7 +23,7 @@
 				uri="http://www.w3schools.com/webservices/tempconvert.asmx"/>
 
 	<!-- The response from the service is logged to the console. -->
-	<target-endpoint input-channel="celsiusChannel" target="console"/>
+	<channel-adapter channel="celsiusChannel" target="console"/>
 
 	<console-target id="console"/>