diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/EndpointParser.java b/spring-eai-core/src/main/java/org/springframework/integration/config/EndpointParser.java
index 28bbd90523..5df6f98c43 100644
--- a/spring-eai-core/src/main/java/org/springframework/integration/config/EndpointParser.java
+++ b/spring-eai-core/src/main/java/org/springframework/integration/config/EndpointParser.java
@@ -48,7 +48,7 @@ public class EndpointParser implements BeanDefinitionParser {
 
 	private static final String DEFAULT_OUTPUT_CHANNEL_PROPERTY = "defaultOutputChannelName";
 
-	private static final String HANDLER_REF_ATTRIBUTE = "handler";
+	private static final String HANDLER_REF_ATTRIBUTE = "handler-ref";
 
 	private static final String HANDLER_METHOD_ATTRIBUTE = "handler-method";
 
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/spring-eai-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
index f752215167..cb85edcda8 100644
--- a/spring-eai-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
+++ b/spring-eai-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
@@ -100,7 +100,7 @@
 					</xsd:sequence>
 					<xsd:attribute name="input-channel" type="xsd:string"/>
 					<xsd:attribute name="default-output-channel" type="xsd:string"/>
-					<xsd:attribute name="handler" type="xsd:string"/>
+					<xsd:attribute name="handler-ref" type="xsd:string"/>
 					<xsd:attribute name="handler-method" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml b/spring-eai-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml
index a965cb6da8..195242c1ab 100644
--- a/spring-eai-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml
+++ b/spring-eai-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml
@@ -11,7 +11,7 @@
 
 	<channel id="testChannel" capacity="50"/>
 
-	<endpoint input-channel="testChannel" handler="testHandler">
+	<endpoint input-channel="testChannel" handler-ref="testHandler">
 		<consumer period="100"/>
 	</endpoint>
 	
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/spring-eai-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
index 63baced08d..e8497b9d32 100644
--- a/spring-eai-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
+++ b/spring-eai-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
@@ -11,7 +11,7 @@
 
 	<channel id="testChannel" capacity="50"/>
 
-	<endpoint input-channel="testChannel" handler="testBean" handler-method="store">
+	<endpoint input-channel="testChannel" handler-ref="testBean" handler-method="store">
 		<consumer period="100"/>
 	</endpoint>