diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
index 6c91a52ce38..f4d6e63771a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
@@ -189,7 +189,7 @@ public class RegionPlan implements Comparable<RegionPlan> {
 
   @Override
   public String toString() {
-    return "hri=" + this.hri.getRegionNameAsString() + ", source=" +
+    return "hri=" + this.hri.getEncodedName() + ", source=" +
       (this.source == null? "": this.source.toString()) +
       ", destination=" + (this.dest == null? "": this.dest.toString());
   }
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
index 0e47065446e..6f18d68f51b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
@@ -864,7 +864,7 @@ public class AssignmentManager implements ServerListener {
     final ServerStateNode serverNode = regionStates.getOrCreateServer(serverName);
     if (!reportTransition(regionNode, serverNode, state, seqId)) {
       // Don't log if shutting down cluster; during shutdown.
-      LOG.warn("No matchin procedure found for {} to transition to {}", regionNode, state);
+      LOG.warn("No matching procedure found for {} transition to {}", regionNode, state);
     }
   }
 
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
index 207ce86ab0b..aa14b58b72d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
@@ -118,9 +118,8 @@ public class RegionStateStore {
       final long openSeqNum = -1;
 
       // TODO: move under trace, now is visible for debugging
-      LOG.info(String.format("Load hbase:meta entry region=%s regionState=%s lastHost=%s regionLocation=%s",
-        regionInfo, state, lastHost, regionLocation));
-
+      LOG.info("Load hbase:meta entry region={}, regionState={}, lastHost={}, " +
+          "regionLocation={}", regionInfo.getEncodedName(), state, lastHost, regionLocation);
       visitor.visitRegionState(regionInfo, state, regionLocation, lastHost, openSeqNum);
     }
   }
@@ -158,7 +157,7 @@ public class RegionStateStore {
     MetaTableAccessor.addRegionInfo(put, regionInfo);
     final StringBuilder info =
       new StringBuilder("pid=").append(pid).append(" updating hbase:meta row=")
-        .append(regionInfo.getRegionNameAsString()).append(", regionState=").append(state);
+        .append(regionInfo.getEncodedName()).append(", regionState=").append(state);
     if (openSeqNum >= 0) {
       Preconditions.checkArgument(state == State.OPEN && regionLocation != null,
           "Open region should be on a server");