diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpClientFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
similarity index 95%
rename from spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpClientFactory.java
rename to spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
index e53020d378..735cad7d86 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpClientFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
@@ -33,12 +33,11 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * base class for the other {@link org.springframework.integration.ftp.session.FtpClientFactory} implementations.
- * Most of this came out of the {@link DefaultFtpClientFactory} and was refactored into a base class
+ * Base class for FTP SessionFactory implementations.
  *
  * @author Iwein Fuld
  */
-public abstract class AbstractFtpClientFactory<T extends FTPClient> implements SessionFactory {
+public abstract class AbstractFtpSessionFactory<T extends FTPClient> implements SessionFactory {
 
 	public static final String DEFAULT_REMOTE_WORKING_DIRECTORY = "/";
 
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/DefaultFtpClientFactory.java
index efd475f4f5..cd7f713f75 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/DefaultFtpClientFactory.java
@@ -25,7 +25,7 @@ import org.apache.commons.net.ftp.FTPClient;
  * @author Iwein Fuld
  * @author Josh Long
  */
-public class DefaultFtpClientFactory extends AbstractFtpClientFactory<FTPClient> {
+public class DefaultFtpClientFactory 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/DefaultFtpsClientFactory.java
index 6972196da2..544cc8f766 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/DefaultFtpsClientFactory.java
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
  * @author Josh Long
  * @author Iwein Fuld
  */
-public class DefaultFtpsClientFactory extends AbstractFtpClientFactory<FTPSClient> {
+public class DefaultFtpsClientFactory extends AbstractFtpSessionFactory<FTPSClient> {
 
 	private Boolean useClientMode;