http://git-wip-us.apache.org/repos/asf/hbase/blob/e9e16b59/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
----------------------------------------------------------------------
diff --git 
a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
 
b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
index 2661dc1..b3ae957 100644
--- 
a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
+++ 
b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
@@ -101,11 +101,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // required .hbase.pb.ColumnFamilySchema column_families = 2;
     /**
@@ -193,11 +193,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -270,7 +270,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -280,13 +280,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -345,7 +345,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       columnFamilies_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance();
       nonceGroup_ = 0L;
       nonce_ = 0L;
@@ -599,7 +599,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -738,9 +738,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -750,7 +750,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -760,7 +760,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -777,7 +777,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -790,12 +790,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -811,7 +811,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -822,7 +822,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -830,7 +830,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -841,11 +841,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -1397,11 +1397,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // required bytes column_name = 2;
     /**
@@ -1485,11 +1485,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -1554,7 +1554,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -1564,13 +1564,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -1623,7 +1623,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       columnName_ = com.google.protobuf.ByteString.EMPTY;
       nonceGroup_ = 0L;
       nonce_ = 0L;
@@ -1872,7 +1872,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -1999,9 +1999,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -2011,7 +2011,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -2021,7 +2021,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2038,7 +2038,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -2051,12 +2051,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -2072,7 +2072,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -2083,7 +2083,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -2091,7 +2091,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -2102,11 +2102,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -2577,11 +2577,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // required .hbase.pb.ColumnFamilySchema column_families = 2;
     /**
@@ -2669,11 +2669,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -2746,7 +2746,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -2756,13 +2756,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -2821,7 +2821,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       columnFamilies_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance();
       nonceGroup_ = 0L;
       nonce_ = 0L;
@@ -3075,7 +3075,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -3214,9 +3214,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -3226,7 +3226,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -3236,7 +3236,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3253,7 +3253,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -3266,12 +3266,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -3287,7 +3287,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -3298,7 +3298,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -3306,7 +3306,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -3317,11 +3317,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -10319,11 +10319,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // optional uint64 nonce_group = 2 [default = 0];
     /**
@@ -10397,11 +10397,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -10461,7 +10461,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -10471,13 +10471,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -10514,7 +10514,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       nonceGroup_ = 0L;
       nonce_ = 0L;
     }
@@ -10742,7 +10742,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -10856,9 +10856,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -10868,7 +10868,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -10878,7 +10878,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -10895,7 +10895,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -10908,12 +10908,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -10929,7 +10929,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -10940,7 +10940,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -10948,7 +10948,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -10959,11 +10959,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -11494,11 +11494,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName tableName = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName tableName = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // optional bool preserveSplits = 2 [default = false];
     /**
@@ -11582,11 +11582,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -11651,7 +11651,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName tableName = 1;
     public static final int TABLENAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName tableName = 1;</code>
      */
@@ -11661,13 +11661,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName tableName = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName tableName = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -11720,7 +11720,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       preserveSplits_ = false;
       nonceGroup_ = 0L;
       nonce_ = 0L;
