diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
index e634143264..1119ee4c93 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
@@ -40,6 +40,8 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attribute name="remote-directory" type="xsd:string"/>
+			<xsd:attribute name="remote-directory-expression" type="xsd:string"/>
 			<xsd:attribute name="remote-filename-generator" type="xsd:string">
 	            <xsd:annotation>
 	            	<xsd:documentation>
@@ -53,8 +55,6 @@
 	                </xsd:appinfo>
 	            </xsd:annotation>
 	        </xsd:attribute>
-			<xsd:attribute name="remote-directory" type="xsd:string"/>
-			<xsd:attribute name="remote-directory-expression" type="xsd:string"/>
 			<xsd:attribute name="remote-filename-generator-expression" type="xsd:string"/>
 			<xsd:attribute name="charset" type="xsd:string"/>
 		</xsd:complexType>
@@ -110,7 +110,7 @@
 			<xsd:attribute name="remote-directory" type="xsd:string" use="required"/>
 			<xsd:attribute name="local-directory" type="xsd:string" use="required"/>
 			<xsd:attribute name="auto-create-directories" type="xsd:boolean"/>
-			<xsd:attribute name="auto-delete-remote-files-on-sync" type="xsd:boolean"/>
+			<xsd:attribute name="delete-remote-files" type="xsd:boolean"/>
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml
index 8682b0f141..64993b91cb 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml
@@ -37,7 +37,7 @@
 			remote-directory="/foo"
 			local-directory="file:foo"
 			auto-create-directories="false"
-			auto-delete-remote-files-on-sync="false">
+			delete-remote-files="false">
 		<poller fixed-rate="1000"/>
 	</sftp:inbound-channel-adapter>
 	
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context.xml
index d6e3b3cb93..edd136e199 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context.xml
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context.xml
@@ -43,7 +43,7 @@
 			remote-directory="/foo"
 			local-directory="file:local-test-dir"
 			auto-create-directories="false"
-			auto-delete-remote-files-on-sync="false">
+			delete-remote-files="false">
 		<poller fixed-rate="1000"/>
 	</sftp:inbound-channel-adapter>
 	
@@ -54,7 +54,7 @@
 			remote-directory="/foo"
 			local-directory="file:local-test-dir"
 			auto-create-directories="true"
-			auto-delete-remote-files-on-sync="false">
+			delete-remote-files="false">
 		<poller fixed-rate="1000"/>
 	</sftp:inbound-channel-adapter>
 	
@@ -65,7 +65,7 @@
 			remote-directory="/foo"
 			local-directory="file:local-test-dir"
 			auto-create-directories="false"
-			auto-delete-remote-files-on-sync="false">
+			delete-remote-files="false">
 		<poller fixed-rate="1000"/>
 	</sftp:inbound-channel-adapter>
 	
@@ -76,11 +76,10 @@
 			remote-directory="/foo"
 			local-directory="file:foo"
 			auto-create-directories="true"
-			auto-delete-remote-files-on-sync="false">
+			delete-remote-files="false">
 		<poller fixed-rate="1000"/>
 	</sftp:inbound-channel-adapter>
 	
-	
 	<beans:bean id="filter" class="org.springframework.integration.sftp.filters.SftpPatternMatchingFileListFilter">
 		<beans:constructor-arg value="."/>
 	</beans:bean>
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/MessageHistory-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/MessageHistory-context.xml
index fcbe0bf157..0f95a8470c 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/MessageHistory-context.xml
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/MessageHistory-context.xml
@@ -17,7 +17,6 @@
 						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
 						http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
 
-
 	<channel id="inboundFilesChannel"/>
 	
 	<beans:bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.DefaultSftpSessionFactory">
@@ -38,7 +37,7 @@
 			channel="inboundFilesChannel"
 			filename-pattern=".*?jpg"
 			auto-create-directories="true"
-			auto-delete-remote-files-on-sync="true">
+			delete-remote-files="true">
 		<poller fixed-rate="1000" />
 	</sftp:inbound-channel-adapter>