diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteService.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
index ecc4fa5760..0264ce4a28 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/QuoteService.java
@@ -22,13 +22,13 @@ import java.util.Random;
 
 import org.springframework.integration.annotation.Handler;
 import org.springframework.integration.annotation.MessageEndpoint;
-import org.springframework.integration.annotation.Polled;
+import org.springframework.integration.annotation.Poller;
 
 /**
  * @author Mark Fisher
  */
 @MessageEndpoint(input="tickers", output="quotes")
-@Polled(period=300)
+@Poller(period=300)
 public class QuoteService {
 
 	@Handler
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Polled.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Poller.java
similarity index 94%
rename from org.springframework.integration/src/main/java/org/springframework/integration/annotation/Polled.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Poller.java
index bf142c665d..7a85c514f7 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Polled.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Poller.java
@@ -29,7 +29,7 @@ import org.springframework.integration.scheduling.PollingSchedule;
 /**
  * Annotation that can be specified at class-level alongside a
  * {@link MessageEndpoint @MessageEndpoint} annotation in order to provide the
- * scheduling information for that endpoint.
+ * polling metadata and scheduling information for that endpoint.
  * 
  * @author Mark Fisher
  */
@@ -37,7 +37,7 @@ import org.springframework.integration.scheduling.PollingSchedule;
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
-public @interface Polled {
+public @interface Poller {
 
 	int period() default 0;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractAnnotationMethodPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractAnnotationMethodPostProcessor.java
index 97a02ee780..748593e4ac 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractAnnotationMethodPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractAnnotationMethodPostProcessor.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.integration.annotation.Polled;
+import org.springframework.integration.annotation.Poller;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Schedule;
@@ -99,12 +99,12 @@ public abstract class AbstractAnnotationMethodPostProcessor<T> implements Annota
 
 	protected Schedule extractSchedule(Class<?> originalBeanClass) {
 		PollingSchedule schedule = null;
-		Polled polledAnnotation = AnnotationUtils.findAnnotation(originalBeanClass, Polled.class);
-		if (polledAnnotation != null) {
-			schedule = new PollingSchedule(polledAnnotation.period());
-			schedule.setInitialDelay(polledAnnotation.initialDelay());
-			schedule.setFixedRate(polledAnnotation.fixedRate());
-			schedule.setTimeUnit(polledAnnotation.timeUnit());
+		Poller pollerAnnotation = AnnotationUtils.findAnnotation(originalBeanClass, Poller.class);
+		if (pollerAnnotation != null) {
+			schedule = new PollingSchedule(pollerAnnotation.period());
+			schedule.setInitialDelay(pollerAnnotation.initialDelay());
+			schedule.setFixedRate(pollerAnnotation.fixedRate());
+			schedule.setTimeUnit(pollerAnnotation.timeUnit());
 		}
 		return schedule;
 	}
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 2be8d23d12..8805bb5fd1 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
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.annotation.MessageEndpoint;
-import org.springframework.integration.annotation.Polled;
+import org.springframework.integration.annotation.Poller;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
@@ -91,18 +91,18 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Init
 						postProcessor.createEndpoint(bean, beanName, beanClass, endpointAnnotation);
 				if (endpoint != null) {
 					endpoint.setName(beanName + "." + entry.getKey().getSimpleName() + ".endpoint");
-					Polled polledAnnotation = AnnotationUtils.findAnnotation(beanClass, Polled.class);
-					if (polledAnnotation != null) {
-						PollingSchedule schedule = new PollingSchedule(polledAnnotation.period());
-						schedule.setInitialDelay(polledAnnotation.initialDelay());
-						schedule.setFixedRate(polledAnnotation.fixedRate());
-						schedule.setTimeUnit(polledAnnotation.timeUnit());
+					Poller pollerAnnotation = AnnotationUtils.findAnnotation(beanClass, Poller.class);
+					if (pollerAnnotation != null) {
+						PollingSchedule schedule = new PollingSchedule(pollerAnnotation.period());
+						schedule.setInitialDelay(pollerAnnotation.initialDelay());
+						schedule.setFixedRate(pollerAnnotation.fixedRate());
+						schedule.setTimeUnit(pollerAnnotation.timeUnit());
 						String inputChannelName = endpointAnnotation.input();
 						MessageChannel inputChannel = this.messageBus.lookupChannel(inputChannelName);
 						if (inputChannel != null) {
 							if (inputChannel instanceof PollableChannel) {
 								PollingDispatcher poller = new PollingDispatcher((PollableChannel) inputChannel, schedule);
-								poller.setMaxMessagesPerPoll(polledAnnotation.maxMessagesPerPoll());
+								poller.setMaxMessagesPerPoll(pollerAnnotation.maxMessagesPerPoll());
 								endpoint.setSource(poller);
 							}
 							else {
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
index ceb7d5cace..e9d75e557a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java
@@ -45,7 +45,7 @@ import org.springframework.integration.annotation.Handler;
 import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.annotation.MessageTarget;
 import org.springframework.integration.annotation.Pollable;
-import org.springframework.integration.annotation.Polled;
+import org.springframework.integration.annotation.Poller;
 import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.annotation.Transformer;
 import org.springframework.integration.bus.DefaultMessageBus;
@@ -355,7 +355,7 @@ public class MessagingAnnotationPostProcessorTests {
 	}
 
 	@Test
-	public void testEndpointWithPolledAnnotation() {
+	public void testEndpointWithPollerAnnotation() {
 		MessageBus messageBus = new DefaultMessageBus();
 		QueueChannel testChannel = new QueueChannel();
 		messageBus.registerChannel("testChannel", testChannel);
@@ -489,7 +489,7 @@ public class MessagingAnnotationPostProcessorTests {
 
 
 	@MessageEndpoint(input="testChannel")
-	@Polled(period=1234, initialDelay=5678, fixedRate=true, timeUnit=TimeUnit.SECONDS)
+	@Poller(period=1234, initialDelay=5678, fixedRate=true, timeUnit=TimeUnit.SECONDS)
 	private static class AnnotatedEndpointWithPolledAnnotation {
 
 		@Handler