diff --git a/pom.xml b/pom.xml
index 2d786093e..719a22cd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 		<springdata.commons>2.3.0.BUILD-SNAPSHOT</springdata.commons>
 		<springdata.jpa>2.3.0.BUILD-SNAPSHOT</springdata.jpa>
 		<springdata.mongodb>3.0.0.BUILD-SNAPSHOT</springdata.mongodb>
-		<springdata.gemfire>2.3.0.BUILD-SNAPSHOT</springdata.gemfire>
+		<springdata.geode>2.3.0.BUILD-SNAPSHOT</springdata.geode>
 		<springdata.solr>4.2.0.BUILD-SNAPSHOT</springdata.solr>
 		<springdata.cassandra>3.0.0.BUILD-SNAPSHOT</springdata.cassandra>
 		<springdata.keyvalue>2.3.0.BUILD-SNAPSHOT</springdata.keyvalue>
diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml
index 3563f587b..57bcfe17f 100644
--- a/spring-data-rest-tests/pom.xml
+++ b/spring-data-rest-tests/pom.xml
@@ -15,7 +15,7 @@
 
 	<modules>
 		<module>spring-data-rest-tests-core</module>
-		<module>spring-data-rest-tests-gemfire</module>
+		<module>spring-data-rest-tests-geode</module>
 		<module>spring-data-rest-tests-jpa</module>
 		<module>spring-data-rest-tests-mongodb</module>
 		<module>spring-data-rest-tests-security</module>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-geode/pom.xml
similarity index 90%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml
rename to spring-data-rest-tests/spring-data-rest-tests-geode/pom.xml
index 7f862eb3c..a4d6fba8f 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/pom.xml
@@ -25,8 +25,8 @@
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-gemfire</artifactId>
-			<version>${springdata.gemfire}</version>
+			<artifactId>spring-data-geode</artifactId>
+			<version>${springdata.geode}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/AbstractPersistentEntity.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java
similarity index 96%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/AbstractPersistentEntity.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java
index 755b17834..e94aa7bd8 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/AbstractPersistentEntity.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.data.annotation.Id;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Address.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Address.java
similarity index 97%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Address.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Address.java
index 5b2a5d6ed..11ba69b00 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Address.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Address.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Customer.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Customer.java
similarity index 98%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Customer.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Customer.java
index b7a98b75e..088840f93 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Customer.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Customer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/CustomerRepository.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/CustomerRepository.java
similarity index 96%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/CustomerRepository.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/CustomerRepository.java
index f4e14b35d..d9d0f411d 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/CustomerRepository.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/CustomerRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.List;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/EmailAddress.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java
similarity index 98%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/EmailAddress.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java
index 5f2b050ec..db39b453d 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/EmailAddress.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.regex.Pattern;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/LineItem.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/LineItem.java
similarity index 97%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/LineItem.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/LineItem.java
index 3feb4ee23..0b38ced40 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/LineItem.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/LineItem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.math.BigDecimal;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Order.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Order.java
similarity index 95%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Order.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Order.java
index 936236da3..997cb234f 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Order.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Order.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -37,7 +37,7 @@ public class Order extends AbstractPersistentEntity {
 	private Set<LineItem> lineItems = new HashSet<LineItem>();
 
 	/**
-	 * Creates a new {@link Order} for the given {@link org.springframework.data.rest.tests.gemfire.Customer}.
+	 * Creates a new {@link Order} for the given {@link org.springframework.data.rest.tests.geode.Customer}.
 	 *
 	 * @param id order ID
 	 * @param customerId must not be {@literal null}.
@@ -64,7 +64,7 @@ public class Order extends AbstractPersistentEntity {
 	}
 
 	/**
-	 * Returns the id of the {@link org.springframework.data.rest.tests.gemfire.Customer} who placed the
+	 * Returns the id of the {@link org.springframework.data.rest.tests.geode.Customer} who placed the
 	 * {@link Order}.
 	 *
 	 * @return
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/OrderRepository.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/OrderRepository.java
similarity index 94%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/OrderRepository.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/OrderRepository.java
index 24fa3def3..86c8960c7 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/OrderRepository.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/OrderRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.List;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Product.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Product.java
similarity index 98%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Product.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Product.java
index 589e4e0d1..5d78e5c97 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Product.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Product.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.math.BigDecimal;
 import java.util.Collections;
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/ProductRepository.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/ProductRepository.java
similarity index 96%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/ProductRepository.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/ProductRepository.java
index 6f9f7dd43..73af9d398 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/ProductRepository.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/ProductRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.List;
 
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeRepositoryConfig.java
similarity index 89%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeRepositoryConfig.java
index 497f31d4c..f0a75be56 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeRepositoryConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,7 +32,7 @@ import org.springframework.data.util.AnnotatedTypeScanner;
 @Configuration
 @ImportResource("classpath:META-INF/spring/cache-config.xml")
 @EnableGemfireRepositories
-public class GemfireRepositoryConfig {
+public class GeodeRepositoryConfig {
 
 	/**
 	 * TODO: Remove, once Spring Data Gemfire exposes a mapping context.
@@ -43,7 +43,7 @@ public class GemfireRepositoryConfig {
 		AnnotatedTypeScanner scanner = new AnnotatedTypeScanner(Region.class);
 
 		GemfireMappingContext context = new GemfireMappingContext();
-		context.setInitialEntitySet(scanner.findTypes(GemfireRepositoryConfig.class.getPackage().getName()));
+		context.setInitialEntitySet(scanner.findTypes(GeodeRepositoryConfig.class.getPackage().getName()));
 		context.initialize();
 
 		return context;
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java
similarity index 86%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java
index b275c9813..226fb7a20 100755
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.data.rest.tests.CommonWebTests;
 import org.springframework.hateoas.LinkRelation;
@@ -22,8 +22,8 @@ import org.springframework.test.context.ContextConfiguration;
 /**
  * @author Oliver Gierke
  */
-@ContextConfiguration(classes = GemfireRepositoryConfig.class)
-public class GemfireWebTests extends CommonWebTests {
+@ContextConfiguration(classes = GeodeRepositoryConfig.class)
+public class GeodeWebTests extends CommonWebTests {
 
 	/*
 	 * (non-Javadoc)
diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/resources/META-INF/spring/cache-config.xml b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/resources/META-INF/spring/cache-config.xml
similarity index 53%
rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/resources/META-INF/spring/cache-config.xml
rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/test/resources/META-INF/spring/cache-config.xml
index d7911f32c..5124f7039 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/resources/META-INF/spring/cache-config.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/resources/META-INF/spring/cache-config.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:gfe="http://www.springframework.org/schema/gemfire"
-       xsi:schemaLocation="http://www.springframework.org/schema/gemfire https://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+       xmlns:geode="http://www.springframework.org/schema/geode"
+       xsi:schemaLocation="http://www.springframework.org/schema/geode https://www.springframework.org/schema/geode/spring-geode.xsd
        http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-  <gfe:cache use-bean-factory-locator="false"/>
+  <geode:cache use-bean-factory-locator="false"/>
 
-  <gfe:replicated-region id="Customer"/>
-  <gfe:replicated-region id="Order"/>
-  <gfe:replicated-region id="Product"/>
+  <geode:replicated-region id="Customer"/>
+  <geode:replicated-region id="Order"/>
+  <geode:replicated-region id="Product"/>
 
 </beans>