diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java
index 57335f5eff..5b557823a2 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java
@@ -43,8 +43,8 @@ public abstract class AbstractDispatcher implements MessageDispatcher {
 	private final MessageExchangeTemplate messageExchangeTemplate = new MessageExchangeTemplate();
 
 
-	public void setTimeout(long timeout) {
-		this.messageExchangeTemplate.setSendTimeout(timeout);
+	public void setSendTimeout(long sendTimeout) {
+		this.messageExchangeTemplate.setSendTimeout(sendTimeout);
 	}
 
 	public boolean subscribe(MessageTarget target) {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
index 03f352d70d..afe16b92e3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
@@ -33,7 +33,7 @@ public interface MessageDispatcher extends MessageTarget, SubscribableSource {
 	 * Specify the timeout for sending to a target (in milliseconds).
 	 * Note that this value will only be applicable for blocking targets.
 	 */
-	void setTimeout(long timeout);
+	void setSendTimeout(long sendTimeout);
 
 	boolean subscribe(MessageTarget target);
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
index cf25dde1bb..cdbcb5443a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcher.java
@@ -93,7 +93,7 @@ public class PollingDispatcher implements SchedulableTask, SubscribableSource {
 	 * of {@link BlockingTarget}.
 	 */
 	public void setSendTimeout(long sendTimeout) {
-		this.dispatcher.setTimeout(sendTimeout);
+		this.dispatcher.setSendTimeout(sendTimeout);
 	}
 
 	/**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java
index eb1ad968bd..c0e2d0540c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java
@@ -219,7 +219,7 @@ public class BroadcastingDispatcherTests {
 		dispatcher.subscribe(targetMock1);
 		dispatcher.subscribe(targetMock2);
 		dispatcher.subscribe(targetMock3);
-		dispatcher.setTimeout(50);
+		dispatcher.setSendTimeout(50);
 		// three threads invoking targets
 		final CountDownLatch latch = new CountDownLatch(3);
 		threadedExecutorMock(3);