diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java
index b3b9ad68..678ec9e2 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/ConfigurationPropertiesRebinderAutoConfiguration.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData;
+import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetadata;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessor;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessorRegistrar;
 import org.springframework.cloud.context.properties.ConfigurationPropertiesBeans;
@@ -49,10 +49,10 @@ public class ConfigurationPropertiesRebinderAutoConfiguration
 		// cause a cascade of bean instantiation. Knowing the *name* of the beans we
 		// need is super optimal, but a little brittle (unfortunately we have no
 		// choice).
-		ConfigurationBeanFactoryMetaData metaData = this.context.getBean(
+		ConfigurationBeanFactoryMetadata metaData = this.context.getBean(
 				ConfigurationPropertiesBindingPostProcessorRegistrar.BINDER_BEAN_NAME
 						+ ".store",
-						ConfigurationBeanFactoryMetaData.class);
+						ConfigurationBeanFactoryMetadata.class);
 		ConfigurationPropertiesBeans beans = new ConfigurationPropertiesBeans();
 		beans.setBeanMetaDataStore(metaData);
 		return beans;
diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java
index 04eb0f86..f655e500 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/properties/ConfigurationPropertiesBeans.java
@@ -23,7 +23,7 @@ import java.util.Set;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData;
+import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetadata;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Component;
 public class ConfigurationPropertiesBeans implements BeanPostProcessor,
 ApplicationContextAware {
 
-	private ConfigurationBeanFactoryMetaData metaData;
+	private ConfigurationBeanFactoryMetadata metaData;
 
 	private Map<String, Object> beans = new HashMap<String, Object>();
 
@@ -76,7 +76,7 @@ ApplicationContextAware {
 	/**
 	 * @param beans the bean meta data to set
 	 */
-	public void setBeanMetaDataStore(ConfigurationBeanFactoryMetaData beans) {
+	public void setBeanMetaDataStore(ConfigurationBeanFactoryMetadata beans) {
 		this.metaData = beans;
 	}