diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
index 5b5364a569..70896e92d7 100644
--- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
+++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParser.java
@@ -39,7 +39,7 @@ public class FeedMessageSourceBeanDefinitionParser extends AbstractPollingInboun
 				"org.springframework.integration.feed.FeedEntryReaderMessageSource");
 		BeanDefinitionBuilder feedBuilder = BeanDefinitionBuilder.genericBeanDefinition(
 				"org.springframework.integration.feed.FeedReaderMessageSource");
-		feedBuilder.addConstructorArgValue(element.getAttribute("feed-url"));
+		feedBuilder.addConstructorArgValue(element.getAttribute("url"));
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(feedEntryBuilder, element, "metadata-store");
 		feedEntryBuilder.addConstructorArgValue(feedBuilder.getBeanDefinition());
 		return BeanDefinitionReaderUtils.registerWithGeneratedName(feedEntryBuilder.getBeanDefinition(), parserContext.getRegistry());
diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedNamespaceHandler.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedNamespaceHandler.java
index 5ffa3ba54d..0f28fe5f45 100644
--- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedNamespaceHandler.java
+++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/FeedNamespaceHandler.java
@@ -13,19 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.feed.config;
 
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
+import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler;
 
 /**
- * NamespaceHandler for FEED module
+ * NamespaceHandler for the feed module.
  * 
  * @author Josh Long
+ * @since 2.0
  */
-public class FeedNamespaceHandler extends NamespaceHandlerSupport {
+public class FeedNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
-    public void init() {
-        registerBeanDefinitionParser("inbound-channel-adapter", new FeedMessageSourceBeanDefinitionParser());
-    }
-}
\ No newline at end of file
+	public void init() {
+		registerBeanDefinitionParser("inbound-channel-adapter", new FeedMessageSourceBeanDefinitionParser());
+	}
+
+}
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
index c9aa79a62c..5ec2708ded 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
@@ -1,64 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.springframework.org/schema/integration/feed"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:beans="http://www.springframework.org/schema/beans"
-            xmlns:tool="http://www.springframework.org/schema/tool"
-            xmlns:integration="http://www.springframework.org/schema/integration"
-            targetNamespace="http://www.springframework.org/schema/integration/feed"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified">
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:tool="http://www.springframework.org/schema/tool"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	targetNamespace="http://www.springframework.org/schema/integration/feed"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-    <xsd:import namespace="http://www.springframework.org/schema/beans"/>
-    <xsd:import namespace="http://www.springframework.org/schema/integration"
-                schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/integration"
+		schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.0.xsd" />
 
-    <xsd:element name="inbound-channel-adapter">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
-              This adapter takes a feed URL (either RSS or ATOM) and responds to updates.
-
-              Depending on whether you've set the prefer-updated-feeds-to-entries attribute
-              or not, you will recieve <code>SyndFeed</code> or <code>SyndEntry</code> objects.
-
-            ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-            </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:string"/>
-            <xsd:attribute name="auto-startup" type="xsd:string" default="true" />
-            <xsd:attribute name="channel" use="required" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:appinfo>
-                        <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.MessageChannel"/>
-                        </tool:annotation>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="metadata-store" use="optional" type="xsd:string">
-                <xsd:annotation>
-                	<xsd:documentation>
-                		Allows you to provide cusom implementation of 'org.springframework.integration.context.metadata.MetadataStore'
-                		to persist the state of the retrieved feeds to aviod duplicates between restarts.
-                	</xsd:documentation>
-                    <xsd:appinfo>
-                        <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.context.metadata.MetadataStore"/>
-                        </tool:annotation>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="feed-url" type="xsd:string" use="required">	
-            	<xsd:annotation>
-            		<xsd:documentation>
-            			Allows you to specify URL for RSS/ATOM feed
+	<xsd:element name="inbound-channel-adapter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+				This adapter takes a feed URL (either RSS or ATOM) and responds to updates.
+				Each Message will be sent to the provided channel with a feed entry as its payload.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" />
+			<xsd:attribute name="url" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation>
+						The URL for an RSS or ATOM feed.
             		</xsd:documentation>
-            	</xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
-
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="channel" use="required" type="xsd:string">
+				<xsd:annotation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="org.springframework.integration.MessageChannel" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="metadata-store" use="optional" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation>
+						Reference to a MetadataStore instance for storing metadata associated with
+						the retrieved feeds. If the implementation is persistent, it can help to
+						prevent duplicates between restarts. If shared, it can help coordinate multiple
+						instances of an adapter across different processes.
+                	</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="org.springframework.integration.context.metadata.MetadataStore" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true" />
+		</xsd:complexType>
+	</xsd:element>
 
 </xsd:schema>
\ No newline at end of file
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
index c832a3ac07..2403d1d3e0 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml
@@ -10,7 +10,7 @@
 						channel="feedChannel" 
 						auto-startup="false" 
 						metadata-store="customMetadataStore"
-						feed-url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
+						url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
 		<int:poller fixed-rate="10000" max-messages-per-poll="100" />
 	</int-feed:inbound-channel-adapter>
 
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
index 041b88a519..f8c51488c4 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml
@@ -10,7 +10,7 @@
 
 	<int-feed:inbound-channel-adapter id="feedAdapterUsage"
 						channel="feedChannelUsage"
-						feed-url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
+						url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
 		<int:poller fixed-rate="10000" max-messages-per-poll="100" fixed-delay="10000"/>
 	</int-feed:inbound-channel-adapter>
 
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
index 34bc76beb8..c084ff58b0 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration/feed http://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd">
 
 	<int-feed:inbound-channel-adapter channel="feedChannelUsage"
-						feed-url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
+						url="file:src/test/java/org/springframework/integration/feed/config/sample.rss">
 		<int:poller fixed-rate="10000" max-messages-per-poll="100" fixed-delay="10000"/>
 	</int-feed:inbound-channel-adapter>
 
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
index 3e1597b65a..f4603931ab 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml
@@ -8,10 +8,11 @@
 	
 	<int-feed:inbound-channel-adapter id="feedAdapter" 
 						channel="feedChannel" 
-						auto-startup="false" 
-						feed-url="http://feeds.bbci.co.uk/news/rss.xml">
+						url="http://feeds.bbci.co.uk/news/rss.xml"
+						auto-startup="false">
 		<int:poller fixed-rate="10000" max-messages-per-poll="100" />
 	</int-feed:inbound-channel-adapter>
 	
 	<int:channel id="feedChannel" />
+
 </beans>
\ No newline at end of file