diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
index 563ccb7003d..3534476a01b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.java
@@ -85,8 +85,9 @@ public final class BlockCacheFactory {
 
   private static final String EXTERNAL_BLOCKCACHE_CLASS_KEY = "hbase.blockcache.external.class";
 
-  private static final String BLOCKCACHE_VICTIM_HANDLER_KEY = "hbase.blockcache.victim.handler";
-  private static final boolean BLOCKCACHE_VICTIM_HANDLER_DEFAULT = false;
+  private static final String BLOCKCACHE_VICTIM_HANDLER_ENABLED_KEY =
+    "hbase.blockcache.victim.handler.enabled";
+  private static final boolean BLOCKCACHE_VICTIM_HANDLER_ENABLED_DEFAULT = false;
 
   /**
    * @deprecated use {@link BlockCacheFactory#BLOCKCACHE_BLOCKSIZE_KEY} instead.
@@ -121,7 +122,8 @@ public final class BlockCacheFactory {
         return l1Cache;
       }
 
-      if (conf.getBoolean(BLOCKCACHE_VICTIM_HANDLER_KEY, BLOCKCACHE_VICTIM_HANDLER_DEFAULT)) {
+      if (conf.getBoolean(BLOCKCACHE_VICTIM_HANDLER_ENABLED_KEY,
+          BLOCKCACHE_VICTIM_HANDLER_ENABLED_DEFAULT)) {
         return new InclusiveCombinedBlockCache(l1Cache, bucketCache);
       } else {
         return new CombinedBlockCache(l1Cache, bucketCache);