diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
index 3495881af2..4a8778e490 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
@@ -21,7 +21,7 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageMapper;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * A message target for publishing {@link MessagingEvent MessagingEvents}. The
@@ -30,7 +30,7 @@ import org.springframework.integration.message.Target;
  * 
  * @author Mark Fisher
  */
-public class ApplicationEventTarget<T> implements Target, ApplicationEventPublisherAware {
+public class ApplicationEventTarget<T> implements MessageTarget, ApplicationEventPublisherAware {
 
 	private final MessageMapper<T, MessagingEvent<T>> mapper = new MessagingEventMapper<T>();
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
index fb2c6a8320..2630f11211 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/file/FileTarget.java
@@ -20,7 +20,7 @@ import java.io.File;
 
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageMapper;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * A message target for writing files. The actual file writing occurs in the
@@ -29,7 +29,7 @@ import org.springframework.integration.message.Target;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public class FileTarget implements Target {
+public class FileTarget implements MessageTarget {
 
 	private MessageMapper<?, File> messageMapper;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java
index 91c8844000..e492eea0e3 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java
@@ -20,7 +20,7 @@ import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.jms.core.JmsTemplate;
 
 /**
@@ -28,7 +28,7 @@ import org.springframework.jms.core.JmsTemplate;
  * 
  * @author Mark Fisher
  */
-public class JmsTarget extends AbstractJmsTemplateBasedAdapter implements Target {
+public class JmsTarget extends AbstractJmsTemplateBasedAdapter implements MessageTarget {
 
 	public JmsTarget(JmsTemplate jmsTemplate) {
 		super(jmsTemplate);
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
index ea2a159682..1b58db3d53 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
@@ -19,7 +19,7 @@ package org.springframework.integration.adapter.mail;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageMapper;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.mail.MailMessage;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * @author Marius Bogoevici
  * @author Mark Fisher
  */
-public class MailTarget implements Target, InitializingBean {
+public class MailTarget implements MessageTarget, InitializingBean {
 
 	private final JavaMailSender mailSender;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java
index d8f05e42ad..b376d19784 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTarget.java
@@ -25,14 +25,14 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * A target that writes a byte array to an {@link OutputStream}.
  * 
  * @author Mark Fisher
  */
-public class ByteStreamTarget implements Target {
+public class ByteStreamTarget implements MessageTarget {
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java
index 2a473e3118..00356f207c 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTarget.java
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.util.Assert;
 
 /**
@@ -41,7 +41,7 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class CharacterStreamTarget implements Target {
+public class CharacterStreamTarget implements MessageTarget {
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
index 3b551d0e5d..ce93d232e3 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -58,7 +58,7 @@ import org.springframework.integration.endpoint.TargetEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.CommandMessage;
 import org.springframework.integration.message.PollCommand;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.scheduling.MessagePublishingErrorHandler;
 import org.springframework.integration.scheduling.MessagingTask;
 import org.springframework.integration.scheduling.MessagingTaskScheduler;
@@ -273,11 +273,11 @@ public class MessageBus implements ChannelRegistry, EndpointRegistry, Applicatio
 		this.doRegisterEndpoint(name, endpoint, subscription, concurrencyPolicy);
 	}
 
-	public void registerTarget(String name, Target target, Subscription subscription) {
+	public void registerTarget(String name, MessageTarget target, Subscription subscription) {
 		this.registerTarget(name, target, subscription, this.defaultConcurrencyPolicy);
 	}
 
-	public void registerTarget(String name, Target target, Subscription subscription,
+	public void registerTarget(String name, MessageTarget target, Subscription subscription,
 			ConcurrencyPolicy concurrencyPolicy) {
 		Assert.notNull(target, "'target' must not be null");
 		TargetEndpoint endpoint = new TargetEndpoint(target);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/SubscriptionManager.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/SubscriptionManager.java
index e02309b274..5b45eec68a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/SubscriptionManager.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/SubscriptionManager.java
@@ -32,7 +32,7 @@ import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.dispatcher.PollingDispatcherTask;
 import org.springframework.integration.endpoint.TargetEndpoint;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.scheduling.MessagingTaskScheduler;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Schedule;
@@ -40,7 +40,7 @@ import org.springframework.integration.util.ErrorHandler;
 import org.springframework.util.Assert;
 
 /**
- * Manages subscriptions for {@link Target Targets} to a {@link MessageChannel}
+ * Manages subscriptions for {@link MessageTarget Targets} to a {@link MessageChannel}
  * including the creation, scheduling, and lifecycle management of dispatchers.
  * 
  * @author Mark Fisher
@@ -77,11 +77,11 @@ public class SubscriptionManager {
 		this.defaultSchedule = defaultSchedule;
 	}
 
-	public void addTarget(Target target) {
+	public void addTarget(MessageTarget target) {
 		this.addTarget(target, null);
 	}
 
-	public void addTarget(Target target, Schedule schedule) {
+	public void addTarget(MessageTarget target, Schedule schedule) {
 		Assert.notNull(target, "'target' must not be null");
 		if (schedule == null) {
 			schedule = this.defaultSchedule;
@@ -129,7 +129,7 @@ public class SubscriptionManager {
 		}
 	}
 
-	public boolean removeTarget(Target target) {
+	public boolean removeTarget(MessageTarget target) {
 		boolean removed = false;
 		Collection<PollingDispatcherTask> dispatcherTaskValues = this.dispatcherTasks.values();
 		for (PollingDispatcherTask dispatcherTask : dispatcherTaskValues) {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
index 1225053ff4..485212f385 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java
@@ -31,7 +31,7 @@ import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.MessageSource;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.util.Assert;
 
 /**
@@ -66,7 +66,7 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Init
 	public void afterPropertiesSet() {
 		this.postProcessors.put(MessageHandler.class, new HandlerAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
 		this.postProcessors.put(MessageSource.class, new SourceAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
-		this.postProcessors.put(Target.class, new TargetAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
+		this.postProcessors.put(MessageTarget.class, new TargetAnnotationPostProcessor(this.messageBus, this.beanClassLoader));
 	}
 
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java
index 13e395dc07..633aa8e1b6 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/TargetAnnotationPostProcessor.java
@@ -23,14 +23,13 @@ import java.util.List;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.annotation.Concurrency;
-import org.springframework.integration.annotation.MessageTarget;
 import org.springframework.integration.annotation.Polled;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.endpoint.ConcurrencyPolicy;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.endpoint.TargetEndpoint;
 import org.springframework.integration.handler.MethodInvokingTarget;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.scheduling.Subscription;
 
 /**
@@ -38,21 +37,21 @@ import org.springframework.integration.scheduling.Subscription;
  *
  * @author Mark Fisher
  */
-public class TargetAnnotationPostProcessor extends AbstractAnnotationMethodPostProcessor<Target> {
+public class TargetAnnotationPostProcessor extends AbstractAnnotationMethodPostProcessor<MessageTarget> {
 
 	public TargetAnnotationPostProcessor(MessageBus messageBus, ClassLoader beanClassLoader) {
-		super(MessageTarget.class, messageBus, beanClassLoader);
+		super(org.springframework.integration.annotation.MessageTarget.class, messageBus, beanClassLoader);
 	}
 
 
-	public Target processMethod(Object bean, Method method, Annotation annotation) {
+	public MessageTarget processMethod(Object bean, Method method, Annotation annotation) {
 		MethodInvokingTarget target = new MethodInvokingTarget();
 		target.setObject(bean);
 		target.setMethod(method);
 		return target;
 	}
 
-	protected Target processResults(List<Target> results) {
+	protected MessageTarget processResults(List<MessageTarget> results) {
 		if (results.size() > 1) {
 			throw new ConfigurationException("At most one @MessageTarget annotation is allowed per class.");
 		}
@@ -61,7 +60,7 @@ public class TargetAnnotationPostProcessor extends AbstractAnnotationMethodPostP
 
 	public MessageEndpoint createEndpoint(Object bean, String beanName, Class<?> originalBeanClass,
 			org.springframework.integration.annotation.MessageEndpoint endpointAnnotation) {
-		TargetEndpoint endpoint = new TargetEndpoint((Target) bean);
+		TargetEndpoint endpoint = new TargetEndpoint((MessageTarget) bean);
 		Polled polledAnnotation = AnnotationUtils.findAnnotation(originalBeanClass, Polled.class);
 		Subscription subscription = this.createSubscription(bean, beanName, endpointAnnotation, polledAnnotation);
 		endpoint.setSubscription(subscription);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
index 232a88324b..084d624d10 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/DirectChannel.java
@@ -26,7 +26,7 @@ import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.Subscribable;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.selector.MessageSelector;
 
 /**
@@ -58,7 +58,7 @@ public class DirectChannel extends AbstractMessageChannel implements Subscribabl
 	}
 
 
-	public boolean subscribe(Target target) {
+	public boolean subscribe(MessageTarget target) {
 		boolean added = this.dispatcher.subscribe(target);
 		if (added) {
 			this.handlerCount.incrementAndGet();
@@ -66,7 +66,7 @@ public class DirectChannel extends AbstractMessageChannel implements Subscribabl
 		return added;
 	}
 
-	public boolean unsubscribe(Target target) {
+	public boolean unsubscribe(MessageTarget target) {
 		boolean removed = this.dispatcher.unsubscribe(target);
 		if (removed) {
 			this.handlerCount.decrementAndGet();
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java
index fe9adccb80..8b229b525a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PollingDispatcherTask.java
@@ -19,7 +19,7 @@ package org.springframework.integration.dispatcher;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.Subscribable;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.scheduling.MessagingTask;
 import org.springframework.integration.scheduling.Schedule;
 import org.springframework.util.Assert;
@@ -46,11 +46,11 @@ public class PollingDispatcherTask implements MessagingTask, Subscribable {
 	}
 
 
-	public boolean subscribe(Target target) {
+	public boolean subscribe(MessageTarget target) {
 		return this.dispatcher.subscribe(target);
 	}
 
-	public boolean unsubscribe(Target target) {
+	public boolean unsubscribe(MessageTarget target) {
 		return this.dispatcher.unsubscribe(target);
 	}
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
index 2bc2605510..d0677318dd 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
@@ -31,7 +31,7 @@ import org.springframework.integration.message.BlockingTarget;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.Subscribable;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * Basic implementation of {@link MessageDispatcher}.
@@ -42,7 +42,7 @@ public class SimpleDispatcher implements MessageDispatcher, Subscribable {
 
 	protected final Log logger = LogFactory.getLog(this.getClass());
 
-	private final List<Target> targets = new CopyOnWriteArrayList<Target>();
+	private final List<MessageTarget> targets = new CopyOnWriteArrayList<MessageTarget>();
 
 	protected final DispatcherPolicy dispatcherPolicy;
 
@@ -58,17 +58,17 @@ public class SimpleDispatcher implements MessageDispatcher, Subscribable {
 		this.sendTimeout = sendTimeout;
 	}
 
-	public boolean subscribe(Target target) {
+	public boolean subscribe(MessageTarget target) {
 		return this.targets.add(target);
 	}
 
-	public boolean unsubscribe(Target target) {
+	public boolean unsubscribe(MessageTarget target) {
 		return this.targets.remove(target);
 	}
 
 	public boolean dispatch(Message<?> message) {
 		int attempts = 0;
-		List<Target> targetList = new ArrayList<Target>(this.targets);
+		List<MessageTarget> targetList = new ArrayList<MessageTarget>(this.targets);
 		while (attempts < this.dispatcherPolicy.getRejectionLimit()) {
 			if (attempts > 0) {
 				if (logger.isDebugEnabled()) {
@@ -84,7 +84,7 @@ public class SimpleDispatcher implements MessageDispatcher, Subscribable {
 					return false;
 				}
 			}
-			Iterator<Target> iter = targetList.iterator();
+			Iterator<MessageTarget> iter = targetList.iterator();
 			if (!iter.hasNext()) {
 				if (logger.isWarnEnabled()) {
 					logger.warn("no active targets");
@@ -93,7 +93,7 @@ public class SimpleDispatcher implements MessageDispatcher, Subscribable {
 			}
 			boolean rejected = false;
 			while (iter.hasNext()) {
-				Target target = iter.next();
+				MessageTarget target = iter.next();
 				try {
 					boolean sent = (target instanceof BlockingTarget && this.sendTimeout >= 0) ?
 							((BlockingTarget) target).send(message, this.sendTimeout) : target.send(message);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java
index c3366758aa..3bdb9aa66f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ConcurrentTarget.java
@@ -27,29 +27,29 @@ import org.springframework.integration.handler.MessageHandlerNotRunningException
 import org.springframework.integration.handler.MessageHandlerRejectedExecutionException;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.util.ErrorHandler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.Assert;
 
 /**
- * A {@link Target} implementation that encapsulates an Executor and delegates
+ * A {@link MessageTarget} implementation that encapsulates an Executor and delegates
  * to a wrapped target for concurrent, asynchronous message handling.
  * 
  * @author Mark Fisher
  */
-public class ConcurrentTarget implements Target, DisposableBean {
+public class ConcurrentTarget implements MessageTarget, DisposableBean {
 
 	private final Log logger = LogFactory.getLog(this.getClass());
 
-	private final Target target;
+	private final MessageTarget target;
 
 	private final ExecutorService executor;
 
 	private volatile ErrorHandler errorHandler;
 
 
-	public ConcurrentTarget(Target target, ExecutorService executor) {
+	public ConcurrentTarget(MessageTarget target, ExecutorService executor) {
 		Assert.notNull(target, "'target' must not be null");
 		Assert.notNull(executor, "'executor' must not be null");
 		this.target = target;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java
index 2b7bdba4b3..061467c8ef 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/HandlerEndpoint.java
@@ -25,7 +25,7 @@ import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.message.MessageHeader;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -141,7 +141,7 @@ public class HandlerEndpoint extends TargetEndpoint {
 	}
 
 
-	private static class HandlerInvokingTarget implements Target {
+	private static class HandlerInvokingTarget implements MessageTarget {
 
 		private final MessageHandler handler;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
index 6d13fe45fe..3e37dc1148 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/TargetEndpoint.java
@@ -32,7 +32,7 @@ import org.springframework.integration.handler.MessageHandlerNotRunningException
 import org.springframework.integration.handler.MessageHandlerRejectedExecutionException;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHandlingException;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.selector.MessageSelector;
 import org.springframework.integration.scheduling.Subscription;
 import org.springframework.integration.util.ErrorHandler;
@@ -43,9 +43,9 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public class TargetEndpoint extends AbstractEndpoint implements Target, ChannelRegistryAware, InitializingBean, Lifecycle {
+public class TargetEndpoint extends AbstractEndpoint implements MessageTarget, ChannelRegistryAware, InitializingBean, Lifecycle {
 
-	private volatile Target target;
+	private volatile MessageTarget target;
 
 	private volatile Subscription subscription;
 
@@ -65,17 +65,17 @@ public class TargetEndpoint extends AbstractEndpoint implements Target, ChannelR
 	public TargetEndpoint() {
 	}
 
-	public TargetEndpoint(Target target) {
+	public TargetEndpoint(MessageTarget target) {
 		Assert.notNull(target, "target must not be null");
 		this.target = target;
 	}
 
 
-	public Target getTarget() {
+	public MessageTarget getTarget() {
 		return this.target;
 	}
 
-	public void setTarget(Target target) {
+	public void setTarget(MessageTarget target) {
 		Assert.notNull(target, "target must not be null");
 		this.target = target;
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java
index e971bb59d1..6cd0635076 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MethodInvokingTarget.java
@@ -18,14 +18,14 @@ package org.springframework.integration.handler;
 
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessagingException;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * A messaging target that invokes the specified method on the provided object.
  * 
  * @author Mark Fisher
  */
-public class MethodInvokingTarget extends AbstractMessageHandlerAdapter implements Target {
+public class MethodInvokingTarget extends AbstractMessageHandlerAdapter implements MessageTarget {
 
 	public boolean send(Message<?> message) {
 		this.handle(message);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java
index 6ecffacdb9..2db492f0d8 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java
@@ -17,11 +17,11 @@
 package org.springframework.integration.message;
 
 /**
- * Extends {@link Target} and provides a timeout-aware send method. 
+ * Extends {@link MessageTarget} and provides a timeout-aware send method. 
  * 
  * @author Mark Fisher
  */
-public interface BlockingTarget extends Target {
+public interface BlockingTarget extends MessageTarget {
 
 	/**
 	 * Send a message, blocking indefinitely if necessary.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/Target.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageTarget.java
similarity index 96%
rename from org.springframework.integration/src/main/java/org/springframework/integration/message/Target.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/message/MessageTarget.java
index 029344f600..be783a7448 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/Target.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageTarget.java
@@ -21,7 +21,7 @@ package org.springframework.integration.message;
  * 
  * @author Mark Fisher
  */
-public interface Target {
+public interface MessageTarget {
 
 	boolean send(Message<?> message);
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java
index ce4fc44543..bd369dcdbd 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/Subscribable.java
@@ -24,13 +24,13 @@ package org.springframework.integration.message;
 public interface Subscribable {
 
 	/**
-	 * Register a {@link Target} as a subscriber to this source.
+	 * Register a {@link MessageTarget} as a subscriber to this source.
 	 */
-	boolean subscribe(Target target);
+	boolean subscribe(MessageTarget target);
 
 	/**
-	 * Remove a {@link Target} from the subscribers of this source.
+	 * Remove a {@link MessageTarget} from the subscribers of this source.
 	 */
-	boolean unsubscribe(Target target);
+	boolean unsubscribe(MessageTarget target);
 
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java
index 52c3ab4692..4175d8a382 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/SubscriptionManagerTests.java
@@ -39,7 +39,7 @@ import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.StringMessage;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.selector.PayloadTypeSelector;
 import org.springframework.integration.scheduling.MessagePublishingErrorHandler;
 import org.springframework.integration.scheduling.SimpleMessagingTaskScheduler;
@@ -157,7 +157,7 @@ public class SubscriptionManagerTests {
 		channel.send(new StringMessage(1, "test"));
 		SubscriptionManager manager = new SubscriptionManager(channel, scheduler);
 		manager.addTarget(createEndpoint(handler1, true));
-		manager.addTarget(new Target() {
+		manager.addTarget(new MessageTarget() {
 			public boolean send(Message<?> message) {
 				throw new MessageHandlerRejectedExecutionException(message);
 			}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
index 43fc60db24..e1d12634cb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
@@ -39,7 +39,7 @@ import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.MessagePriority;
 import org.springframework.integration.message.StringMessage;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.scheduling.SimpleMessagingTaskScheduler;
 
 /**
@@ -272,7 +272,7 @@ public class ChannelParserTests {
 	}
 
 
-	private static class TestTarget implements Target {
+	private static class TestTarget implements MessageTarget {
 
 		private AtomicInteger counter;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java
index 8dc8b7bbd6..ed40dc501b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java
@@ -36,7 +36,7 @@ import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.integration.message.StringMessage;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * @author Mark Fisher
@@ -109,7 +109,7 @@ public class EndpointParserTests {
 	public void testEndpointWithSelectorAccepts() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"endpointWithSelector.xml", this.getClass());		
-		Target endpoint = (Target) context.getBean("endpoint");
+		MessageTarget endpoint = (MessageTarget) context.getBean("endpoint");
 		((Lifecycle) endpoint).start();
 		Message<?> message = new StringMessage("test");
 		MessageChannel replyChannel = new QueueChannel();
@@ -124,7 +124,7 @@ public class EndpointParserTests {
 	public void testEndpointWithSelectorRejects() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"endpointWithSelector.xml", this.getClass());		
-		Target endpoint = (Target) context.getBean("endpoint");
+		MessageTarget endpoint = (MessageTarget) context.getBean("endpoint");
 		((Lifecycle) endpoint).start();
 		Message<?> message = new GenericMessage<Integer>(123);
 		MessageChannel replyChannel = new QueueChannel();
@@ -136,7 +136,7 @@ public class EndpointParserTests {
 	public void testCustomErrorHandler() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"endpointWithErrorHandler.xml", this.getClass());
-		Target endpoint = (Target) context.getBean("endpoint");
+		MessageTarget endpoint = (MessageTarget) context.getBean("endpoint");
 		TestErrorHandler errorHandler = (TestErrorHandler) context.getBean("errorHandler");
 		assertNull(errorHandler.getLastError());
 		Message<?> message = new StringMessage("test");
@@ -151,7 +151,7 @@ public class EndpointParserTests {
 	public void testCustomReplyHandler() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"endpointWithReplyHandler.xml", this.getClass());
-		Target endpoint = (Target) context.getBean("endpoint");
+		MessageTarget endpoint = (MessageTarget) context.getBean("endpoint");
 		TestReplyHandler replyHandler = (TestReplyHandler) context.getBean("replyHandler");
 		assertNull(replyHandler.getLastMessage());
 		Message<?> message = new StringMessage("test");
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestTarget.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestTarget.java
index b7b24a8590..ac4ee00821 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestTarget.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestTarget.java
@@ -17,12 +17,12 @@
 package org.springframework.integration.config;
 
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * @author Mark Fisher
  */
-public class TestTarget implements Target {
+public class TestTarget implements MessageTarget {
 
 	public boolean send(Message<?> message) {
 		return true;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
index ad1c05d1cb..70e4412eec 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/DirectChannelTests.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.StringMessage;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * @author Mark Fisher
@@ -124,7 +124,7 @@ public class DirectChannelTests {
 	}
 
 
-	private static class ThreadNameSettingTestTarget implements Target {
+	private static class ThreadNameSettingTestTarget implements MessageTarget {
 
 		private final CountDownLatch latch;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
index 41ec4b6142..f8aaf2daba 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
@@ -29,7 +29,7 @@ import org.springframework.integration.endpoint.HandlerEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.TestHandlers;
 import org.springframework.integration.message.StringMessage;
-import org.springframework.integration.message.Target;
+import org.springframework.integration.message.MessageTarget;
 
 /**
  * @author Mark Fisher
@@ -76,7 +76,7 @@ public class SimpleDispatcherTests {
 	}
 
 
-	private static Target createEndpoint(MessageHandler handler) {
+	private static MessageTarget createEndpoint(MessageHandler handler) {
 		HandlerEndpoint endpoint = new HandlerEndpoint(handler);
 		endpoint.start();
 		return endpoint;