diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java
index afeadefa4e..2d89f14dc6 100644
--- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java
+++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java
@@ -21,7 +21,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
-import org.springframework.integration.endpoint.AbstractProducerEndpoint;
+import org.springframework.integration.endpoint.AbstractMessageProducingEndpoint;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -32,7 +32,7 @@ import org.springframework.util.CollectionUtils;
  * 
  * @author Mark Fisher
  */
-public class ApplicationEventInboundChannelAdapter extends AbstractProducerEndpoint implements ApplicationListener {
+public class ApplicationEventInboundChannelAdapter extends AbstractMessageProducingEndpoint implements ApplicationListener {
 
 	private final List<Class<? extends ApplicationEvent>> eventTypes = new CopyOnWriteArrayList<Class<? extends ApplicationEvent>>();
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractProducerEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java
similarity index 94%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractProducerEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java
index 5a8d0f9b1b..222d80c16b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractProducerEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
 /**
  * @author Mark Fisher
  */
-public class AbstractProducerEndpoint extends AbstractEndpoint {
+public class AbstractMessageProducingEndpoint extends AbstractEndpoint {
 
 	private volatile MessageChannel outputChannel;