diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml
index 311cda88d5..e4f554c75b 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml
@@ -17,7 +17,7 @@
 	</si:channel>
 
 	<si:inbound-channel-adapter ref="jmsSource" channel="channel">
-		<si:poller period="5000" initial-delay="0" max-messages-per-poll="1"/>
+		<si:poller interval="5000" initial-delay="0" max-messages-per-poll="1"/>
 	</si:inbound-channel-adapter>
 
 	<jms:jms-source id="jmsSource" jms-template="jmsTemplate"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
index 41e83532a7..ba67a266cd 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
@@ -16,7 +16,7 @@
 
 	<file:inbound-channel-adapter id="filesIn"
 	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input">
-		<integration:poller period="5000"/>
+		<integration:poller interval="5000"/>
 	</file:inbound-channel-adapter>
 
 	<integration:service-activator input-channel="filesIn"
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index 82eb6ce257..68b04153e8 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -14,7 +14,7 @@
 	<channel id="odd"/>
 
 	<inbound-channel-adapter id="numbers" ref="counter" method="next">
-		<poller period="3000" max-messages-per-poll="1"/>
+		<poller interval="3000" max-messages-per-poll="1"/>
 	</inbound-channel-adapter>
 
 	<router ref="parityResolver" method="getParity" input-channel="numbers"/>
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
index c70ebec444..ffe8f63664 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
@@ -141,11 +141,11 @@ public abstract class IntegrationNamespaceUtils {
 	 */
 	public static void configureTrigger(Element pollerElement, BeanDefinitionBuilder targetBuilder) {
 		Trigger trigger = null;
-		String interval = pollerElement.getAttribute("period");
+		String interval = pollerElement.getAttribute("interval");
 		String cron = pollerElement.getAttribute("cron");
 		if (!(StringUtils.hasText(interval) ^ StringUtils.hasText(cron))) {
 			throw new ConfigurationException(
-					"A <poller> element must define either a period or a cron expression (but not both).");
+					"A <poller> element must include either an 'interval' or a 'cron' expression (but not both).");
 		}
 		if (StringUtils.hasText(interval)) {
 			Long period = Long.valueOf(interval);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
index 61a2c08334..f1292d027e 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
@@ -245,7 +245,7 @@
 			<xsd:sequence>
 				<xsd:element name="transactional" type="transactionalType" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="period" type="xsd:long"/>
+			<xsd:attribute name="interval" type="xsd:long"/>
 			<xsd:attribute name="cron" type="xsd:string"/>
 			<xsd:attribute name="initial-delay" type="xsd:long"/>
 			<xsd:attribute name="fixed-rate" type="xsd:boolean"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
index 0f8c7b3c4a..8c5adaa028 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
@@ -18,7 +18,7 @@
 	<outbound-channel-adapter id="methodInvokingConsumer" ref="testBean" method="store"/>
 
 	<inbound-channel-adapter id="methodInvokingSource" ref="testBean" method="getMessage" channel="queueChannel">
-		<poller period="10000" max-messages-per-poll="1"/>
+		<poller interval="10000" max-messages-per-poll="1"/>
 	</inbound-channel-adapter>
 
 	<beans:bean id="consumer" class="org.springframework.integration.config.TestConsumer"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
index db2baffa11..e9aaf5ef19 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
@@ -15,7 +15,7 @@
 
 	<service-activator id="endpoint" input-channel="testChannel"
 	                  ref="testHandler" selector="typeSelector">
-		<poller period="100"/>
+		<poller interval="100"/>
 	</service-activator>
 
 	<beans:bean id="typeSelector" class="org.springframework.integration.message.selector.PayloadTypeSelector">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index c21a156ca4..7e9665172e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -14,7 +14,7 @@
 	</channel>
 
 	<service-activator input-channel="testChannel" ref="testHandler">
-		<poller period="100"/>
+		<poller interval="100"/>
 	</service-activator>
 
 	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
index c2220be540..8778ce1c54 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
@@ -26,7 +26,7 @@
 	                   ref="testBean"
 	                   method="good"
                        output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager" propagation="MANDATORY"/>
         </poller>
     </service-activator>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
index b2c390387a..efca517669 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
@@ -22,7 +22,7 @@
 	                   ref="testBean"
 	                   method="good"
                        output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager" propagation="NOT_SUPPORTED"/>
         </poller>
     </service-activator>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
index 0964d803d0..d21acb32f7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
@@ -22,7 +22,7 @@
 	                   ref="testBean"
 	                   method="good"
                        output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager" propagation="REQUIRED"/>
         </poller>
     </service-activator>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
index 5af16141dd..b91815e540 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
@@ -22,7 +22,7 @@
 	                   ref="testBean"
 	                   method="good"
                        output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager" propagation="REQUIRES_NEW"/>
         </poller>
     </service-activator>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
index e4fb07d0b4..79b2cb6b8d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
@@ -22,7 +22,7 @@
 	                   ref="testBean"
 	                   method="good"
                        output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager" propagation="SUPPORTS"/>
         </poller>
     </service-activator>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
index 34fa7adf91..9eea616b4e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
@@ -22,19 +22,19 @@
 	</channel>
 
 	<service-activator input-channel="badInput"
-	                  ref="testBean"
-	                  method="bad"
-                      output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+	                   ref="testBean"
+	                   method="bad"
+                       output-channel="output">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager"/>
         </poller>
     </service-activator>
 
 	<service-activator input-channel="goodInput"
-	                  ref="testBean"
-	                  method="good"
-                      output-channel="output">
-        <poller period="10000" max-messages-per-poll="1">
+	                   ref="testBean"
+	                   method="good"
+                       output-channel="output">
+        <poller interval="10000" max-messages-per-poll="1">
         	<transactional transaction-manager="txManager"/>
         </poller>
 	</service-activator>