diff --git a/build.gradle b/build.gradle
index e55d393..76160a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'io.spring.convention.root'
 
 group = 'org.springframework.data'
-description = 'Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data'
+description = 'Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data.'
 
 ext.releaseBuild = version.endsWith('RELEASE')
 ext.snapshotBuild = version.endsWith('SNAPSHOT')
diff --git a/pom.xml b/pom.xml
index 888d320..e347557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>spring-test-data-geode</module>
-		<module>spring-test-data-gemfire</module>
+		<module>spring-data-geode-test</module>
+		<module>spring-data-gemfire-test</module>
 	</modules>
 
 	<name>Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data</name>
diff --git a/spring-test-data-gemfire/build.gradle b/spring-data-gemfire-test/build.gradle
similarity index 68%
rename from spring-test-data-gemfire/build.gradle
rename to spring-data-gemfire-test/build.gradle
index 697ed1f..794da7b 100644
--- a/spring-test-data-gemfire/build.gradle
+++ b/spring-data-gemfire-test/build.gradle
@@ -1,16 +1,14 @@
 apply plugin: 'io.spring.convention.spring-module'
-
 apply from: IDE_GRADLE
 
-description = "Spring Test for Pivotal GemFire"
+description = "Spring Test Framework for Pivotal GemFire"
 
 dependencies {
 
-	compile(project(':spring-test-data-geode')) {
+	compile(project(':spring-data-geode-test')) {
 		exclude group: "org.springframework.data", module: "spring-data-geode"
 	}
 
 	compile "org.springframework.data:spring-data-gemfire"
 
 }
-
diff --git a/spring-test-data-gemfire/pom.xml b/spring-data-gemfire-test/pom.xml
similarity index 94%
rename from spring-test-data-gemfire/pom.xml
rename to spring-data-gemfire-test/pom.xml
index d4cd108..1167312 100644
--- a/spring-test-data-gemfire/pom.xml
+++ b/spring-data-gemfire-test/pom.xml
@@ -11,10 +11,10 @@
 		<version>0.0.1.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>spring-test-data-gemfire</artifactId>
+	<artifactId>spring-data-gemfire-test</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Spring Test Framework for Pivotal GemFire using Spring Data for Pivotal GemFire</name>
+	<name>Spring Test Framework for Pivotal GemFire</name>
 	<description>
 		Module using Spring Framework's TestContext to write both Unit and Integration Tests
 		for Spring Data for Pivotal GemFire applications.
diff --git a/spring-test-data-geode/build.gradle b/spring-data-geode-test/build.gradle
similarity index 87%
rename from spring-test-data-geode/build.gradle
rename to spring-data-geode-test/build.gradle
index f3f2e27..27a95e3 100644
--- a/spring-test-data-geode/build.gradle
+++ b/spring-data-geode-test/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'io.spring.convention.spring-module'
-
 apply from: IDE_GRADLE
 
-description = "Spring Test for Pivotal GemFire"
+description = "Spring Test Framework for Apache Geode"
 
 repositories {
 	maven { url = "https://repo.spring.io/libs-snapshot" }
diff --git a/spring-test-data-geode/pom.xml b/spring-data-geode-test/pom.xml
similarity index 94%
rename from spring-test-data-geode/pom.xml
rename to spring-data-geode-test/pom.xml
index 0c1febd..92bf16f 100644
--- a/spring-test-data-geode/pom.xml
+++ b/spring-data-geode-test/pom.xml
@@ -11,10 +11,10 @@
 		<version>0.0.1.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>spring-test-data-geode</artifactId>
+	<artifactId>spring-data-geode-test</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Spring Test Framework for Apache Geode using Spring Data for Apache Geode</name>
+	<name>Spring Test Framework for Apache Geode</name>
 	<description>
 		Module using Spring Framework's TestContext to write both Unit and Integration Tests
 		for Spring Data for Apache Geode applications.
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTestsSupport.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/MockObjectsSupport.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/EnableGemFireMockObjects.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireUnitTest.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/config/GemFireMockObjectsBeanPostProcessor.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/context/GemFireMockObjectsApplicationContextInitializer.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectInvocationException.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/support/MockObjectsException.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/PidNotFoundException.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessConfiguration.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessExecutor.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessInputStreamListener.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/process/ProcessWrapper.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/AbstractSecurityManager.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/AbstractSecurityManager.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/AbstractSecurityManager.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/AbstractSecurityManager.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/DataSourceAdapter.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/IdentifierSequence.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/support/MapBuilder.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/FileSystemUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/FileUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/IOUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ObjectUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/SocketUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/StackTraceUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ThreadUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ThrowableUtils.java
diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java
similarity index 100%
rename from spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java
rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/util/ZipUtils.java
diff --git a/spring-test-data-geode/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java
similarity index 100%
rename from spring-test-data-geode/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java
rename to spring-data-geode-test/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java
diff --git a/spring-test-data-geode/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java
similarity index 100%
rename from spring-test-data-geode/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java
rename to spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java