diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java
similarity index 91%
rename from org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java
rename to org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java
index 7f30932f7b..aa72441613 100644
--- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java
+++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java
@@ -30,7 +30,7 @@ import org.springframework.integration.message.MessageSource;
  * 
  * @author Mark Fisher
  */
-public class ByteStreamSource implements MessageSource<byte[]> {
+public class ByteStreamReadingMessageSource implements MessageSource<byte[]> {
 
 	private BufferedInputStream stream;
 
@@ -41,11 +41,11 @@ public class ByteStreamSource implements MessageSource<byte[]> {
 	private boolean shouldTruncate = true;
 
 
-	public ByteStreamSource(InputStream stream) {
+	public ByteStreamReadingMessageSource(InputStream stream) {
 		this(stream, -1);
 	}
 
-	public ByteStreamSource(InputStream stream, int bufferSize) {
+	public ByteStreamReadingMessageSource(InputStream stream, int bufferSize) {
 		this.streamMonitor = stream;
 		if (stream instanceof BufferedInputStream) {
 			this.stream = (BufferedInputStream) stream;
diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java
similarity index 78%
rename from org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java
rename to org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java
index b4e8eab864..914b31ff31 100644
--- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java
+++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java
@@ -32,18 +32,18 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class CharacterStreamSource implements MessageSource<String> {
+public class CharacterStreamReadingMessageSource implements MessageSource<String> {
 
 	private final BufferedReader reader;
 
 	private final Object monitor;
 
 
-	public CharacterStreamSource(Reader reader) {
+	public CharacterStreamReadingMessageSource(Reader reader) {
 		this(reader, -1);
 	}
 
-	public CharacterStreamSource(Reader reader, int bufferSize) {
+	public CharacterStreamReadingMessageSource(Reader reader, int bufferSize) {
 		Assert.notNull(reader, "reader must not be null");
 		this.monitor = reader;
 		if (reader instanceof BufferedReader) {
@@ -74,13 +74,13 @@ public class CharacterStreamSource implements MessageSource<String> {
 	}
 
 
-	public static final CharacterStreamSource stdin() {
-		return new CharacterStreamSource(new InputStreamReader(System.in));
+	public static final CharacterStreamReadingMessageSource stdin() {
+		return new CharacterStreamReadingMessageSource(new InputStreamReader(System.in));
 	}
 
-	public static final CharacterStreamSource stdin(String charsetName) {
+	public static final CharacterStreamReadingMessageSource stdin(String charsetName) {
 		try {
-			return new CharacterStreamSource(new InputStreamReader(System.in, charsetName));
+			return new CharacterStreamReadingMessageSource(new InputStreamReader(System.in, charsetName));
 		}
 		catch (UnsupportedEncodingException e) {
 			throw new IllegalArgumentException("unsupported encoding: " + charsetName, e);
diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java
index 1307394788..99ef163fbf 100644
--- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java
+++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser;
-import org.springframework.integration.stream.CharacterStreamSource;
+import org.springframework.integration.stream.CharacterStreamReadingMessageSource;
 import org.springframework.util.StringUtils;
 
 /**
@@ -34,7 +34,7 @@ public class ConsoleInboundChannelAdapterParser extends AbstractPollingInboundCh
 
 	@Override
 	protected String parseSource(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CharacterStreamSource.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CharacterStreamReadingMessageSource.class);
 		builder.setFactoryMethod("stdin");
 		String charsetName = element.getAttribute("charset");
 		if (StringUtils.hasText(charsetName)) {
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java
index 9bf8715cb4..f6bae1dde9 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java
@@ -34,7 +34,7 @@ public class ByteStreamSourceTests {
 	public void testEndOfStream() {
 		byte[] bytes = new byte[] {1,2,3};
 		ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-		ByteStreamSource source = new ByteStreamSource(stream);
+		ByteStreamReadingMessageSource source = new ByteStreamReadingMessageSource(stream);
 		Message<?> message1 = source.receive();
 		byte[] payload = (byte[]) message1.getPayload();
 		assertEquals(3, payload.length);
@@ -49,7 +49,7 @@ public class ByteStreamSourceTests {
 	public void testByteArrayIsTruncated() {
 		byte[] bytes = new byte[] {0,1,2,3,4,5};
 		ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-		ByteStreamSource source = new ByteStreamSource(stream);
+		ByteStreamReadingMessageSource source = new ByteStreamReadingMessageSource(stream);
 		source.setBytesPerMessage(4);
 		Message<?> message1 = source.receive();
 		assertEquals(4, ((byte[]) message1.getPayload()).length);
@@ -63,7 +63,7 @@ public class ByteStreamSourceTests {
 	public void testByteArrayIsNotTruncated() {
 		byte[] bytes = new byte[] {0,1,2,3,4,5};
 		ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-		ByteStreamSource source = new ByteStreamSource(stream);
+		ByteStreamReadingMessageSource source = new ByteStreamReadingMessageSource(stream);
 		source.setBytesPerMessage(4);
 		source.setShouldTruncate(false);
 		Message<?> message1 = source.receive();
diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java
index ce06dc2b6b..49b67f437b 100644
--- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java
+++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java
@@ -33,7 +33,7 @@ public class CharacterStreamSourceTests {
 	@Test
 	public void testEndOfStream() {
 		StringReader reader = new StringReader("test");
-		CharacterStreamSource source = new CharacterStreamSource(reader);
+		CharacterStreamReadingMessageSource source = new CharacterStreamReadingMessageSource(reader);
 		Message<?> message1 = source.receive();
 		assertEquals("test", message1.getPayload());
 		Message<?> message2 = source.receive();