diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
index fecbce4d..66363ca8 100644
--- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
+++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
@@ -30,7 +30,7 @@ import org.springframework.integration.annotation.Gateway;
  */
 public interface Cafe { 
 
-	@Gateway(requestChannel="preOrders")
+	@Gateway(requestChannel="orders")
 	void placeOrder(Order order);
 
 }
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
index d8bbcbc8..535bb351 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
@@ -27,9 +27,9 @@
     
 	<int-amqp:inbound-channel-adapter queue-names="new-orders" channel="jsonOrders" connection-factory="rabbitConnectionFactory" acknowledge-mode="AUTO" />
 	
-	<int:json-to-object-transformer id="json-to-order" input-channel="jsonOrders" output-channel="orders" type="org.springframework.integration.samples.cafe.Order" />
+	<int:json-to-object-transformer id="json-to-order" input-channel="jsonOrders" output-channel="preOrders" type="org.springframework.integration.samples.cafe.Order" />
 
-	<int:splitter input-channel="orders" expression="payload.items" output-channel="preDrinks" apply-sequence="true"/>
+	<int:splitter input-channel="preOrders" expression="payload.items" output-channel="preDrinks" apply-sequence="true"/>
 
 	<int:header-enricher input-channel="preDrinks" output-channel="drinks">
 		<int:header name="ICED" expression="payload.isIced()"/>
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
index b4c8feef..fd000aa7 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
@@ -25,9 +25,9 @@
 	<!-- spring integration flow -->
 	<int:gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe" />
 	
-	<int:channel id="preOrders"/>
+	<int:channel id="orders"/>
 
-	<int:header-enricher input-channel="preOrders" output-channel="newOrders">
+	<int:header-enricher input-channel="orders" output-channel="newOrders">
 		<int:header name="NUMBER" expression="payload.getNumber()"/>
 	</int:header-enricher>