diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
index 2c7380c6e11..cf555c724fb 100644
--- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
+++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
@@ -38,7 +38,7 @@ public class HBaseRPCStatistics extends MetricsDynamicMBeanBase {
   @SuppressWarnings({"UnusedDeclaration"})
   public HBaseRPCStatistics(MetricsRegistry registry,
       String hostName, String port) {
-	  super(registry, "HBaseRPCStatistics");
+	  super(registry, "Metrics for RPC server instance");
 
     String name = String.format("RPCStatistics-%s",
         (port != null ? port : "unknown"));
diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 51833b505e2..c4b4d3060dc 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1832,7 +1832,7 @@ Server {
   @SuppressWarnings("deprecation")
   void registerMBean() {
     MXBeanImpl mxBeanInfo = MXBeanImpl.init(this);
-    MBeanUtil.registerMBean("org.apache.hbase", "Master", mxBeanInfo);
+    MBeanUtil.registerMBean("Master", "Master", mxBeanInfo);
     LOG.info("Registered HMaster MXBean");
   }
 }
diff --git a/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java b/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
index c4cc47abb9b..ba666c04eec 100644
--- a/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
+++ b/src/main/java/org/apache/hadoop/hbase/metrics/HBaseInfo.java
@@ -38,9 +38,11 @@ public class HBaseInfo {
     private final ObjectName mbeanName;
   
     public HBaseInfoMBean(MetricsRegistry registry, String rsName) {
-      super(registry, "HBaseInfo");
-      mbeanName = MBeanUtil.registerMBean("HBase",
-          "Info", this);
+      super(registry, "HBase cluster information");
+      // The name seems wrong to me; should include clusterid IMO.
+      // That would make it harder to locate and rare we have
+      // two clusters up on single machine. St.Ack 20120309
+      mbeanName = MBeanUtil.registerMBean("HBase", "Info", this);
     }
   
     public void shutdown() {
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 03d6b9c8cd2..5094da5ed51 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -3710,7 +3710,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
   @SuppressWarnings("deprecation")
   void registerMBean() {
     MXBeanImpl mxBeanInfo = MXBeanImpl.init(this);
-    mxBean = MBeanUtil.registerMBean("org.apache.hbase", "RegionServer",
+    mxBean = MBeanUtil.registerMBean("RegionServer", "RegionServer",
         mxBeanInfo);
     LOG.info("Registered RegionServer MXBean");
   }