diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
index ee97a64c9f..4e4a7a395d 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java
@@ -68,7 +68,7 @@ public class FtpInboundChannelAdapterParser extends AbstractPollingInboundChanne
 			synchronizerBuilder.addPropertyReference("filter", filter);
 		}
 		messageSourceBuilder.addPropertyValue("synchronizer", synchronizerBuilder.getBeanDefinition());
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(messageSourceBuilder, element, "local-working-directory", "localDirectory");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(messageSourceBuilder, element, "local-directory");
 		return messageSourceBuilder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
index acd54f6aaa..0ddf4c3e05 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
@@ -67,7 +67,7 @@
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attribute name="remote-directory" type="xsd:string" use="required"/>
-					<xsd:attribute name="local-working-directory" type="xsd:string" use="required"/>
+					<xsd:attribute name="local-directory" type="xsd:string" use="required"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
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 37fbfab335..40a7d4da72 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
@@ -24,7 +24,7 @@
 								 session-factory="ftpSessionFactory"
 								 channel="ftpIn"
 								 filename-pattern="foo"
-								 local-working-directory="file:target/foo"
+								 local-directory="target/foo"
 								 remote-directory="foo/bar"
 								 auto-create-directories="true"
 								 auto-delete-remote-files-on-sync="false">
@@ -36,7 +36,7 @@
 		                         session-factory="ftpSessionFactory"
 								 channel="ftpIn"
 								 filter="filter" 
-								 local-working-directory="file:target"
+								 local-directory="target"
 								 remote-directory="foo/bar"
 								 auto-create-directories="true"
 								 auto-delete-remote-files-on-sync="false">
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 5d505b0c7a..2eccf87d90 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
@@ -24,7 +24,7 @@
 								 channel="ftpIn"
 								 session-factory="ftpSessionFactory"
 								 filter="filter" 
-								 local-working-directory="file:target/bar"
+								 local-directory="file:target/bar"
 								 remote-directory="foo/bar"
 								 auto-create-directories="false"
 								 auto-delete-remote-files-on-sync="false">
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 ce1e630d37..e85e501b01 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
@@ -17,7 +17,7 @@
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
 				filename-pattern=".?txt"
-				local-working-directory="."
+				local-directory="."
 				remote-directory="foo/bar">
 			<int:poller fixed-rate="1000"/>
 	</int-ftp:inbound-channel-adapter>
@@ -29,7 +29,7 @@
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
 				filter="entryListFilter"
-				local-working-directory="."
+				local-directory="."
 				remote-directory="foo/bar">
 			<int:poller fixed-rate="1000"/>
 	</int-ftp:inbound-channel-adapter>
@@ -41,4 +41,5 @@
 	<bean id="entryListFilter" class="org.mockito.Mockito" factory-method="mock">
 		<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
 	</bean>
+
 </beans>
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 17858ffea1..8f4dc3e045 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
@@ -23,7 +23,7 @@
 				charset="UTF-8"
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
-				local-working-directory="."
+				local-directory="."
 				remote-directory="foo/bar"
 				filter="entryListFilter">
 			<int:poller fixed-rate="1000"/>
@@ -36,7 +36,7 @@
 				auto-create-directories="true"
 				auto-delete-remote-files-on-sync="true"
 				filename-pattern=".?txt"
-				local-working-directory="."
+				local-directory="."
 				remote-directory="foo/bar">
 			<int:poller fixed-rate="1000"/>
 	</int-ftp:inbound-channel-adapter>
@@ -46,4 +46,5 @@
 	<bean id="entryListFilter" class="org.mockito.Mockito" factory-method="mock">
 		<constructor-arg value="org.springframework.integration.file.filters.FileListFilter"/>
 	</bean>
+
 </beans>
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 bf79fdce9d..90a1324f7f 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
@@ -25,7 +25,7 @@
 				session-factory="ftpSessionFactory"
 				channel="ftpIn" 
 				auto-create-directories="true"
-				local-working-directory="file:target/foo"
+				local-directory="file:target/foo"
 				remote-directory="foo/bar"
 				auto-delete-remote-files-on-sync="false">
 		<int:poller fixed-rate="1000"/>