diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
similarity index 95%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
index 50863b8512..5f08c7c229 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpMessageSourceBeanDefinitionParser.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
@@ -35,7 +35,7 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
  *
  * @author Josh Long
  */
-public class FtpMessageSourceBeanDefinitionParser extends AbstractPollingInboundChannelAdapterParser {
+public class FtpInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser {
 
 	private Set<String> receiveAttrs = new HashSet<String>(Arrays.asList(
 			"auto-delete-remote-files-on-sync,filename-pattern,local-working-directory".split(",")));
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java
index f9370f34a1..a43d8fc701 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpNamespaceHandler.java
@@ -51,7 +51,7 @@ public class FtpNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 
 	public void init() {
-		registerBeanDefinitionParser("inbound-channel-adapter", new FtpMessageSourceBeanDefinitionParser());
+		registerBeanDefinitionParser("inbound-channel-adapter", new FtpInboundChannelAdapterParser());
 		registerBeanDefinitionParser("outbound-channel-adapter", new FtpOutboundChannelAdapterParser());
 	}
 
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java
similarity index 94%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java
index c15c65bbc1..aa1ad1d787 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsMessageSourceBeanDefinitionParser.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParser.java
@@ -33,7 +33,7 @@ import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
  *
  * @author Josh Long
  */
-public class FtpsMessageSourceBeanDefinitionParser extends AbstractPollingInboundChannelAdapterParser {
+public class FtpsInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser {
 
 	private Set<String> receiveAttrs = new HashSet<String>(Arrays.asList(
 			"auto-delete-remote-files-on-sync,filename-pattern,local-working-directory".split(",")));
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsNamespaceHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsNamespaceHandler.java
index c778077bed..a124a4b2ad 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsNamespaceHandler.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpsNamespaceHandler.java
@@ -27,7 +27,7 @@ public class FtpsNamespaceHandler extends FtpNamespaceHandler {
 
 	@Override
 	public void init() {
-		this.registerBeanDefinitionParser("inbound-channel-adapter", new FtpsMessageSourceBeanDefinitionParser());
+		this.registerBeanDefinitionParser("inbound-channel-adapter", new FtpsInboundChannelAdapterParser());
 		this.registerBeanDefinitionParser("outbound-channel-adapter", new FtpsOutboundChannelAdapterParser());
 	}