diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java
index ccd532a1..f4782fb3 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java
@@ -81,9 +81,9 @@ public @interface CacheServerApplication {
 	/**
 	 * Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable.
 	 *
-	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
+	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE
 	 */
-	float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_HEAP_PERCENTAGE;
+	float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_PERCENTAGE;
 
 	/**
 	 * By default, a GemFire member (both locators and servers) will attempt to reconnect and reinitialize the cache
@@ -98,9 +98,9 @@ public @interface CacheServerApplication {
 	 * Configures the percentage of heap at or above which the eviction should begin on Regions configured
 	 * for HeapLRU eviction.
 	 *
-	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
+	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE
 	 */
-	float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_HEAP_PERCENTAGE;
+	float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_PERCENTAGE;
 
 	/**
 	 * Configures the ip address or host name that server locators will tell clients that this cache server
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java
index cedde0a1..d5e28b6b 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java
@@ -62,9 +62,9 @@ public @interface ClientCacheApplication {
 	/**
 	 * Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable.
 	 *
-	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
+	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE
 	 */
-	float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_HEAP_PERCENTAGE;
+	float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_PERCENTAGE;
 
 	/**
 	 * Used only for clients in a client/server installation. If set, this indicates that the client is durable
@@ -83,9 +83,9 @@ public @interface ClientCacheApplication {
 	 * Configures the percentage of heap at or above which the eviction should begin on Regions configured
 	 * for HeapLRU eviction.
 	 *
-	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
+	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE
 	 */
-	float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_HEAP_PERCENTAGE;
+	float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_PERCENTAGE;
 
 	/**
 	 * Configures the free connection timeout for this pool.
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java
index 122581a6..dde9e25a 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java
@@ -59,9 +59,9 @@ public @interface PeerCacheApplication {
 	/**
 	 * Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable.
 	 *
-	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_HEAP_PERCENTAGE
+	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE
 	 */
-	float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_HEAP_PERCENTAGE;
+	float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_PERCENTAGE;
 
 	/**
 	 * By default, a GemFire member (both locators and servers) will attempt to reconnect and reinitialize the cache
@@ -76,9 +76,9 @@ public @interface PeerCacheApplication {
 	 * Configures the percentage of heap at or above which the eviction should begin on Regions configured
 	 * for HeapLRU eviction.
 	 *
-	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_HEAP_PERCENTAGE
+	 * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE
 	 */
-	float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_HEAP_PERCENTAGE;
+	float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_PERCENTAGE;
 
 	/**
 	 * Configures the list of GemFire Locators defining the cluster to which this GemFire cache data node