diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
index bc99d704e3..5b07ea60ad 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
@@ -29,7 +29,7 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageDeliveryException;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.HistoryProvider;
+import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.core.MessageBuilder;
 import org.springframework.integration.core.MessageChannel;
@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  */
-public abstract class AbstractMessageChannel extends IntegrationObjectSupport implements MessageChannel, HistoryProvider {
+public abstract class AbstractMessageChannel extends IntegrationObjectSupport implements MessageChannel, TrackableComponent {
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java
index d1ce7cf57e..2393fe8d17 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java
@@ -27,15 +27,15 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 public class MessageHistoryBeanPostProcessor implements BeanPostProcessor {
 
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-		if (bean instanceof HistoryProvider) {
-			((HistoryProvider) bean).setShouldTrack(true);
+		if (bean instanceof TrackableComponent) {
+			((TrackableComponent) bean).setShouldTrack(true);
 		}
 		return bean;
 	}
 
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-		if (bean instanceof HistoryProvider) {
-			((HistoryProvider) bean).setShouldTrack(true);
+		if (bean instanceof TrackableComponent) {
+			((TrackableComponent) bean).setShouldTrack(true);
 		}
 		return bean;
 	}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/HistoryProvider.java b/spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java
similarity index 92%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/HistoryProvider.java
rename to spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java
index 79785cb584..3920fe827f 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/HistoryProvider.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java
@@ -20,7 +20,7 @@ package org.springframework.integration.context;
  * @author Mark Fisher
  * @since 2.0
  */
-public interface HistoryProvider extends NamedComponent {
+public interface TrackableComponent extends NamedComponent {
 
 	void setShouldTrack(boolean shouldTrack);
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
index 092415e46e..a7730d256b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
@@ -37,7 +37,7 @@ import org.springframework.expression.Expression;
 import org.springframework.integration.Message;
 import org.springframework.integration.annotation.Gateway;
 import org.springframework.integration.context.BeanFactoryChannelResolver;
-import org.springframework.integration.context.HistoryProvider;
+import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.core.ChannelResolver;
 import org.springframework.integration.core.MessageChannel;
@@ -59,7 +59,7 @@ import org.springframework.util.StringUtils;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  */
-public class GatewayProxyFactoryBean extends AbstractEndpoint implements HistoryProvider, FactoryBean<Object>, MethodInterceptor, BeanClassLoaderAware {
+public class GatewayProxyFactoryBean extends AbstractEndpoint implements TrackableComponent, FactoryBean<Object>, MethodInterceptor, BeanClassLoaderAware {
 
 	private volatile InboundMessageMapper<Throwable> exceptionMapper;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
index 8940cff573..fb4fe6c16c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
@@ -18,7 +18,7 @@ package org.springframework.integration.gateway;
 
 import org.springframework.integration.Message;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.HistoryProvider;
+import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.core.MessageHistory;
 import org.springframework.integration.mapping.InboundMessageMapper;
 import org.springframework.integration.mapping.OutboundMessageMapper;
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
-public class SimpleMessagingGateway extends AbstractMessagingGateway implements HistoryProvider {
+public class SimpleMessagingGateway extends AbstractMessagingGateway implements TrackableComponent {
 
 	private final InboundMessageMapper inboundMapper;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
index d3a71cf4e8..1ca9364493 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
@@ -23,7 +23,7 @@ import org.springframework.core.Ordered;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.HistoryProvider;
+import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.MessageHistory;
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  */
-public abstract class AbstractMessageHandler extends IntegrationObjectSupport implements MessageHandler, HistoryProvider, Ordered {
+public abstract class AbstractMessageHandler extends IntegrationObjectSupport implements MessageHandler, TrackableComponent, Ordered {
 
 	protected final Log logger = LogFactory.getLog(this.getClass());