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-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 9efa915ea2..d8bd12b380 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
@@ -67,7 +67,7 @@
                 <xsd:annotation>
                     <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>
@@ -318,7 +318,7 @@ Only files matching this regular expression will be picked up by this adapter.
                 <xsd:annotation>
                     <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>