@@ -11965,7 +11965,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -12088,9 +12088,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName tableName = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
@@ -12100,7 +12100,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -12110,7 +12110,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12127,7 +12127,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -12140,12 +12140,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -12161,7 +12161,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -12172,7 +12172,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -12180,7 +12180,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -12191,11 +12191,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName tableName = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -12663,11 +12663,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // optional uint64 nonce_group = 2 [default = 0];
     /**
@@ -12741,11 +12741,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -12805,7 +12805,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -12815,13 +12815,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -12858,7 +12858,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       nonceGroup_ = 0L;
       nonce_ = 0L;
     }
@@ -13086,7 +13086,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -13200,9 +13200,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -13212,7 +13212,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -13222,7 +13222,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13239,7 +13239,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -13252,12 +13252,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -13273,7 +13273,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -13284,7 +13284,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -13292,7 +13292,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -13303,11 +13303,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -13838,11 +13838,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // optional uint64 nonce_group = 2 [default = 0];
     /**
@@ -13916,11 +13916,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -13980,7 +13980,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -13990,13 +13990,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -14033,7 +14033,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       nonceGroup_ = 0L;
       nonce_ = 0L;
     }
@@ -14261,7 +14261,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -14375,9 +14375,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -14387,7 +14387,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -14397,7 +14397,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14414,7 +14414,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -14427,12 +14427,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -14448,7 +14448,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -14459,7 +14459,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -14467,7 +14467,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -14478,11 +14478,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -15013,11 +15013,11 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName();
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder();
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder();
 
     // required .hbase.pb.TableSchema table_schema = 2;
     /**
@@ -15105,11 +15105,11 @@ public final class MasterProtos {
               break;
             }
             case 10: {
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
subBuilder = null;
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = tableName_.toBuilder();
               }
-              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry);
+              tableName_ = 
input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(tableName_);
                 tableName_ = subBuilder.buildPartial();
@@ -15182,7 +15182,7 @@ public final class MasterProtos {
     private int bitField0_;
     // required .hbase.pb.TableName table_name = 1;
     public static final int TABLE_NAME_FIELD_NUMBER = 1;
-    private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_;
+    private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_;
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
@@ -15192,13 +15192,13 @@ public final class MasterProtos {
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
       return tableName_;
     }
     /**
      * <code>required .hbase.pb.TableName table_name = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
       return tableName_;
     }
 
@@ -15257,7 +15257,7 @@ public final class MasterProtos {
     }
 
     private void initFields() {
-      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       tableSchema_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       nonceGroup_ = 0L;
       nonce_ = 0L;
@@ -15511,7 +15511,7 @@ public final class MasterProtos {
       public Builder clear() {
         super.clear();
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
         } else {
           tableNameBuilder_.clear();
         }
@@ -15650,9 +15650,9 @@ public final class MasterProtos {
       private int bitField0_;
 
       // required .hbase.pb.TableName table_name = 1;
-      private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+      private org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
@@ -15662,7 +15662,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName() {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName() {
         if (tableNameBuilder_ == null) {
           return tableName_;
         } else {
@@ -15672,7 +15672,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
setTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15689,7 +15689,7 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       public Builder setTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           tableName_ = builderForValue.build();
           onChanged();
@@ -15702,12 +15702,12 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
mergeTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance())
 {
+              tableName_ != 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance())
 {
             tableName_ =
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial();
           } else {
             tableName_ = value;
           }
@@ -15723,7 +15723,7 @@ public final class MasterProtos {
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
-          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance();
+          tableName_ = 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.getDefaultInstance();
           onChanged();
         } else {
           tableNameBuilder_.clear();
@@ -15734,7 +15734,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
getTableNameBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
getTableNameBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getTableNameFieldBuilder().getBuilder();
@@ -15742,7 +15742,7 @@ public final class MasterProtos {
       /**
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
-      public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
+      public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
           return tableNameBuilder_.getMessageOrBuilder();
         } else {
@@ -15753,11 +15753,11 @@ public final class MasterProtos {
        * <code>required .hbase.pb.TableName table_name = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
           getTableNameFieldBuilder() {
         if (tableNameBuilder_ == null) {
           tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>(
+              
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder>(
                   tableName_,
                   getParentForChildren(),
                   isClean());
@@ -23390,12 +23390,12 @@ public final class MasterProtos {
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    
java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>
 
+    
java.util.List<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>
 
         getTableNameList();
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName(int index);
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName(int index);
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
@@ -23403,12 +23403,12 @@ public final class MasterProtos {
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    java.util.List<? extends 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+    java.util.List<? extends 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
         getTableNameOrBuilderList();
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder(
+    org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder(
         int index);
   }
   /**
@@ -23464,10 +23464,10 @@ public final class MasterProtos {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                tableName_ = new 
java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>();
+                tableName_ = new 
java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              
tableName_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER,
 extensionRegistry));
+              
tableName_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.PARSER,
 extensionRegistry));
               break;
             }
           }
@@ -23514,17 +23514,17 @@ public final class MasterProtos {
 
     // repeated .hbase.pb.TableName tableName = 1;
     public static final int TABLENAME_FIELD_NUMBER = 1;
-    private 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>
 tableName_;
+    private 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>
 tableName_;
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    public 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>
 getTableNameList() {
+    public 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>
 getTableNameList() {
       return tableName_;
     }
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    public java.util.List<? extends 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
+    public java.util.List<? extends 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
         getTableNameOrBuilderList() {
       return tableName_;
     }
@@ -23537,13 +23537,13 @@ public final class MasterProtos {
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName(int index) {
+    public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName(int index) {
       return tableName_.get(index);
     }
     /**
      * <code>repeated .hbase.pb.TableName tableName = 1;</code>
      */
-    public 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder 
getTableNameOrBuilder(
+    public 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder 
getTableNameOrBuilder(
         int index) {
       return tableName_.get(index);
     }
@@ -23854,22 +23854,22 @@ public final class MasterProtos {
       private int bitField0_;
 
       // repeated .hbase.pb.TableName tableName = 1;
-      private 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>
 tableName_ =
+      private 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>
 tableName_ =
         java.util.Collections.emptyList();
       private void ensureTableNameIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          tableName_ = new 
java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>(tableName_);
+          tableName_ = new 
java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>(tableName_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> 
tableNameBuilder_;
+          org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableNameOrBuilder> 
tableNameBuilder_;
 
       /**
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
-      public 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName>
 getTableNameList() {
+      public 
java.util.List<org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName>
 getTableNameList() {
         if (tableNameBuilder_ == null) {
           return java.util.Collections.unmodifiableList(tableName_);
         } else {
@@ -23889,7 +23889,7 @@ public final class MasterProtos {
       /**
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
-      public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
getTableName(int index) {
+      public org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
getTableName(int index) {
         if (tableNameBuilder_ == null) {
           return tableName_.get(index);
         } else {
@@ -23900,7 +23900,7 @@ public final class MasterProtos {
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
       public Builder setTableName(
-          int index, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
+          int index, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23917,7 +23917,7 @@ public final class MasterProtos {
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
       public Builder setTableName(
-          int index, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          int index, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName.Builder 
builderForValue) {
         if (tableNameBuilder_ == null) {
           ensureTableNameIsMutable();
           tableName_.set(index, builderForValue.build());
@@ -23930,7 +23930,7 @@ public final class MasterProtos {
       /**
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
-      public Builder 
addTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName 
value) {
+      public Builder 
addTableName(org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName 
value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23947,7 +23947,7 @@ public final class MasterProtos {
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
       public Builder addTableName(
-          int index, 
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
+          int index, 
org.apache.hadoop.hbase.protobuf.generated.TableProtos.TableName value) {
         if (tableNameBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23964,7 +23964,7 @@ public final class MasterProtos {
        * <code>repeated .hbase.pb.TableName tableName = 1;</code>
        */
       public Builder addTableName(
-          
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder 
builderForValue) {
+          org.apache.hadoop.hbase.

<TRUNCATED>

Reply via email to