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 fa2ee5ec91..07b664d8f5 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
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.core.convert.ConversionService;
 
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.endpoint.metadata.MetadataPersister;
+import org.springframework.integration.context.metadata.MetadataPersister;
 import org.springframework.integration.scheduling.PollerMetadata;
 
 import org.springframework.scheduling.TaskScheduler;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MapBasedMetadataPersister.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MapBasedMetadataPersister.java
index d383441e35..be08702ee0 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MapBasedMetadataPersister.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MapBasedMetadataPersister.java
@@ -1,11 +1,11 @@
-package org.springframework.integration.endpoint.metadata;
+package org.springframework.integration.context.metadata;
 
 import org.springframework.util.Assert;
 
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Simple in-memory implementation of teh {@link org.springframework.integration.endpoint.metadata.MetadataPersister}
+ * Simple in-memory implementation of teh {@link org.springframework.integration.context.metadata.MetadataPersister}
  * interface suitable for the use cases where it's assured that component only needs ephemeral metadata.
  *
  *
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MetadataPersister.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MetadataPersister.java
index c188f15c8a..6ba6464308 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MetadataPersister.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/MetadataPersister.java
@@ -1,6 +1,4 @@
-package org.springframework.integration.endpoint.metadata;
-
-import java.util.Properties;
+package org.springframework.integration.context.metadata;
 
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
index 52e251704a..62ab8f4e74 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.endpoint.metadata;
+package org.springframework.integration.context.metadata;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -13,7 +13,7 @@ import java.util.concurrent.Executor;
 
 
 /**
- * Implementation of {@link org.springframework.integration.endpoint.metadata.MetadataPersister} that knows how to write metadata
+ * Implementation of {@link org.springframework.integration.context.metadata.MetadataPersister} that knows how to write metadata
  * to a {@link java.util.Properties} instance.
  * 
  *
@@ -178,7 +178,7 @@ public class PropertiesBasedMetadataPersister implements MetadataPersister<Strin
             this.cachedLocationOfPropertiesFile = this.locationOfPropertiesOnDisk.getFile();
 
             propertiesFactoryBean.setLocations(this.bootstrapResources.toArray(new Resource[bootstrapResources.size()]));
-            // we take the existing Resources [] and use them to bootstrap a Property file when this component wakes up again 
+            // we take the existing Resources [] and use them to bootstrap a Properties instance when this component wakes up again 
             propertiesFactoryBean.afterPropertiesSet();
             properties = propertiesFactoryBean.getObject();
         }
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java
index c06ce1dc48..0c35a7e60a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.endpoint.metadata;
+package org.springframework.integration.context.metadata;
 
 import org.junit.After;
 import org.junit.Assert;