diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSourceAdapter.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
similarity index 93%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSourceAdapter.java
rename to spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
index d0b3e7b3d7..f36837d44a 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSourceAdapter.java
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventSource.java
@@ -33,12 +33,12 @@ import org.springframework.util.CollectionUtils;
  * 
  * @author Mark Fisher
  */
-public class ApplicationEventSourceAdapter extends ChannelPublisher implements ApplicationListener {
+public class ApplicationEventSource extends ChannelPublisher implements ApplicationListener {
 
 	private List<Class<? extends ApplicationEvent>> eventTypes = new ArrayList<Class<? extends ApplicationEvent>>();
 
 
-	public ApplicationEventSourceAdapter(MessageChannel channel) {
+	public ApplicationEventSource(MessageChannel channel) {
 		super(channel);
 	}
 
diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTargetAdapter.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
similarity index 91%
rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTargetAdapter.java
rename to spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
index 3abb1b3d9d..3495881af2 100644
--- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTargetAdapter.java
+++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/event/ApplicationEventTarget.java
@@ -24,13 +24,13 @@ import org.springframework.integration.message.MessageMapper;
 import org.springframework.integration.message.Target;
 
 /**
- * A target adapter for publishing {@link MessagingEvent MessagingEvents}. The
+ * A message target for publishing {@link MessagingEvent MessagingEvents}. The
  * {@link MessagingEvent} is a subclass of Spring's {@link ApplicationEvent}
  * used by this adapter to wrap any {@link Message} sent to this target.
  * 
  * @author Mark Fisher
  */
-public class ApplicationEventTargetAdapter<T> implements Target, ApplicationEventPublisherAware {
+public class ApplicationEventTarget<T> implements Target, ApplicationEventPublisherAware {
 
 	private final MessageMapper<T, MessagingEvent<T>> mapper = new MessagingEventMapper<T>();
 
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceAdapterTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java
similarity index 93%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceAdapterTests.java
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java
index 00019ecc64..129d0039e6 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceAdapterTests.java
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventSourceTests.java
@@ -38,12 +38,12 @@ import org.springframework.integration.message.Message;
 /**
  * @author Mark Fisher
  */
-public class ApplicationEventSourceAdapterTests {
+public class ApplicationEventSourceTests {
 
 	@Test
 	public void testAnyApplicationEventSentByDefault() {
 		MessageChannel channel = new QueueChannel();
-		ApplicationEventSourceAdapter adapter = new ApplicationEventSourceAdapter(channel);
+		ApplicationEventSource adapter = new ApplicationEventSource(channel);
 		Message<?> message1 = channel.receive(0);
 		assertNull(message1);
 		adapter.onApplicationEvent(new TestApplicationEvent1());
@@ -59,7 +59,7 @@ public class ApplicationEventSourceAdapterTests {
 	@Test
 	public void testOnlyConfiguredEventTypesAreSent() {
 		MessageChannel channel = new QueueChannel();
-		ApplicationEventSourceAdapter adapter = new ApplicationEventSourceAdapter(channel);
+		ApplicationEventSource adapter = new ApplicationEventSource(channel);
 		List<Class<? extends ApplicationEvent>> eventTypes = new ArrayList<Class<? extends ApplicationEvent>>();
 		eventTypes.add(TestApplicationEvent1.class);
 		adapter.setEventTypes(eventTypes);
@@ -76,7 +76,7 @@ public class ApplicationEventSourceAdapterTests {
 
 	@Test
 	public void testApplicationContextEvents() {
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationEventSourceAdapterTests.xml", this.getClass());
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationEventSourceTests.xml", this.getClass());
 		MessageChannel channel = (MessageChannel) context.getBean("channel");
 		Message<?> refreshedEventMessage = channel.receive(0);
 		assertNotNull(refreshedEventMessage);
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetAdapterTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java
similarity index 94%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetAdapterTests.java
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java
index 48e22e7176..e2f99d29d5 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetAdapterTests.java
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/ApplicationEventTargetTests.java
@@ -35,7 +35,7 @@ import org.springframework.integration.scheduling.Subscription;
 /**
  * @author Mark Fisher
  */
-public class ApplicationEventTargetAdapterTests {
+public class ApplicationEventTargetTests {
 
 	@Test
 	public void testSendingEvent() throws InterruptedException {
@@ -46,7 +46,7 @@ public class ApplicationEventTargetAdapterTests {
 			}
 		};
 		MessageChannel channel = new QueueChannel();
-		ApplicationEventTargetAdapter adapter = new ApplicationEventTargetAdapter();
+		ApplicationEventTarget adapter = new ApplicationEventTarget();
 		adapter.setApplicationEventPublisher(publisher);
 		MessageBus bus = new MessageBus();
 		bus.registerChannel("channel", channel);
diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceAdapterTests.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml
similarity index 82%
rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceAdapterTests.xml
rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml
index 43d88b7b01..f21582fdfd 100644
--- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceAdapterTests.xml
+++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/event/applicationEventSourceTests.xml
@@ -8,7 +8,7 @@
 
 	<bean id="channel" class="org.springframework.integration.channel.QueueChannel"/>
 
-	<bean id="adapter" class="org.springframework.integration.adapter.event.ApplicationEventSourceAdapter">
+	<bean id="source" class="org.springframework.integration.adapter.event.ApplicationEventSource">
 		<constructor-arg ref="channel"/>
 	</bean>