diff --git a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java
index ffcd5b00..a9ca17dd 100644
--- a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java
@@ -75,7 +75,7 @@ public class CacheClusterConfigurationIntegrationTest {
 
 		assertTrue(locatorWorkingDirectory.isDirectory() || locatorWorkingDirectory.mkdirs());
 
-		ZipUtils.unzip(new ClassPathResource("/shared_config.zip"), locatorWorkingDirectory);
+		ZipUtils.unzip(new ClassPathResource("/cluster_config.zip"), locatorWorkingDirectory);
 
 		List<String> arguments = new ArrayList<String>();
 
diff --git a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java
index a69f0f91..24b383c5 100644
--- a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java
+++ b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java
@@ -72,13 +72,13 @@ public class LocatorProcess {
 				DEFAULT_HOSTNAME_FOR_CLIENTS))
 			.setPort(Integer.getInteger("spring.gemfire.locator-port", DEFAULT_LOCATOR_PORT))
 			.setRedirectOutput(false)
-			.set(DistributionConfig.ENABLE_SHARED_CONFIGURATION_NAME, String.valueOf(Boolean.getBoolean(
+			.set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, String.valueOf(Boolean.getBoolean(
 				"spring.gemfire.enable-cluster-configuration")))
 			.set(DistributionConfig.HTTP_SERVICE_PORT_NAME, System.getProperty("spring.gemfire.http-service-port",
 				DEFAULT_HTTP_SERVICE_PORT))
 			.set(DistributionConfig.JMX_MANAGER_NAME, String.valueOf(Boolean.TRUE))
 			.set(DistributionConfig.JMX_MANAGER_START_NAME, String.valueOf(Boolean.FALSE))
-			.set(DistributionConfig.LOAD_SHARED_CONFIG_FROM_DIR_NAME, String.valueOf(Boolean.getBoolean(
+			.set(DistributionConfig.LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, String.valueOf(Boolean.getBoolean(
 				"spring.gemfire.load-cluster-configuration")))
 			.set(DistributionConfig.LOG_LEVEL_NAME, System.getProperty("spring.gemfire.log-level", DEFAULT_LOG_LEVEL))
 			.build();
@@ -86,7 +86,7 @@ public class LocatorProcess {
 
 	private static boolean isClusterConfigurationEnabled(final InternalLocator locator) {
 		return (locator != null && Boolean.valueOf(locator.getDistributedSystem().getProperties().getProperty(
-			DistributionConfig.ENABLE_SHARED_CONFIGURATION_NAME)));
+			DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME)));
 	}
 
 	private static void registerShutdownHook() {
diff --git a/src/test/resources/cluster_config.zip b/src/test/resources/cluster_config.zip
new file mode 100644
index 00000000..8d334323
Binary files /dev/null and b/src/test/resources/cluster_config.zip differ
diff --git a/src/test/resources/sharedconfig-test-cache.xml b/src/test/resources/clusterconfig-test-cache.xml
similarity index 100%
rename from src/test/resources/sharedconfig-test-cache.xml
rename to src/test/resources/clusterconfig-test-cache.xml
diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
index 96ffde25..326689e0 100644
--- a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
@@ -17,7 +17,7 @@
 	</util:properties>
 
 	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings" use-bean-factory-locator="false"
-			   use-cluster-configuration="true" cache-xml-location="/sharedconfig-test-cache.xml" lazy-init="false"/>
+			   use-cluster-configuration="true" cache-xml-location="/clusterconfig-test-cache.xml" lazy-init="false"/>
 
 	<gfe:lookup-region id="ClusterConfigRegion"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
index a0243fab..69d42189 100644
--- a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
@@ -17,7 +17,7 @@
 	</util:properties>
 
 	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings" use-bean-factory-locator="false"
-			   use-cluster-configuration="false" cache-xml-location="/sharedconfig-test-cache.xml" lazy-init="false"/>
+			   use-cluster-configuration="false" cache-xml-location="/clusterconfig-test-cache.xml" lazy-init="false"/>
 
 	<!-- Should throw an Exception! -->
 	<gfe:lookup-region id="ClusterConfigRegion"/>
diff --git a/src/test/resources/shared_config.zip b/src/test/resources/shared_config.zip
deleted file mode 100644
index 6537f261..00000000
Binary files a/src/test/resources/shared_config.zip and /dev/null differ