diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
index 77a9e82a16..3e280af701 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java
@@ -22,6 +22,7 @@ import org.springframework.integration.handler.AbstractReplyProducingMessageHand
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.MessageRejectedException;
 import org.springframework.integration.selector.MessageSelector;
+import org.springframework.integration.support.ComponentMetadata;
 import org.springframework.util.Assert;
 
 /**
@@ -37,9 +38,6 @@ import org.springframework.util.Assert;
  */
 public class MessageFilter extends AbstractReplyProducingMessageHandler {
 
-	public static final String COMPONENT_TYPE_LABEL = "filter";
-
-
 	private final MessageSelector selector;
 
 	private volatile boolean throwExceptionOnRejection;
@@ -84,6 +82,11 @@ public class MessageFilter extends AbstractReplyProducingMessageHandler {
 		this.discardChannel = discardChannel;
 	}
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("filter");
+	}
+
 	@Override
 	protected Object handleRequestMessage(Message<?> message) {
 		if (this.selector.accept(message)) {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/BridgeHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/BridgeHandler.java
index fedc1c80dc..f6c6f0f654 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/BridgeHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/BridgeHandler.java
@@ -17,6 +17,7 @@
 package org.springframework.integration.handler;
 
 import org.springframework.integration.core.Message;
+import org.springframework.integration.support.ComponentMetadata;
 import org.springframework.util.Assert;
 
 /**
@@ -35,8 +36,10 @@ import org.springframework.util.Assert;
  */
 public class BridgeHandler extends AbstractReplyProducingMessageHandler {
 
-	public static final String COMPONENT_TYPE_LABEL = "bridge";
-
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("bridge");
+	}
 
 	@Override
 	protected Object handleRequestMessage(Message<?> requestMessage) {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/LoggingHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/LoggingHandler.java
index 4c883e3ba1..c4dc472703 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/LoggingHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/LoggingHandler.java
@@ -20,6 +20,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import org.springframework.integration.core.Message;
+import org.springframework.integration.support.ComponentMetadata;
 import org.springframework.util.StringUtils;
 
 /**
@@ -35,8 +36,6 @@ public class LoggingHandler extends AbstractMessageHandler {
 
 	private static enum Level { FATAL, ERROR, WARN, INFO, DEBUG, TRACE }
 
-	public static final String COMPONENT_TYPE_LABEL = "logging-channel-adapter";
-
 
 	private boolean shouldLogFullMessage;
 
@@ -66,6 +65,11 @@ public class LoggingHandler extends AbstractMessageHandler {
 		this.shouldLogFullMessage = shouldLogFullMessage;
 	}
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("logging-channel-adapter");
+	}
+
 	@Override
 	protected void handleMessageInternal(Message<?> message) throws Exception {
 		Object logMessage = (this.shouldLogFullMessage) ? message : message.getPayload();
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
index cf616735d2..b33c79bd43 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java
@@ -21,15 +21,13 @@ import java.lang.reflect.Method;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageHandlingException;
+import org.springframework.integration.support.ComponentMetadata;
 
 /**
  * @author Mark Fisher
  */
 public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandler {
 
-	public static final String COMPONENT_TYPE_LABEL = "service-activator";
-
-
 	private final MethodInvokingMessageProcessor processor;
 
 
@@ -46,6 +44,11 @@ public class ServiceActivatingHandler extends AbstractReplyProducingMessageHandl
 	}
 
 
+	@Override
+	protected void populateComponentMetadata(ComponentMetadata metadata) {
+		metadata.setComponentType("service-activator");
+	}
+
 	@Override
 	protected Object handleRequestMessage(Message<?> message) {
 		try {