diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractDirectorySource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractDirectorySource.java
index 29f117cd39..15361aad61 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractDirectorySource.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/AbstractDirectorySource.java
@@ -28,7 +28,7 @@ import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageCreator;
 import org.springframework.integration.message.MessageDeliveryAware;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
  * 
  * @author Marius Bogoevici
  */
-public abstract class AbstractDirectorySource implements Source<Object>, MessageDeliveryAware {
+public abstract class AbstractDirectorySource implements MessageSource<Object>, MessageDeliveryAware {
 
 	public final static String FILE_INFO_PROPERTY = "file.info";
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
index 0e7604f6a5..f784f71652 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileSource.java
@@ -28,7 +28,7 @@ import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.message.MessageCreator;
 import org.springframework.integration.message.MessageDeliveryAware;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.util.Assert;
 
 /**
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public class FileSource extends AbstractDirectorySource implements Source<Object>, InitializingBean, MessageDeliveryAware {
+public class FileSource extends AbstractDirectorySource implements MessageSource<Object>, InitializingBean, MessageDeliveryAware {
 
 	private final File directory;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java
index e7a4863734..75cf64f236 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java
@@ -21,7 +21,7 @@ import javax.jms.Destination;
 
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.jms.core.JmsTemplate;
 
 /**
@@ -32,7 +32,7 @@ import org.springframework.jms.core.JmsTemplate;
  * 
  * @author Mark Fisher
  */
-public class JmsSource extends AbstractJmsTemplateBasedAdapter implements Source<Object> {
+public class JmsSource extends AbstractJmsTemplateBasedAdapter implements MessageSource<Object> {
 
 	public JmsSource(JmsTemplate jmsTemplate) {
 		super(jmsTemplate);
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
index c4fd3152b2..3015eea971 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java
@@ -23,14 +23,14 @@ import java.io.InputStream;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 
 /**
  * A pollable source for receiving bytes from an {@link InputStream}.
  * 
  * @author Mark Fisher
  */
-public class ByteStreamSource implements Source<byte[]> {
+public class ByteStreamSource implements MessageSource<byte[]> {
 
 	private BufferedInputStream stream;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
index c274ebb0df..0d5da4d363 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java
@@ -24,7 +24,7 @@ import java.io.UnsupportedEncodingException;
 
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.util.Assert;
 
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class CharacterStreamSource implements Source<String> {
+public class CharacterStreamSource implements MessageSource<String> {
 
 	private final BufferedReader reader;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
index 0a4cb40d0d..1225053ff4 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
@@ -30,7 +30,7 @@ import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.handler.MessageHandler;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.Target;
 import org.springframework.util.Assert;
 
@@ -65,7 +65,7 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Init
 
 	public void afterPropertiesSet() {
 		this.postProcessors.put(MessageHandler.class, new HandlerAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
-		this.postProcessors.put(Source.class, new SourceAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
+		this.postProcessors.put(MessageSource.class, new SourceAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
 		this.postProcessors.put(Target.class, new TargetAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
 	}
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java
index fcf885d14a..d3a8c8f985 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/SourceAnnotationPostProcessor.java
@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.ConfigurationException;
-import org.springframework.integration.annotation.MessageSource;
 import org.springframework.integration.annotation.Polled;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.MessageChannel;
@@ -30,7 +29,7 @@ import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.SourceEndpoint;
 import org.springframework.integration.message.MethodInvokingSource;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.util.StringUtils;
 
@@ -39,21 +38,21 @@ import org.springframework.util.StringUtils;
  *
  * @author Mark Fisher
  */
-public class SourceAnnotationPostProcessor extends AbstractAnnotationMethodPostProcessor<Source<?>> {
+public class SourceAnnotationPostProcessor extends AbstractAnnotationMethodPostProcessor<MessageSource<?>> {
 
 	public SourceAnnotationPostProcessor(MessageBus messageBus, ClassLoader beanClassLoader) {
-		super(MessageSource.class, messageBus, beanClassLoader);
+		super(org.springframework.integration.annotation.MessageSource.class, messageBus, beanClassLoader);
 	}
 
 
-	protected Source<?> processMethod(Object bean, Method method, Annotation annotation) {
+	protected MessageSource<?> processMethod(Object bean, Method method, Annotation annotation) {
 		MethodInvokingSource source = new MethodInvokingSource();
 		source.setObject(bean);
 		source.setMethod(method.getName());
 		return source;
 	}
 
-	protected Source<?> processResults(List<Source<?>> results) {
+	protected MessageSource<?> processResults(List<MessageSource<?>> results) {
 		if (results.size() > 1) {
 			throw new ConfigurationException("At most one @MessageSource annotation is allowed per class.");
 		}
@@ -76,7 +75,7 @@ public class SourceAnnotationPostProcessor extends AbstractAnnotationMethodPostP
 			outputChannel = new DirectChannel();
 			this.getMessageBus().registerChannel(beanName + ".output", outputChannel);
 		}
-		SourceEndpoint endpoint = new SourceEndpoint((Source<?>) bean, outputChannel);
+		SourceEndpoint endpoint = new SourceEndpoint((MessageSource<?>) bean, outputChannel);
 		endpoint.setSchedule(schedule);
 		return endpoint;
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
index 4ad7871e89..232a88324b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
@@ -24,7 +24,7 @@ import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.channel.DispatcherPolicy;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.Subscribable;
 import org.springframework.integration.message.Target;
 import org.springframework.integration.message.selector.MessageSelector;
@@ -32,7 +32,7 @@ import org.springframework.integration.message.selector.MessageSelector;
 /**
  * A channel that invokes the subscribed {@link MessageHandler handler(s)} in a
  * sender's thread (returning after at most one handles the message). If a
- * {@link Source} is provided, then that source will likewise be polled
+ * {@link MessageSource} is provided, then that source will likewise be polled
  * within a receiver's thread.
  * 
  * @author Dave Syer
@@ -40,7 +40,7 @@ import org.springframework.integration.message.selector.MessageSelector;
  */
 public class DirectChannel extends AbstractMessageChannel implements Subscribable {
 
-	private volatile Source<?> source;
+	private volatile MessageSource<?> source;
 
 	private final SimpleDispatcher dispatcher;
 
@@ -51,7 +51,7 @@ public class DirectChannel extends AbstractMessageChannel implements Subscribabl
 		this(null);
 	}
 
-	public DirectChannel(Source<?> source) {
+	public DirectChannel(MessageSource<?> source) {
 		super(defaultDispatcherPolicy());
 		this.source = source;
 		this.dispatcher = new SimpleDispatcher(this.getDispatcherPolicy());
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java
index c2a83fce9f..d15619c9a5 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourceEndpoint.java
@@ -23,26 +23,26 @@ import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryAware;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.PollCommand;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.scheduling.Schedule;
 import org.springframework.util.Assert;
 
 /**
- * A channel adapter that retrieves messages from a {@link Source}
+ * A channel adapter that retrieves messages from a {@link MessageSource}
  * and then sends the resulting messages to the provided {@link MessageChannel}.
  * 
  * @author Mark Fisher
  */
 public class SourceEndpoint extends AbstractEndpoint {
 
-	private final Source<?> source;
+	private final MessageSource<?> source;
 
 	private final SimpleDispatcher dispatcher = new SimpleDispatcher(new DispatcherPolicy());
 
 	private volatile Schedule schedule;
 
 
-	public SourceEndpoint(Source<?> source, MessageChannel channel) {
+	public SourceEndpoint(MessageSource<?> source, MessageChannel channel) {
 		Assert.notNull(source, "source must not be null");
 		Assert.notNull(channel, "channel must not be null");
 		this.source = source;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingSource.java
index 1333e74e17..c0b0484092 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingSource.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingSource.java
@@ -21,7 +21,7 @@ package org.springframework.integration.message;
  * 
  * @author Mark Fisher
  */
-public interface BlockingSource<T> extends Source<T> {
+public interface BlockingSource<T> extends MessageSource<T> {
 
 	/**
 	 * Receive a message, blocking indefinitely if necessary.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/Source.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java
similarity index 96%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/Source.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java
index cb18538344..d8aa06a17d 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/Source.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java
@@ -21,7 +21,7 @@ package org.springframework.integration.message;
  * 
  * @author Mark Fisher
  */
-public interface Source<T> {
+public interface MessageSource<T> {
 
 	/**
 	 * Retrieve a message from this source or <code>null</code> if no message is available.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java
index 26d6469f2f..aeea309117 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class MethodInvokingSource implements Source<Object>, InitializingBean {
+public class MethodInvokingSource implements MessageSource<Object>, InitializingBean {
 
 	private Object object;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java
index 0ce1b43dd2..162bb4ea06 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollingSchedule.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
 import org.springframework.util.Assert;
 
 /**
- * Scheduling metadata for a polling task.
+ * Scheduling metadata for a task that repeats at a regular interval.
  * 
  * @author Mark Fisher
  */
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java
index 1baa252635..e3df0d90d7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/MessageBusTests.java
@@ -39,7 +39,7 @@ import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Subscription;
@@ -258,7 +258,7 @@ public class MessageBusTests {
 		assertTrue(messageBusAwareBean.getMessageBus() == context.getBean("bus"));
 	}
 
-	private static class FailingSource implements Source<Object> {
+	private static class FailingSource implements MessageSource<Object> {
 
 		private CountDownLatch latch;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java
index 3e375a77e4..ec928c88d4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java
@@ -17,13 +17,13 @@
 package org.springframework.integration.config;
 
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.StringMessage;
 
 /**
  * @author Mark Fisher
  */
-public class TestSource implements Source {
+public class TestSource implements MessageSource {
 
 	public Message<?> receive() {
 		return new StringMessage("test");
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
index 3469409562..ad1c05d1cb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.message.Target;
 
@@ -68,7 +68,7 @@ public class DirectChannelTests {
 
 	@Test
 	public void testReceive() {
-		DirectChannel channel = new DirectChannel(new Source<String>() {
+		DirectChannel channel = new DirectChannel(new MessageSource<String>() {
 			public Message<String> receive() {
 				return new StringMessage("foo");
 			}
@@ -147,7 +147,7 @@ public class DirectChannelTests {
 	}
 
 
-	private static class MessageReturningTestSource implements Source<String> {
+	private static class MessageReturningTestSource implements MessageSource<String> {
 
 		private final String messageText;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java
index a23a191ed4..3a88cac602 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/SourceEndpointTests.java
@@ -28,7 +28,7 @@ import org.springframework.integration.message.CommandMessage;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.PollCommand;
-import org.springframework.integration.message.Source;
+import org.springframework.integration.message.MessageSource;
 
 /**
  * @author Mark Fisher
@@ -47,7 +47,7 @@ public class SourceEndpointTests {
 	}
 
 
-	private static class TestSource implements Source<String> {
+	private static class TestSource implements MessageSource<String> {
 
 		private String message;