diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
index 6743ddec3f..30af45f060 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java
@@ -26,6 +26,7 @@ import org.springframework.integration.core.MessageHeaders;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageDeliveryException;
+import org.springframework.integration.support.ComponentMetadata;
 
 /**
  * Base class for Message Routers.
@@ -34,9 +35,6 @@ import org.springframework.integration.message.MessageDeliveryException;
  */
 public abstract class AbstractMessageRouter extends AbstractMessageHandler {
 
-	public static final String COMPONENT_TYPE_LABEL = "router";
-
-
 	private volatile MessageChannel defaultOutputChannel;
 
 	private volatile boolean resolutionRequired;
@@ -98,6 +96,11 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler {
 		this.applySequence = applySequence;
 	}
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("router");
+	}
+
 	@Override
 	protected void handleMessageInternal(Message<?> message) {
 		boolean sent = false;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java
index 5df5020a02..5f86ce8ae3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.selector.MessageSelector;
+import org.springframework.integration.support.ComponentMetadata;
 import org.springframework.util.Assert;
 
 /**
@@ -59,9 +60,6 @@ import org.springframework.util.Assert;
  */
 public class RecipientListRouter extends AbstractMessageRouter implements InitializingBean {
 
-    public static final String COMPONENT_TYPE_LABEL = "recipient-list-router";
-
-
     private volatile Map<MessageSelector, ? extends Collection<MessageChannel>> channelMap;
 
 
@@ -90,6 +88,11 @@ public class RecipientListRouter extends AbstractMessageRouter implements Initia
         this.channelMap = channelMap;
     }
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("recipient-list-router");
+	}
+
     @Override
     public final void onInit() {
         Assert.notEmpty(this.channelMap, "a non-empty channel map is required");
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java
index e4caf18212..aece24ce8f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java
@@ -18,6 +18,7 @@ package org.springframework.integration.transformer;
 
 import org.springframework.integration.core.Message;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
+import org.springframework.integration.support.ComponentMetadata;
 import org.springframework.util.Assert;
 
 /**
@@ -29,9 +30,6 @@ import org.springframework.util.Assert;
  */
 public class MessageTransformingHandler extends AbstractReplyProducingMessageHandler {
 
-	public static final String COMPONENT_TYPE_LABEL = "transformer";
-
-
 	private final Transformer transformer;
 
 
@@ -45,6 +43,11 @@ public class MessageTransformingHandler extends AbstractReplyProducingMessageHan
 	}
 
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("transformer");
+	}
+
 	@Override
 	protected Object handleRequestMessage(Message<?> message) {
 		try {
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
index ca3d1c9648..bde4ae60e5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
@@ -267,7 +267,9 @@ public class GatewayProxyFactoryBeanTests {
 		DirectChannel channel = new DirectChannel();
 		channel.setBeanName("testChannel");
 		channel.afterPropertiesSet();
-		EventDrivenConsumer consumer = new EventDrivenConsumer(channel, new BridgeHandler());
+		BridgeHandler bridgeHandler = new BridgeHandler();
+		bridgeHandler.afterPropertiesSet();
+		EventDrivenConsumer consumer = new EventDrivenConsumer(channel, bridgeHandler);
 		consumer.setBeanName("testBridge");
 		consumer.afterPropertiesSet();
 		consumer.start();