diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
index 32af74a8..4fa6b697 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
@@ -38,11 +38,11 @@
 		reply-channel="toRm"
 		command="get"
 		command-options="-P"
-		expression="payload.remoteDir + '/' + payload.filename"/>
+		expression="payload.remoteDirectory + '/' + payload.filename"/>
 
 	<int-ftp:outbound-gateway id="gatewayRM" reply-channel="aggregateResultsChannel"
 		session-factory="ftpSessionFactory"
-		expression="headers['file_remote_dir'] + '/' + headers['file_remote_file']"
+		expression="headers['file_remoteDirectory'] + '/' + headers['file_remoteFile']"
 		request-channel="toRm"
 		command="rm"/>
 
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml
index 0a1af0db..9ef3195b 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml
@@ -40,11 +40,11 @@
 		reply-channel="toRm"
 		command="get"
 		command-options="-P"
-		expression="payload.remoteDir + '/' + payload.filename"/>
+		expression="payload.remoteDirectory + '/' + payload.filename"/>
 
 	<int-sftp:outbound-gateway id="gatewayRM" reply-channel="aggregateResultsChannel"
 		session-factory="sftpSessionFactory"
-		expression="headers['file_remote_dir'] + '/' + headers['file_remote_file']"
+		expression="headers['file_remoteDirectory'] + '/' + headers['file_remoteFile']"
 		request-channel="toRm"
 		command="rm"/>