diff --git a/basic/ftp/.settings/com.springsource.sts.config.flow.prefs b/basic/ftp/.settings/com.springsource.sts.config.flow.prefs
index 7902a13d9..a6bd92969 100644
--- a/basic/ftp/.settings/com.springsource.sts.config.flow.prefs
+++ b/basic/ftp/.settings/com.springsource.sts.config.flow.prefs
@@ -1,4 +1,4 @@
-#Thu Nov 18 11:03:40 EST 2010
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1682" endstart\="1648" start\="1334" startend\="1611"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1749" endstart\="1735" start\="1689" startend\="1718"/>\n<bounds height\="112" width\="116" x\="155" y\="83"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1363" endstart\="1363" start\="1333" startend\="1363"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="1482" endstart\="1482" start\="1366" startend\="1482"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
+#Mon Nov 22 19:11:00 EST 2010
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1637" endstart\="1603" start\="1201" startend\="1566"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1704" endstart\="1690" start\="1644" startend\="1673"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1230" endstart\="1230" start\="1200" startend\="1230"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="1455" endstart\="1455" start\="1233" startend\="1455"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
 eclipse.preferences.version=1
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
index e7fbb8897..191d74d84 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
@@ -11,20 +11,20 @@
 
 	<context:property-placeholder location="classpath:user.properties"/>
 	
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="username" value="${user}"/>
 		<property name="password" value="${password}"/>
-		<property name="remoteWorkingDirectory" value="<SPECIFY REMOTE DIRECTORY (e.g., /{workspace}/samples/basic/ftp/remote-source-dir)"/>
 	</bean>
 	
 	<int-ftp:inbound-channel-adapter id="ftpInbound"
 				channel="ftpChannel" 
-				client-factory="ftpClientFactory"
-				filename-pattern=".*\.txt$"
-				auto-create-directories="true"
-				auto-delete-remote-files-on-sync="false"
-				local-working-directory="file:local-target-dir">
+				session-factory="ftpClientFactory"
+				filename-regex=".*\.txt$"
+				auto-create-local-directory="true"
+				delete-remote-files="false"
+				remote-directory="<SPECIFY REMOTE DIRECTORY (e.g., /{workspace}/samples/basic/ftp/remote-source-dir)"
+				local-directory="file:local-target-dir">
 			<int:poller fixed-rate="1000"/>
 	</int-ftp:inbound-channel-adapter>
 				
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
index 68dd9e7a1..6328f72c7 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
@@ -11,17 +11,17 @@
 
 	<context:property-placeholder location="classpath:user.properties"/>
 
-	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.client.DefaultFtpClientFactory">
+	<bean id="ftpClientFactory" class="org.springframework.integration.ftp.session.DefaultFtpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="username" value="${user}"/>
 		<property name="password" value="${password}"/>
-		<property name="remoteWorkingDirectory" value="<SPECIFY REMOTE DIRECTORY (e.g., /{workspace}/samples/basic/ftp/remote-target-dir)"/>
 	</bean>
 	
 	<int:channel id="ftpChannel"/>
 
 	<int-ftp:outbound-channel-adapter id="ftpOutbound"
 				channel="ftpChannel" 
+				remote-directory="<SPECIFY REMOTE DIRECTORY (e.g., /{workspace}/samples/basic/ftp/remote-target-dir)"
 				client-factory="ftpClientFactory"/>
 	
 </beans>
diff --git a/basic/sftp/.settings/com.springsource.sts.config.flow.prefs b/basic/sftp/.settings/com.springsource.sts.config.flow.prefs
index f684bb846..beee05c0c 100644
--- a/basic/sftp/.settings/com.springsource.sts.config.flow.prefs
+++ b/basic/sftp/.settings/com.springsource.sts.config.flow.prefs
@@ -1,5 +1,5 @@
-#Thu Nov 18 10:25:46 EST 2010
+#Mon Nov 22 19:13:14 EST 2010
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/main/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1954" endstart\="1919" start\="1487" startend\="1857"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2022" endstart\="2008" start\="1958" startend\="1991"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1965" endstart\="1930" start\="1487" startend\="1868"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2033" endstart\="2019" start\="1969" startend\="2002"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1355" endstart\="1355" start\="1323" startend\="1355"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="1666" endstart\="1666" start\="1359" startend\="1666"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="InboundChannelAdapterModelElement" type\="inbound-channel-adapter">\n<structure end\="1961" endstart\="1926" start\="1494" startend\="1864"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2029" endstart\="2015" start\="1965" startend\="1998"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1362" endstart\="1362" start\="1330" startend\="1362"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="1673" endstart\="1673" start\="1366" startend\="1673"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n</graph>
 eclipse.preferences.version=1
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml
index 98495e7c3..8e4ad3249 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml
@@ -13,7 +13,7 @@
 
 	<context:property-placeholder location="classpath:user.properties"/>
 
-	<bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.SftpSessionFactory">
+	<bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.DefaultSftpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="privateKey" value="classpath:META-INF/keys/sftp_rsa"/>
 		<property name="privateKeyPassphrase" value="${passphrase}"/>
@@ -26,9 +26,9 @@
 			session-factory="sftpSessionFactory" 
 			local-directory="file:local-dir"
 			remote-directory="<<SPECIFY REMOTE DIRECTORY (e.g., /{workspace}/samples/basic/sftp/remote-target-dir)>>"
-			auto-create-directories="true"
-			auto-delete-remote-files-on-sync="false"
-			filename-pattern=".*\.txt$">
+			auto-create-local-directory="true"
+			delete-remote-files="false"
+			filename-regex=".*\.txt$">
 		<int:poller fixed-rate="1000" max-messages-per-poll="1"/>
 	</int-sftp:inbound-channel-adapter>
 	
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
index 9e755957d..e04b673df 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
@@ -11,7 +11,7 @@
 
 	<context:property-placeholder location="classpath:user.properties"/>
 	
-	<bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.SftpSessionFactory">
+	<bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.DefaultSftpSessionFactory">
 		<property name="host" value="localhost"/>
 		<property name="privateKey" value="classpath:META-INF/keys/sftp_rsa"/>
 		<property name="privateKeyPassphrase" value="${passphrase}"/>