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 c64fd727f1..0ce9acfb5b 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
@@ -53,7 +53,7 @@
                 	</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="com.sun.syndication.FeedFetcher" />
+							<tool:expected-type type="com.sun.syndication.fetcher.FeedFetcher" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -68,7 +68,7 @@
                 	</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.context.metadata.MetadataStore" />
+							<tool:expected-type type="org.springframework.integration.store.MetadataStore" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd
index 25a7c93fe3..1cce09172f 100644
--- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd
+++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd
@@ -53,7 +53,7 @@
                 	</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="com.sun.syndication.FeedFetcher" />
+							<tool:expected-type type="com.sun.syndication.fetcher.FeedFetcher" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -68,7 +68,7 @@
                 	</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.context.metadata.MetadataStore" />
+							<tool:expected-type type="org.springframework.integration.store.MetadataStore" />
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
index d72e33cc11..bd699e9075 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
@@ -94,7 +94,7 @@
                     ]]></xsd:documentation>                   
                     <xsd:appinfo>
                         <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.file.entries.EntryListFilter"/>
+                            <tool:expected-type type="org.springframework.integration.file.filters.FileListFilter"/>
                         </tool:annotation>
                     </xsd:appinfo>
                 </xsd:annotation>
@@ -415,7 +415,7 @@ Only files matching this regular expression will be picked up by this adapter.
                     </xsd:documentation>                     
                     <xsd:appinfo>
                         <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.file.locking.FileLocker"/>
+                            <tool:expected-type type="org.springframework.integration.file.FileLocker"/>
                         </tool:annotation>
                     </xsd:appinfo>
                 </xsd:annotation>
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd
index 85cef0cd58..e30017812c 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.1.xsd
@@ -94,7 +94,7 @@
 					]]></xsd:documentation>                
                     <xsd:appinfo>
                         <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.file.entries.EntryListFilter"/>
+                            <tool:expected-type type="org.springframework.integration.file.filters.FileListFilter"/>
                         </tool:annotation>
                     </xsd:appinfo>
                 </xsd:annotation>
@@ -414,7 +414,7 @@ Only files matching this regular expression will be picked up by this adapter.
 	                </xsd:documentation>                     
                     <xsd:appinfo>
                         <tool:annotation kind="ref">
-                            <tool:expected-type type="org.springframework.integration.file.locking.FileLocker"/>
+                            <tool:expected-type type="org.springframework.integration.file.FileLocker"/>
                         </tool:annotation>
                     </xsd:appinfo>
                 </xsd:annotation>
diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd
index eb4babc1c7..6a41e6f757 100644
--- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd
+++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd
@@ -421,11 +421,11 @@
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
 						<tool:expected-type
-							type="org.springframework.integration.sftp.session.DefaultSftpSessionFactory" />
+							type="org.springframework.integration.ftp.session.DefaultFtpSessionFactory" />
 					</tool:annotation>
 				</xsd:appinfo>
 				<xsd:documentation><![CDATA[
-                Reference to a [org.springframework.integration.sftp.session.DefaultSftpSessionFactory] bean.
+                Reference to a [org.springframework.integration.ftp.session.DefaultFtpSessionFactory] bean.
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd
index 72ff4f449c..2e0cb7049e 100644
--- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd
+++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd
@@ -102,7 +102,7 @@
 				]]></xsd:documentation>
 				<xsd:appinfo>
 					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.jms.support.converter.MessageConverter"/>
+						<tool:expected-type type="org.springframework.integration.support.converter.MessageConverter"/>
 					</tool:annotation>
 				</xsd:appinfo>
 			</xsd:annotation>