diff --git a/src/main/java/org/springframework/data/gemfire/config/CacheParser.java b/src/main/java/org/springframework/data/gemfire/config/CacheParser.java
index d2f42495..8b4b1439 100644
--- a/src/main/java/org/springframework/data/gemfire/config/CacheParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/CacheParser.java
@@ -49,7 +49,7 @@ class CacheParser extends AbstractSingleBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 		String name = super.resolveId(element, definition, parserContext);
 		if (!StringUtils.hasText(name)) {
-			name = "cache";
+			name = "gemfire-cache";
 		}
 		return name;
 	}
diff --git a/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
index 0d8c5615..45fb0551 100644
--- a/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
@@ -60,7 +60,7 @@ class ClientRegionParser extends AbstractSingleBeanDefinitionParser {
 
 		String attr = element.getAttribute("cache-ref");
 		// add cache reference (fallback to default if nothing is specified)
-		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "cache"));
+		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
 
 		ManagedList<Object> interests = new ManagedList<Object>();
 
diff --git a/src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java b/src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java
index 373610db..f958fb97 100644
--- a/src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java
+++ b/src/main/java/org/springframework/data/gemfire/config/GemfireNamespaceHandler.java
@@ -30,5 +30,6 @@ class GemfireNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("replicated-region", new ReplicatedRegionParser());
 		registerBeanDefinitionParser("partitioned-region", new PartitionedRegionParser());
 		registerBeanDefinitionParser("client-region", new ClientRegionParser());
+		registerBeanDefinitionParser("pool", new PoolParser());
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
index 44f3e0bb..fd16798f 100644
--- a/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/PartitionedRegionParser.java
@@ -54,7 +54,7 @@ class PartitionedRegionParser extends AbstractSingleBeanDefinitionParser {
 
 		String attr = element.getAttribute("cache-ref");
 		// add cache reference (fallback to default if nothing is specified)
-		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "cache"));
+		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
 
 
 		// partition attributes
diff --git a/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
index 7e680265..342b5688 100644
--- a/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/ReplicatedRegionParser.java
@@ -53,7 +53,7 @@ class ReplicatedRegionParser extends AbstractSingleBeanDefinitionParser {
 
 		String attr = element.getAttribute("cache-ref");
 		// add cache reference (fallback to default if nothing is specified)
-		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "cache"));
+		builder.addPropertyReference("cache", (StringUtils.hasText(attr) ? attr : "gemfire-cache"));
 
 		// add attributes
 		AttributesFactory af = new AttributesFactory();
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
index b4106ace..97827c8a 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.0.xsd
@@ -32,7 +32,7 @@ Defines a GemFire Cache instance used for creating or retrieving 'regions'.
 			<xsd:attribute name="id" type="xsd:ID" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the cache definition (by default "cache").]]></xsd:documentation>
+The name of the cache definition (by default "gemfire-cache").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="cache-xml-location" type="xsd:string" use="optional">
@@ -128,10 +128,10 @@ The name of the region definition. If no specified, it will have the value of th
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="cache-ref" type="xsd:string" default="cache" use="optional">
+		<xsd:attribute name="cache-ref" type="xsd:string" default="gemfire-cache" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The name of the bean defining the GemFire cache (by default 'cache').
+The name of the bean defining the GemFire cache (by default 'gemfire-cache').
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute> 
diff --git a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java
index 249a7be3..08768d69 100644
--- a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java
@@ -38,8 +38,8 @@ public class CacheNamespaceTest extends RecreatingContextTest {
 
 	@Test
 	public void testBasicCache() throws Exception {
-		assertTrue(ctx.containsBean("cache"));
-		CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&cache");
+		assertTrue(ctx.containsBean("gemfire-cache"));
+		CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&gemfire-cache");
 		assertNull(TestUtils.readField("cacheXml", cfb));
 		assertNull(TestUtils.readField("properties", cfb));
 	}