diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
index 7a8428af96..241fed2e7c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
@@ -21,8 +21,8 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.core.convert.ConversionService;
 
 import org.springframework.integration.MessageChannel;
-import org.springframework.integration.context.metadata.MetadataStore;
 import org.springframework.integration.scheduling.PollerMetadata;
+import org.springframework.integration.store.MetadataStore;
 
 import org.springframework.scheduling.TaskScheduler;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/metadata/MetadataStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MetadataStore.java
similarity index 94%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/metadata/MetadataStore.java
rename to spring-integration-core/src/main/java/org/springframework/integration/store/MetadataStore.java
index bd085dfe7e..346d7ba8e5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/metadata/MetadataStore.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MetadataStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.context.metadata;
+package org.springframework.integration.store;
 
 /**
  * Strategy interface for storing metadata from certain adapters
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/PropertiesPersistingMetadataStore.java
similarity index 98%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStore.java
rename to spring-integration-core/src/main/java/org/springframework/integration/store/PropertiesPersistingMetadataStore.java
index 21a2a10fd0..8c9984072b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStore.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/store/PropertiesPersistingMetadataStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.context.metadata;
+package org.springframework.integration.store;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/metadata/SimpleMetadataStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMetadataStore.java
similarity index 95%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/metadata/SimpleMetadataStore.java
rename to spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMetadataStore.java
index 2ade1e3545..1d1421ebc9 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/metadata/SimpleMetadataStore.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMetadataStore.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.integration.context.metadata;
+package org.springframework.integration.store;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStoreTests.java b/spring-integration-core/src/test/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStoreTests.java
index 4d7d76da20..050f0bb83e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStoreTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/context/metadata/PropertiesPersistingMetadataStoreTests.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
+import org.springframework.integration.store.PropertiesPersistingMetadataStore;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/FeedEntryMessageSource.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/FeedEntryMessageSource.java
index f3006bb720..102723871a 100644
--- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/FeedEntryMessageSource.java
+++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/FeedEntryMessageSource.java
@@ -28,9 +28,9 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.context.IntegrationObjectSupport;
-import org.springframework.integration.context.metadata.MetadataStore;
-import org.springframework.integration.context.metadata.SimpleMetadataStore;
 import org.springframework.integration.core.MessageSource;
+import org.springframework.integration.store.MetadataStore;
+import org.springframework.integration.store.SimpleMetadataStore;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/FeedEntryMessageSourceTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/FeedEntryMessageSourceTests.java
index affc9a252e..b9ccb2248e 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/FeedEntryMessageSourceTests.java
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/FeedEntryMessageSourceTests.java
@@ -27,7 +27,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.integration.Message;
-import org.springframework.integration.context.metadata.PropertiesPersistingMetadataStore;
+import org.springframework.integration.store.PropertiesPersistingMetadataStore;
 
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.fetcher.FeedFetcher;
diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java
index 5f27e2125f..6329d313e5 100644
--- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java
+++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java
@@ -38,11 +38,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.context.metadata.MetadataStore;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.feed.FeedEntryMessageSource;
 import org.springframework.integration.history.MessageHistory;
+import org.springframework.integration.store.MetadataStore;
 import org.springframework.integration.test.util.TestUtils;
 
 import com.sun.syndication.feed.synd.SyndEntry;
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java
index df453334f7..ddef18803b 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractInboundTwitterEndpointSupport.java
@@ -23,10 +23,10 @@ import java.util.concurrent.ScheduledFuture;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.Message;
 import org.springframework.integration.context.IntegrationContextUtils;
-import org.springframework.integration.context.metadata.MetadataStore;
-import org.springframework.integration.context.metadata.SimpleMetadataStore;
 import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.history.HistoryWritingMessagePostProcessor;
+import org.springframework.integration.store.MetadataStore;
+import org.springframework.integration.store.SimpleMetadataStore;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.integration.twitter.oauth.OAuthConfiguration;
 import org.springframework.util.Assert;
@@ -40,7 +40,7 @@ import twitter4j.Twitter;
  * messages when using the Twitter API. This class also handles keeping track of
  * the latest inbound message it has received and avoiding, where possible,
  * redelivery of common messages. This functionality is enabled using the
- * {@link org.springframework.integration.context.metadata.MetadataStore}
+ * {@link org.springframework.integration.store.MetadataStore}
  * strategy.
  * 
  * @author Josh Long