diff --git a/org.springframework.integration.samples/scripts/cafeDemo.xml b/org.springframework.integration.samples/scripts/cafeDemo.xml
index e1ec27910c..c37d23538d 100644
--- a/org.springframework.integration.samples/scripts/cafeDemo.xml
+++ b/org.springframework.integration.samples/scripts/cafeDemo.xml
@@ -20,8 +20,9 @@
 	<channel id="coldDrinks"/>
 	<channel id="hotDrinks"/>
 
-	<handler-endpoint input-channel="coldDrinks" handler="barista" method="prepareColdDrink"/>
-	<handler-endpoint input-channel="hotDrinks" handler="barista" method="prepareHotDrink"/>
+	<service-activator input-channel="coldDrinks" ref="barista" method="prepareColdDrink"/>
+
+	<service-activator input-channel="hotDrinks" ref="barista" method="prepareHotDrink"/>
 
 	<beans:bean id="cafe" class="org.springframework.integration.samples.cafe.Cafe">
 		<beans:property name="orderChannel" ref="orders"/>