diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/AbstractFtpOutboundChannelAdapterParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/AbstractFtpOutboundChannelAdapterParser.java
index a914c5a655..b4449f9c1c 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/AbstractFtpOutboundChannelAdapterParser.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/AbstractFtpOutboundChannelAdapterParser.java
@@ -65,4 +65,5 @@ public abstract class AbstractFtpOutboundChannelAdapterParser extends AbstractOu
 	}
 
 	protected abstract String getClassName();
+
 }
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpSessionFactory.java
similarity index 91%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpSessionFactory.java
index cd7f713f75..4a94717ca9 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpSessionFactory.java
@@ -25,7 +25,7 @@ import org.apache.commons.net.ftp.FTPClient;
  * @author Iwein Fuld
  * @author Josh Long
  */
-public class DefaultFtpClientFactory extends AbstractFtpSessionFactory<FTPClient> {
+public class DefaultFtpSessionFactory extends AbstractFtpSessionFactory<FTPClient> {
 
 	@Override
 	protected FTPClient createSingleInstanceOfClient() {
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java
similarity index 96%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java
index 544cc8f766..f3ebc92fd9 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java
@@ -27,12 +27,12 @@ import org.apache.commons.net.ftp.FTPSClient;
 import org.springframework.util.StringUtils;
 
 /**
- * provides a working FTPS implementation. Based heavily on {@link org.springframework.integration.ftp.session.DefaultFtpClientFactory}
+ * provides a working FTPS implementation. Based heavily on {@link org.springframework.integration.ftp.session.DefaultFtpSessionFactory}
  * 
  * @author Josh Long
  * @author Iwein Fuld
  */
-public class DefaultFtpsClientFactory extends AbstractFtpSessionFactory<FTPSClient> {
+public class DefaultFtpsSessionFactory extends AbstractFtpSessionFactory<FTPSClient> {
 
 	private Boolean useClientMode;
 
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
index ec5e488284..511fbc48ed 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/integration  http://www.springframework.org/schema/integration/spring-integration.xsd
        http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -21,7 +21,7 @@
 	</bean>
 	
 	<ftp:inbound-channel-adapter id="adapterFtp" 
-								 session-factory="ftpClientFactory"
+								 session-factory="ftpSessionFactory"
 								 channel="ftpIn"
 								 filename-pattern="foo"
 								 local-working-directory="file:target/foo"
@@ -33,7 +33,7 @@
 	
 	
 	<ftp:inbound-channel-adapter id="adapterFtp2" 
-		                         session-factory="ftpClientFactory"
+		                         session-factory="ftpSessionFactory"
 								 channel="ftpIn"
 								 filter="filter" 
 								 local-working-directory="file:target"
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
index 52a4fe5c50..9513bbb4b2 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/integration  http://www.springframework.org/schema/integration/spring-integration.xsd
        http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -22,7 +22,7 @@
 
 	<ftp:inbound-channel-adapter id="adapterFtpDontAutoCreate" 
 								 channel="ftpIn"
-								 session-factory="ftpClientFactory"
+								 session-factory="ftpSessionFactory"
 								 filter="filter" 
 								 local-working-directory="file:target/bar"
 								 remote-directory="foo/bar"
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
index bbec3c807f..3ca5dc92ce 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
@@ -10,7 +10,7 @@
 	<int:channel id="ftpOutbound"/>
 	
 	
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpsClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpsSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -21,7 +21,7 @@
 	</bean>
 
 	<int-ftp:outbound-channel-adapter id="ftpOutboundAdapter" 
-						session-factory="ftpClientFactory"
+						session-factory="ftpSessionFactory"
 						remote-directory="foo/bar"
 						channel="ftpOutbound" 
 						filename-generator="fileNameGenerator"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
index f2cc20ef3e..ce1e630d37 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests-context.xml
@@ -7,13 +7,12 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" 
-		class="org.springframework.integration.ftp.config.FtpInboundChannelAdapterParserTests.TestClientFactoryBean"/>
-	
+	<bean id="ftpSessionFactory" 
+		class="org.springframework.integration.ftp.config.FtpInboundChannelAdapterParserTests.TestSessionFactoryBean"/>
 
 	<int-ftp:inbound-channel-adapter id="ftpInbound"
 				channel="ftpChannel" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				charset="UTF-8"
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
@@ -25,7 +24,7 @@
 	
 	<int-ftp:inbound-channel-adapter 
 				channel="ftpChannel" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				charset="UTF-8"
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
index c2b1dfff15..59c1a07df9 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.file.remote.session.Session;
-import org.springframework.integration.ftp.session.DefaultFtpClientFactory;
+import org.springframework.integration.ftp.session.DefaultFtpSessionFactory;
 
 /**
  * @author Oleg Zhurakousky
@@ -68,17 +68,17 @@ public class FtpInboundChannelAdapterParserTests {
 //		assertNotNull(adapter);
 	}
 
-	public static class TestClientFactoryBean implements FactoryBean<DefaultFtpClientFactory>{
+	public static class TestSessionFactoryBean implements FactoryBean<DefaultFtpSessionFactory>{
 
-		public DefaultFtpClientFactory getObject() throws Exception {
-			DefaultFtpClientFactory factory = mock(DefaultFtpClientFactory.class);
+		public DefaultFtpSessionFactory getObject() throws Exception {
+			DefaultFtpSessionFactory factory = mock(DefaultFtpSessionFactory.class);
 			Session session = mock(Session.class);
 			when(factory.getSession()).thenReturn(session);
 			return factory;
 		}
 
 		public Class<?> getObjectType() {
-			return DefaultFtpClientFactory.class;
+			return DefaultFtpSessionFactory.class;
 		}
 
 		public boolean isSingleton() {
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
index 001ccb9b70..bc45e9c582 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -19,7 +19,7 @@
 
 	<int-ftp:outbound-channel-adapter id="ftpOutbound"
 				channel="ftpChannel" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				remote-directory="foo/bar"
 				charset="UTF-8"
 				filename-generator="fileNameGenerator"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml
index 239200bab3..f35930db3f 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterSample-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="username" value="ozhurakousky"/>
 		<property name="password" value="seva@1994"/>
@@ -17,7 +17,7 @@
 	<int:channel id="ftpChannel"/>
 
 	<int-ftp:outbound-channel-adapter 
-				client-factory="ftpClientFactory" 
+				session-factory="ftpSessionFactory" 
 				channel="ftpChannel"/>
 	
 	
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
index 0fb8aa122f..3da294b65d 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpsClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpsSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -19,7 +19,7 @@
 
 	<int-ftp:inbound-channel-adapter id="ftpInbound"
 				channel="ftpChannel" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				charset="UTF-8"
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
@@ -31,7 +31,7 @@
 	
 	<int-ftp:inbound-channel-adapter 
 				channel="ftpChannel" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				charset="UTF-8"
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
index c736bdae18..12c4e3519d 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
@@ -14,7 +14,7 @@
 		<constructor-arg value="javax.net.ssl.TrustManager"/>
 	</bean>
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpsClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpsSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -37,7 +37,7 @@
 	
 	<int-ftp:outbound-channel-adapter id="ftpOutbound"
 				channel="ftpChannel" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				charset="UTF-8"
 				remote-directory="foo/bar"
 				filename-generator="fileNameGenerator"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
index 4bc1ed965d..ec0cad255e 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
@@ -11,7 +11,7 @@
 
 	<int:message-history/>
 	
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpClientFactory">
+	<bean id="ftpSessionFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
@@ -22,7 +22,7 @@
 	</bean>
 
 	<ftp:inbound-channel-adapter id="adapterFtp" 
-				session-factory="ftpClientFactory"
+				session-factory="ftpSessionFactory"
 				channel="ftpIn" 
 				auto-create-directories="true"
 				local-working-directory="file:target/foo"