diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java
index b5aefc3faf..1bfa088199 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java
@@ -108,8 +108,8 @@ public class HttpInboundEndpointParser extends AbstractSingleBeanDefinitionParse
 		else if (StringUtils.hasText(mappedRequestHeaders) || StringUtils.hasText(mappedResponseHeaders)) {
 			BeanDefinitionBuilder headerMapperBuilder = BeanDefinitionBuilder.genericBeanDefinition(
 					"org.springframework.integration.http.support.DefaultHttpHeaderMapper");
-			IntegrationNamespaceUtils.setValueIfAttributeDefined(headerMapperBuilder, element, "mapped-request-headers", "outboundHeaderNames");
-			IntegrationNamespaceUtils.setValueIfAttributeDefined(headerMapperBuilder, element, "mapped-response-headers", "inboundHeaderNames");
+			IntegrationNamespaceUtils.setValueIfAttributeDefined(headerMapperBuilder, element, "mapped-request-headers", "inboundHeaderNames");
+			IntegrationNamespaceUtils.setValueIfAttributeDefined(headerMapperBuilder, element, "mapped-response-headers", "outboundHeaderNames");
 			builder.addPropertyValue("headerMapper", headerMapperBuilder.getBeanDefinition());
 		}
 	}
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd
index 329a39d218..8e763e4b99 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.0.xsd
@@ -85,13 +85,13 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="mapped-response-headers" type="xsd:string">
+			<xsd:attribute name="mapped-request-headers" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-Comma-separated list of names of HttpHeaders to be mapped from the HTTP response into the MessageHeaders.
+Comma-separated list of names of MessageHeaders to be mapped into the HttpHeaders of the HTTP request.
 This can only be provided if the 'header-mapper' reference is not being set directly. The values in
 this list can also be simple patterns to be matched against the header names (e.g. "foo*" or "*foo").
-The String "HTTP_RESPONSE_HEADERS" will match against any of the standard HTTP Response headers.
+The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Request headers.
 						]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>		
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml
index 2f74385c56..b2d1e83fd2 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml
@@ -25,6 +25,6 @@
 	<inbound-channel-adapter id="inboundController" channel="requests" view-name="foo" error-code="oops"/>
 	
 	<inbound-channel-adapter id="withMappedHeaders" channel="requests"
-								mapped-response-headers="foo,bar"/>
+								mapped-request-headers="foo,bar"/>
 
 </beans:beans>
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests-context.xml
index 57f8bc55a3..979b25bbd0 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests-context.xml
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests-context.xml
@@ -22,7 +22,7 @@
 	<inbound-gateway id="inboundController" request-channel="requests" reply-channel="responses" view-name="foo" error-code="oops"/>
 	
 	<inbound-gateway id="withMappedHeaders" request-channel="requests"
-								mapped-response-headers="foo,bar"
-								mapped-request-headers="abc, xyz"/>
+								mapped-response-headers="abc, xyz"
+								mapped-request-headers="foo,bar"/>
 
 </beans:beans>