diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageEndpointParser.java
similarity index 96%
rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageEndpointParser.java
index e7453f5ea3..9b144ebfbe 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractHandlerEndpointParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageEndpointParser.java
@@ -34,11 +34,11 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 
 /**
- * Base class parser for elements that create handler-invoking endpoints.
+ * Base class parser for elements that create Message Dndpoints.
  * 
  * @author Mark Fisher
  */
-public abstract class AbstractHandlerEndpointParser extends AbstractSingleBeanDefinitionParser {
+public abstract class AbstractMessageEndpointParser extends AbstractSingleBeanDefinitionParser {
 
 	protected static final String REF_ATTRIBUTE = "ref";
 
@@ -82,8 +82,8 @@ public abstract class AbstractHandlerEndpointParser extends AbstractSingleBeanDe
 		if (!StringUtils.hasText(ref)) {
 			throw new ConfigurationException("The '" + REF_ATTRIBUTE + "' attribute is required.");
 		}
-		String method = element.getAttribute(METHOD_ATTRIBUTE);
 		if (this.shouldCreateAdapter(element)) {
+			String method = element.getAttribute(METHOD_ATTRIBUTE);
 			String adapterBeanName = this.parseAdapter(ref, method, element, parserContext);
 			builder.addConstructorArgReference(adapterBeanName);
 		}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java
index a5ccf0682f..0b1d7db31a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java
@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
  * @author Marius Bogoevici
  * @author Mark Fisher
  */
-public class AggregatorParser extends AbstractHandlerEndpointParser {
+public class AggregatorParser extends AbstractMessageEndpointParser {
 
 	public static final String COMPLETION_STRATEGY_REF_ATTRIBUTE = "completion-strategy";
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java
index 857c9657b3..1aaac09eb0 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java
@@ -24,7 +24,7 @@ import org.springframework.integration.router.RouterMessageHandler;
  * 
  * @author Mark Fisher
  */
-public class RouterParser extends AbstractHandlerEndpointParser {
+public class RouterParser extends AbstractMessageEndpointParser {
 
 	@Override
 	protected Class<? extends MessageHandler> getHandlerAdapterClass() {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java
index 6b790db11d..514a64a26a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java
@@ -24,7 +24,7 @@ import org.springframework.integration.handler.DefaultMessageHandler;
  * 
  * @author Mark Fisher
  */
-public class ServiceActivatorParser extends AbstractHandlerEndpointParser {
+public class ServiceActivatorParser extends AbstractMessageEndpointParser {
 
 	@Override
 	protected Class<? extends MessageHandler> getHandlerAdapterClass() {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java
index 42d91ccd98..1f133412bb 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java
@@ -24,7 +24,7 @@ import org.springframework.integration.splitter.SplitterMessageHandler;
  * 
  * @author Mark Fisher
  */
-public class SplitterParser extends AbstractHandlerEndpointParser {
+public class SplitterParser extends AbstractMessageEndpointParser {
 
 	@Override
 	protected Class<? extends MessageHandler> getHandlerAdapterClass() {