From 62bce5f903b5744af4130a7915d98ce90a880efb Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Tue, 14 Jul 2015 14:48:02 -0700 Subject: [PATCH] HBASE-14077 Add package to hbase-protocol protobuf files. --- .../example/generated/BulkDeleteProtos.java | 151 +- .../example/generated/ExampleProtos.java | 83 +- .../src/main/protobuf/BulkDelete.proto | 2 + .../src/main/protobuf/Examples.proto | 1 + .../generated/AccessControlProtos.java | 1212 ++-- .../hbase/protobuf/generated/AdminProtos.java | 2300 ++++---- .../protobuf/generated/AggregateProtos.java | 161 +- .../generated/AuthenticationProtos.java | 310 +- .../hbase/protobuf/generated/CellProtos.java | 128 +- .../protobuf/generated/ClientProtos.java | 3297 +++++------ .../protobuf/generated/ClusterIdProtos.java | 35 +- .../generated/ClusterStatusProtos.java | 1409 ++--- .../protobuf/generated/ComparatorProtos.java | 458 +- .../protobuf/generated/EncryptionProtos.java | 38 +- .../generated/ErrorHandlingProtos.java | 205 +- .../hbase/protobuf/generated/FSProtos.java | 94 +- .../protobuf/generated/FilterProtos.java | 1600 ++--- .../hbase/protobuf/generated/HBaseProtos.java | 1472 ++--- .../hbase/protobuf/generated/HFileProtos.java | 147 +- .../generated/LoadBalancerProtos.java | 36 +- .../protobuf/generated/MapReduceProtos.java | 205 +- .../generated/MasterProcedureProtos.java | 1789 +++--- .../protobuf/generated/MasterProtos.java | 5211 +++++++++-------- .../generated/MultiRowMutationProtos.java | 203 +- .../protobuf/generated/ProcedureProtos.java | 496 +- .../hbase/protobuf/generated/QuotaProtos.java | 548 +- .../hbase/protobuf/generated/RPCProtos.java | 460 +- .../generated/RegionServerStatusProtos.java | 843 +-- .../generated/RowProcessorProtos.java | 85 +- .../generated/SecureBulkLoadProtos.java | 392 +- .../protobuf/generated/TracingProtos.java | 36 +- .../generated/VisibilityLabelsProtos.java | 541 +- .../hbase/protobuf/generated/WALProtos.java | 872 +-- .../protobuf/generated/ZooKeeperProtos.java | 775 +-- .../src/main/protobuf/AccessControl.proto | 1 + hbase-protocol/src/main/protobuf/Admin.proto | 1 + .../src/main/protobuf/Aggregate.proto | 1 + .../src/main/protobuf/Authentication.proto | 1 + hbase-protocol/src/main/protobuf/Cell.proto | 1 + hbase-protocol/src/main/protobuf/Client.proto | 1 + .../src/main/protobuf/ClusterId.proto | 1 + .../src/main/protobuf/ClusterStatus.proto | 1 + .../src/main/protobuf/Comparator.proto | 1 + .../src/main/protobuf/Encryption.proto | 1 + .../src/main/protobuf/ErrorHandling.proto | 1 + hbase-protocol/src/main/protobuf/FS.proto | 1 + hbase-protocol/src/main/protobuf/Filter.proto | 1 + hbase-protocol/src/main/protobuf/HBase.proto | 1 + hbase-protocol/src/main/protobuf/HFile.proto | 3 + .../src/main/protobuf/LoadBalancer.proto | 1 + .../src/main/protobuf/MapReduce.proto | 1 + hbase-protocol/src/main/protobuf/Master.proto | 1 + .../src/main/protobuf/MasterProcedure.proto | 2 + .../src/main/protobuf/MultiRowMutation.proto | 2 + .../src/main/protobuf/Procedure.proto | 1 + hbase-protocol/src/main/protobuf/Quota.proto | 3 + hbase-protocol/src/main/protobuf/RPC.proto | 2 + .../main/protobuf/RegionServerStatus.proto | 1 + .../src/main/protobuf/RowProcessor.proto | 2 + .../src/main/protobuf/SecureBulkLoad.proto | 1 + .../src/main/protobuf/Snapshot.proto | 2 + .../src/main/protobuf/Tracing.proto | 2 + .../src/main/protobuf/VisibilityLabels.proto | 1 + hbase-protocol/src/main/protobuf/WAL.proto | 2 + .../src/main/protobuf/ZooKeeper.proto | 1 + 65 files changed, 12903 insertions(+), 12734 deletions(-) diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java index 911fd16c6ef..373e03629a7 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java @@ -11,27 +11,27 @@ public final class BulkDeleteProtos { public interface BulkDeleteRequestOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required .Scan scan = 1; + // required .hbase.pb.Scan scan = 1; /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ boolean hasScan(); /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan(); /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder(); - // required .BulkDeleteRequest.DeleteType deleteType = 2; + // required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ boolean hasDeleteType(); /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType getDeleteType(); @@ -56,7 +56,7 @@ public final class BulkDeleteProtos { int getRowBatchSize(); } /** - * Protobuf type {@code BulkDeleteRequest} + * Protobuf type {@code hbase.pb.BulkDeleteRequest} */ public static final class BulkDeleteRequest extends com.google.protobuf.GeneratedMessage @@ -154,12 +154,12 @@ public final class BulkDeleteProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.Builder.class); } @@ -180,7 +180,7 @@ public final class BulkDeleteProtos { } /** - * Protobuf enum {@code BulkDeleteRequest.DeleteType} + * Protobuf enum {@code hbase.pb.BulkDeleteRequest.DeleteType} */ public enum DeleteType implements com.google.protobuf.ProtocolMessageEnum { @@ -276,43 +276,43 @@ public final class BulkDeleteProtos { this.value = value; } - // @@protoc_insertion_point(enum_scope:BulkDeleteRequest.DeleteType) + // @@protoc_insertion_point(enum_scope:hbase.pb.BulkDeleteRequest.DeleteType) } private int bitField0_; - // required .Scan scan = 1; + // required .hbase.pb.Scan scan = 1; public static final int SCAN_FIELD_NUMBER = 1; private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_; /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public boolean hasScan() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() { return scan_; } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() { return scan_; } - // required .BulkDeleteRequest.DeleteType deleteType = 2; + // required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; public static final int DELETETYPE_FIELD_NUMBER = 2; private org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType deleteType_; /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ public boolean hasDeleteType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType getDeleteType() { return deleteType_; @@ -565,19 +565,19 @@ public final class BulkDeleteProtos { return builder; } /** - * Protobuf type {@code BulkDeleteRequest} + * Protobuf type {@code hbase.pb.BulkDeleteRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.Builder.class); } @@ -624,7 +624,7 @@ public final class BulkDeleteProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest getDefaultInstanceForType() { @@ -734,18 +734,18 @@ public final class BulkDeleteProtos { } private int bitField0_; - // required .Scan scan = 1; + // required .hbase.pb.Scan scan = 1; private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> scanBuilder_; /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public boolean hasScan() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() { if (scanBuilder_ == null) { @@ -755,7 +755,7 @@ public final class BulkDeleteProtos { } } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public Builder setScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) { if (scanBuilder_ == null) { @@ -771,7 +771,7 @@ public final class BulkDeleteProtos { return this; } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public Builder setScan( org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder builderForValue) { @@ -785,7 +785,7 @@ public final class BulkDeleteProtos { return this; } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public Builder mergeScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) { if (scanBuilder_ == null) { @@ -804,7 +804,7 @@ public final class BulkDeleteProtos { return this; } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public Builder clearScan() { if (scanBuilder_ == null) { @@ -817,7 +817,7 @@ public final class BulkDeleteProtos { return this; } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder getScanBuilder() { bitField0_ |= 0x00000001; @@ -825,7 +825,7 @@ public final class BulkDeleteProtos { return getScanFieldBuilder().getBuilder(); } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() { if (scanBuilder_ != null) { @@ -835,7 +835,7 @@ public final class BulkDeleteProtos { } } /** - * required .Scan scan = 1; + * required .hbase.pb.Scan scan = 1; */ private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> @@ -851,22 +851,22 @@ public final class BulkDeleteProtos { return scanBuilder_; } - // required .BulkDeleteRequest.DeleteType deleteType = 2; + // required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; private org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType deleteType_ = org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType.ROW; /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ public boolean hasDeleteType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType getDeleteType() { return deleteType_; } /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ public Builder setDeleteType(org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType value) { if (value == null) { @@ -878,7 +878,7 @@ public final class BulkDeleteProtos { return this; } /** - * required .BulkDeleteRequest.DeleteType deleteType = 2; + * required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; */ public Builder clearDeleteType() { bitField0_ = (bitField0_ & ~0x00000002); @@ -953,7 +953,7 @@ public final class BulkDeleteProtos { return this; } - // @@protoc_insertion_point(builder_scope:BulkDeleteRequest) + // @@protoc_insertion_point(builder_scope:hbase.pb.BulkDeleteRequest) } static { @@ -961,7 +961,7 @@ public final class BulkDeleteProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:BulkDeleteRequest) + // @@protoc_insertion_point(class_scope:hbase.pb.BulkDeleteRequest) } public interface BulkDeleteResponseOrBuilder @@ -988,7 +988,7 @@ public final class BulkDeleteProtos { long getVersionsDeleted(); } /** - * Protobuf type {@code BulkDeleteResponse} + * Protobuf type {@code hbase.pb.BulkDeleteResponse} */ public static final class BulkDeleteResponse extends com.google.protobuf.GeneratedMessage @@ -1062,12 +1062,12 @@ public final class BulkDeleteProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.Builder.class); } @@ -1289,19 +1289,19 @@ public final class BulkDeleteProtos { return builder; } /** - * Protobuf type {@code BulkDeleteResponse} + * Protobuf type {@code hbase.pb.BulkDeleteResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.Builder.class); } @@ -1339,7 +1339,7 @@ public final class BulkDeleteProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse getDefaultInstanceForType() { @@ -1485,7 +1485,7 @@ public final class BulkDeleteProtos { return this; } - // @@protoc_insertion_point(builder_scope:BulkDeleteResponse) + // @@protoc_insertion_point(builder_scope:hbase.pb.BulkDeleteResponse) } static { @@ -1493,11 +1493,11 @@ public final class BulkDeleteProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:BulkDeleteResponse) + // @@protoc_insertion_point(class_scope:hbase.pb.BulkDeleteResponse) } /** - * Protobuf service {@code BulkDeleteService} + * Protobuf service {@code hbase.pb.BulkDeleteService} */ public static abstract class BulkDeleteService implements com.google.protobuf.Service { @@ -1505,7 +1505,7 @@ public final class BulkDeleteProtos { public interface Interface { /** - * rpc delete(.BulkDeleteRequest) returns (.BulkDeleteResponse); + * rpc delete(.hbase.pb.BulkDeleteRequest) returns (.hbase.pb.BulkDeleteResponse); */ public abstract void delete( com.google.protobuf.RpcController controller, @@ -1590,7 +1590,7 @@ public final class BulkDeleteProtos { } /** - * rpc delete(.BulkDeleteRequest) returns (.BulkDeleteResponse); + * rpc delete(.hbase.pb.BulkDeleteRequest) returns (.hbase.pb.BulkDeleteResponse); */ public abstract void delete( com.google.protobuf.RpcController controller, @@ -1725,19 +1725,19 @@ public final class BulkDeleteProtos { } - // @@protoc_insertion_point(class_scope:BulkDeleteService) + // @@protoc_insertion_point(class_scope:hbase.pb.BulkDeleteService) } private static com.google.protobuf.Descriptors.Descriptor - internal_static_BulkDeleteRequest_descriptor; + internal_static_hbase_pb_BulkDeleteRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_BulkDeleteRequest_fieldAccessorTable; + internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_BulkDeleteResponse_descriptor; + internal_static_hbase_pb_BulkDeleteResponse_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_BulkDeleteResponse_fieldAccessorTable; + internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1747,35 +1747,36 @@ public final class BulkDeleteProtos { descriptor; static { java.lang.String[] descriptorData = { - "\n\020BulkDelete.proto\032\014Client.proto\"\300\001\n\021Bul" + - "kDeleteRequest\022\023\n\004scan\030\001 \002(\0132\005.Scan\0221\n\nd" + - "eleteType\030\002 \002(\0162\035.BulkDeleteRequest.Dele" + - "teType\022\021\n\ttimestamp\030\003 \001(\004\022\024\n\014rowBatchSiz" + - "e\030\004 \002(\r\":\n\nDeleteType\022\007\n\003ROW\020\000\022\n\n\006FAMILY" + - "\020\001\022\n\n\006COLUMN\020\002\022\013\n\007VERSION\020\003\"B\n\022BulkDelet" + - "eResponse\022\023\n\013rowsDeleted\030\001 \002(\004\022\027\n\017versio" + - "nsDeleted\030\002 \001(\0042F\n\021BulkDeleteService\0221\n\006" + - "delete\022\022.BulkDeleteRequest\032\023.BulkDeleteR" + - "esponseBQ\n5org.apache.hadoop.hbase.copro", - "cessor.example.generatedB\020BulkDeleteProt" + - "osH\001\210\001\001\240\001\001" + "\n\020BulkDelete.proto\022\010hbase.pb\032\014Client.pro" + + "to\"\322\001\n\021BulkDeleteRequest\022\034\n\004scan\030\001 \002(\0132\016" + + ".hbase.pb.Scan\022:\n\ndeleteType\030\002 \002(\0162&.hba" + + "se.pb.BulkDeleteRequest.DeleteType\022\021\n\tti" + + "mestamp\030\003 \001(\004\022\024\n\014rowBatchSize\030\004 \002(\r\":\n\nD" + + "eleteType\022\007\n\003ROW\020\000\022\n\n\006FAMILY\020\001\022\n\n\006COLUMN" + + "\020\002\022\013\n\007VERSION\020\003\"B\n\022BulkDeleteResponse\022\023\n" + + "\013rowsDeleted\030\001 \002(\004\022\027\n\017versionsDeleted\030\002 " + + "\001(\0042X\n\021BulkDeleteService\022C\n\006delete\022\033.hba" + + "se.pb.BulkDeleteRequest\032\034.hbase.pb.BulkD", + "eleteResponseBQ\n5org.apache.hadoop.hbase" + + ".coprocessor.example.generatedB\020BulkDele" + + "teProtosH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor root) { descriptor = root; - internal_static_BulkDeleteRequest_descriptor = + internal_static_hbase_pb_BulkDeleteRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_BulkDeleteRequest_fieldAccessorTable = new + internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_BulkDeleteRequest_descriptor, + internal_static_hbase_pb_BulkDeleteRequest_descriptor, new java.lang.String[] { "Scan", "DeleteType", "Timestamp", "RowBatchSize", }); - internal_static_BulkDeleteResponse_descriptor = + internal_static_hbase_pb_BulkDeleteResponse_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_BulkDeleteResponse_fieldAccessorTable = new + internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_BulkDeleteResponse_descriptor, + internal_static_hbase_pb_BulkDeleteResponse_descriptor, new java.lang.String[] { "RowsDeleted", "VersionsDeleted", }); return null; } diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java index a71e3519534..b780985a9f0 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java @@ -12,7 +12,7 @@ public final class ExampleProtos { extends com.google.protobuf.MessageOrBuilder { } /** - * Protobuf type {@code CountRequest} + * Protobuf type {@code hbase.pb.CountRequest} */ public static final class CountRequest extends com.google.protobuf.GeneratedMessage @@ -75,12 +75,12 @@ public final class ExampleProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.Builder.class); } @@ -231,19 +231,19 @@ public final class ExampleProtos { return builder; } /** - * Protobuf type {@code CountRequest} + * Protobuf type {@code hbase.pb.CountRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.Builder.class); } @@ -277,7 +277,7 @@ public final class ExampleProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest getDefaultInstanceForType() { @@ -335,7 +335,7 @@ public final class ExampleProtos { return this; } - // @@protoc_insertion_point(builder_scope:CountRequest) + // @@protoc_insertion_point(builder_scope:hbase.pb.CountRequest) } static { @@ -343,7 +343,7 @@ public final class ExampleProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:CountRequest) + // @@protoc_insertion_point(class_scope:hbase.pb.CountRequest) } public interface CountResponseOrBuilder @@ -360,7 +360,7 @@ public final class ExampleProtos { long getCount(); } /** - * Protobuf type {@code CountResponse} + * Protobuf type {@code hbase.pb.CountResponse} */ public static final class CountResponse extends com.google.protobuf.GeneratedMessage @@ -429,12 +429,12 @@ public final class ExampleProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.Builder.class); } @@ -623,19 +623,19 @@ public final class ExampleProtos { return builder; } /** - * Protobuf type {@code CountResponse} + * Protobuf type {@code hbase.pb.CountResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.Builder.class); } @@ -671,7 +671,7 @@ public final class ExampleProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse getDefaultInstanceForType() { @@ -777,7 +777,7 @@ public final class ExampleProtos { return this; } - // @@protoc_insertion_point(builder_scope:CountResponse) + // @@protoc_insertion_point(builder_scope:hbase.pb.CountResponse) } static { @@ -785,11 +785,11 @@ public final class ExampleProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:CountResponse) + // @@protoc_insertion_point(class_scope:hbase.pb.CountResponse) } /** - * Protobuf service {@code RowCountService} + * Protobuf service {@code hbase.pb.RowCountService} */ public static abstract class RowCountService implements com.google.protobuf.Service { @@ -797,7 +797,7 @@ public final class ExampleProtos { public interface Interface { /** - * rpc getRowCount(.CountRequest) returns (.CountResponse); + * rpc getRowCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse); */ public abstract void getRowCount( com.google.protobuf.RpcController controller, @@ -805,7 +805,7 @@ public final class ExampleProtos { com.google.protobuf.RpcCallback done); /** - * rpc getKeyValueCount(.CountRequest) returns (.CountResponse); + * rpc getKeyValueCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse); */ public abstract void getKeyValueCount( com.google.protobuf.RpcController controller, @@ -904,7 +904,7 @@ public final class ExampleProtos { } /** - * rpc getRowCount(.CountRequest) returns (.CountResponse); + * rpc getRowCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse); */ public abstract void getRowCount( com.google.protobuf.RpcController controller, @@ -912,7 +912,7 @@ public final class ExampleProtos { com.google.protobuf.RpcCallback done); /** - * rpc getKeyValueCount(.CountRequest) returns (.CountResponse); + * rpc getKeyValueCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse); */ public abstract void getKeyValueCount( com.google.protobuf.RpcController controller, @@ -1088,19 +1088,19 @@ public final class ExampleProtos { } - // @@protoc_insertion_point(class_scope:RowCountService) + // @@protoc_insertion_point(class_scope:hbase.pb.RowCountService) } private static com.google.protobuf.Descriptors.Descriptor - internal_static_CountRequest_descriptor; + internal_static_hbase_pb_CountRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_CountRequest_fieldAccessorTable; + internal_static_hbase_pb_CountRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_CountResponse_descriptor; + internal_static_hbase_pb_CountResponse_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_CountResponse_fieldAccessorTable; + internal_static_hbase_pb_CountResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1110,30 +1110,31 @@ public final class ExampleProtos { descriptor; static { java.lang.String[] descriptorData = { - "\n\016Examples.proto\"\016\n\014CountRequest\"!\n\rCoun" + - "tResponse\022\020\n\005count\030\001 \002(\003:\00102r\n\017RowCountS" + - "ervice\022,\n\013getRowCount\022\r.CountRequest\032\016.C" + - "ountResponse\0221\n\020getKeyValueCount\022\r.Count" + - "Request\032\016.CountResponseBN\n5org.apache.ha" + - "doop.hbase.coprocessor.example.generated" + - "B\rExampleProtosH\001\210\001\001\240\001\001" + "\n\016Examples.proto\022\010hbase.pb\"\016\n\014CountReque" + + "st\"!\n\rCountResponse\022\020\n\005count\030\001 \002(\003:\00102\226\001" + + "\n\017RowCountService\022>\n\013getRowCount\022\026.hbase" + + ".pb.CountRequest\032\027.hbase.pb.CountRespons" + + "e\022C\n\020getKeyValueCount\022\026.hbase.pb.CountRe" + + "quest\032\027.hbase.pb.CountResponseBN\n5org.ap" + + "ache.hadoop.hbase.coprocessor.example.ge" + + "neratedB\rExampleProtosH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor root) { descriptor = root; - internal_static_CountRequest_descriptor = + internal_static_hbase_pb_CountRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_CountRequest_fieldAccessorTable = new + internal_static_hbase_pb_CountRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_CountRequest_descriptor, + internal_static_hbase_pb_CountRequest_descriptor, new java.lang.String[] { }); - internal_static_CountResponse_descriptor = + internal_static_hbase_pb_CountResponse_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_CountResponse_fieldAccessorTable = new + internal_static_hbase_pb_CountResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_CountResponse_descriptor, + internal_static_hbase_pb_CountResponse_descriptor, new java.lang.String[] { "Count", }); return null; } diff --git a/hbase-examples/src/main/protobuf/BulkDelete.proto b/hbase-examples/src/main/protobuf/BulkDelete.proto index a0e56dd452b..c2ec8ca3d1d 100644 --- a/hbase-examples/src/main/protobuf/BulkDelete.proto +++ b/hbase-examples/src/main/protobuf/BulkDelete.proto @@ -16,6 +16,8 @@ * limitations under the License. */ +package hbase.pb; + option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; option java_outer_classname = "BulkDeleteProtos"; option java_generic_services = true; diff --git a/hbase-examples/src/main/protobuf/Examples.proto b/hbase-examples/src/main/protobuf/Examples.proto index 24fbad6ebd7..ed9ed079c9e 100644 --- a/hbase-examples/src/main/protobuf/Examples.proto +++ b/hbase-examples/src/main/protobuf/Examples.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package hbase.pb; option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; option java_outer_classname = "ExampleProtos"; diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AccessControlProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AccessControlProtos.java index 0b7010986cf..cd1dda1ae67 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AccessControlProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AccessControlProtos.java @@ -11,60 +11,60 @@ public final class AccessControlProtos { public interface PermissionOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required .Permission.Type type = 1; + // required .hbase.pb.Permission.Type type = 1; /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ boolean hasType(); /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type getType(); - // optional .GlobalPermission global_permission = 2; + // optional .hbase.pb.GlobalPermission global_permission = 2; /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ boolean hasGlobalPermission(); /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission getGlobalPermission(); /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermissionOrBuilder getGlobalPermissionOrBuilder(); - // optional .NamespacePermission namespace_permission = 3; + // optional .hbase.pb.NamespacePermission namespace_permission = 3; /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ boolean hasNamespacePermission(); /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission getNamespacePermission(); /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermissionOrBuilder getNamespacePermissionOrBuilder(); - // optional .TablePermission table_permission = 4; + // optional .hbase.pb.TablePermission table_permission = 4; /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ boolean hasTablePermission(); /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission getTablePermission(); /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermissionOrBuilder getTablePermissionOrBuilder(); } /** - * Protobuf type {@code Permission} + * Protobuf type {@code hbase.pb.Permission} */ public static final class Permission extends com.google.protobuf.GeneratedMessage @@ -178,12 +178,12 @@ public final class AccessControlProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_Permission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_Permission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_Permission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_Permission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder.class); } @@ -204,7 +204,7 @@ public final class AccessControlProtos { } /** - * Protobuf enum {@code Permission.Action} + * Protobuf enum {@code hbase.pb.Permission.Action} */ public enum Action implements com.google.protobuf.ProtocolMessageEnum { @@ -309,11 +309,11 @@ public final class AccessControlProtos { this.value = value; } - // @@protoc_insertion_point(enum_scope:Permission.Action) + // @@protoc_insertion_point(enum_scope:hbase.pb.Permission.Action) } /** - * Protobuf enum {@code Permission.Type} + * Protobuf enum {@code hbase.pb.Permission.Type} */ public enum Type implements com.google.protobuf.ProtocolMessageEnum { @@ -400,87 +400,87 @@ public final class AccessControlProtos { this.value = value; } - // @@protoc_insertion_point(enum_scope:Permission.Type) + // @@protoc_insertion_point(enum_scope:hbase.pb.Permission.Type) } private int bitField0_; - // required .Permission.Type type = 1; + // required .hbase.pb.Permission.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type type_; /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type getType() { return type_; } - // optional .GlobalPermission global_permission = 2; + // optional .hbase.pb.GlobalPermission global_permission = 2; public static final int GLOBAL_PERMISSION_FIELD_NUMBER = 2; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission globalPermission_; /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public boolean hasGlobalPermission() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission getGlobalPermission() { return globalPermission_; } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermissionOrBuilder getGlobalPermissionOrBuilder() { return globalPermission_; } - // optional .NamespacePermission namespace_permission = 3; + // optional .hbase.pb.NamespacePermission namespace_permission = 3; public static final int NAMESPACE_PERMISSION_FIELD_NUMBER = 3; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission namespacePermission_; /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public boolean hasNamespacePermission() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission getNamespacePermission() { return namespacePermission_; } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermissionOrBuilder getNamespacePermissionOrBuilder() { return namespacePermission_; } - // optional .TablePermission table_permission = 4; + // optional .hbase.pb.TablePermission table_permission = 4; public static final int TABLE_PERMISSION_FIELD_NUMBER = 4; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission tablePermission_; /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public boolean hasTablePermission() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission getTablePermission() { return tablePermission_; } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermissionOrBuilder getTablePermissionOrBuilder() { return tablePermission_; @@ -695,19 +695,19 @@ public final class AccessControlProtos { return builder; } /** - * Protobuf type {@code Permission} + * Protobuf type {@code hbase.pb.Permission} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_Permission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_Permission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_Permission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_Permission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder.class); } @@ -764,7 +764,7 @@ public final class AccessControlProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_Permission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_Permission_descriptor; } public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getDefaultInstanceForType() { @@ -876,22 +876,22 @@ public final class AccessControlProtos { } private int bitField0_; - // required .Permission.Type type = 1; + // required .hbase.pb.Permission.Type type = 1; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type type_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type.Global; /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ public boolean hasType() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type getType() { return type_; } /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ public Builder setType(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type value) { if (value == null) { @@ -903,7 +903,7 @@ public final class AccessControlProtos { return this; } /** - * required .Permission.Type type = 1; + * required .hbase.pb.Permission.Type type = 1; */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); @@ -912,18 +912,18 @@ public final class AccessControlProtos { return this; } - // optional .GlobalPermission global_permission = 2; + // optional .hbase.pb.GlobalPermission global_permission = 2; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission globalPermission_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermissionOrBuilder> globalPermissionBuilder_; /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public boolean hasGlobalPermission() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission getGlobalPermission() { if (globalPermissionBuilder_ == null) { @@ -933,7 +933,7 @@ public final class AccessControlProtos { } } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public Builder setGlobalPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission value) { if (globalPermissionBuilder_ == null) { @@ -949,7 +949,7 @@ public final class AccessControlProtos { return this; } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public Builder setGlobalPermission( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.Builder builderForValue) { @@ -963,7 +963,7 @@ public final class AccessControlProtos { return this; } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public Builder mergeGlobalPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission value) { if (globalPermissionBuilder_ == null) { @@ -982,7 +982,7 @@ public final class AccessControlProtos { return this; } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public Builder clearGlobalPermission() { if (globalPermissionBuilder_ == null) { @@ -995,7 +995,7 @@ public final class AccessControlProtos { return this; } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.Builder getGlobalPermissionBuilder() { bitField0_ |= 0x00000002; @@ -1003,7 +1003,7 @@ public final class AccessControlProtos { return getGlobalPermissionFieldBuilder().getBuilder(); } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermissionOrBuilder getGlobalPermissionOrBuilder() { if (globalPermissionBuilder_ != null) { @@ -1013,7 +1013,7 @@ public final class AccessControlProtos { } } /** - * optional .GlobalPermission global_permission = 2; + * optional .hbase.pb.GlobalPermission global_permission = 2; */ private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermissionOrBuilder> @@ -1029,18 +1029,18 @@ public final class AccessControlProtos { return globalPermissionBuilder_; } - // optional .NamespacePermission namespace_permission = 3; + // optional .hbase.pb.NamespacePermission namespace_permission = 3; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission namespacePermission_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermissionOrBuilder> namespacePermissionBuilder_; /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public boolean hasNamespacePermission() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission getNamespacePermission() { if (namespacePermissionBuilder_ == null) { @@ -1050,7 +1050,7 @@ public final class AccessControlProtos { } } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public Builder setNamespacePermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission value) { if (namespacePermissionBuilder_ == null) { @@ -1066,7 +1066,7 @@ public final class AccessControlProtos { return this; } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public Builder setNamespacePermission( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.Builder builderForValue) { @@ -1080,7 +1080,7 @@ public final class AccessControlProtos { return this; } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public Builder mergeNamespacePermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission value) { if (namespacePermissionBuilder_ == null) { @@ -1099,7 +1099,7 @@ public final class AccessControlProtos { return this; } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public Builder clearNamespacePermission() { if (namespacePermissionBuilder_ == null) { @@ -1112,7 +1112,7 @@ public final class AccessControlProtos { return this; } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.Builder getNamespacePermissionBuilder() { bitField0_ |= 0x00000004; @@ -1120,7 +1120,7 @@ public final class AccessControlProtos { return getNamespacePermissionFieldBuilder().getBuilder(); } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermissionOrBuilder getNamespacePermissionOrBuilder() { if (namespacePermissionBuilder_ != null) { @@ -1130,7 +1130,7 @@ public final class AccessControlProtos { } } /** - * optional .NamespacePermission namespace_permission = 3; + * optional .hbase.pb.NamespacePermission namespace_permission = 3; */ private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermissionOrBuilder> @@ -1146,18 +1146,18 @@ public final class AccessControlProtos { return namespacePermissionBuilder_; } - // optional .TablePermission table_permission = 4; + // optional .hbase.pb.TablePermission table_permission = 4; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission tablePermission_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermissionOrBuilder> tablePermissionBuilder_; /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public boolean hasTablePermission() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission getTablePermission() { if (tablePermissionBuilder_ == null) { @@ -1167,7 +1167,7 @@ public final class AccessControlProtos { } } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public Builder setTablePermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission value) { if (tablePermissionBuilder_ == null) { @@ -1183,7 +1183,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public Builder setTablePermission( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.Builder builderForValue) { @@ -1197,7 +1197,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public Builder mergeTablePermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission value) { if (tablePermissionBuilder_ == null) { @@ -1216,7 +1216,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public Builder clearTablePermission() { if (tablePermissionBuilder_ == null) { @@ -1229,7 +1229,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.Builder getTablePermissionBuilder() { bitField0_ |= 0x00000008; @@ -1237,7 +1237,7 @@ public final class AccessControlProtos { return getTablePermissionFieldBuilder().getBuilder(); } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermissionOrBuilder getTablePermissionOrBuilder() { if (tablePermissionBuilder_ != null) { @@ -1247,7 +1247,7 @@ public final class AccessControlProtos { } } /** - * optional .TablePermission table_permission = 4; + * optional .hbase.pb.TablePermission table_permission = 4; */ private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermissionOrBuilder> @@ -1263,7 +1263,7 @@ public final class AccessControlProtos { return tablePermissionBuilder_; } - // @@protoc_insertion_point(builder_scope:Permission) + // @@protoc_insertion_point(builder_scope:hbase.pb.Permission) } static { @@ -1271,23 +1271,23 @@ public final class AccessControlProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:Permission) + // @@protoc_insertion_point(class_scope:hbase.pb.Permission) } public interface TablePermissionOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional .TableName table_name = 1; + // optional .hbase.pb.TableName table_name = 1; /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ boolean hasTableName(); /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName(); /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder(); @@ -1311,22 +1311,22 @@ public final class AccessControlProtos { */ com.google.protobuf.ByteString getQualifier(); - // repeated .Permission.Action action = 4; + // repeated .hbase.pb.Permission.Action action = 4; /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ java.util.List getActionList(); /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ int getActionCount(); /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index); } /** - * Protobuf type {@code TablePermission} + * Protobuf type {@code hbase.pb.TablePermission} */ public static final class TablePermission extends com.google.protobuf.GeneratedMessage @@ -1449,12 +1449,12 @@ public final class AccessControlProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_TablePermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_TablePermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_TablePermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_TablePermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.Builder.class); } @@ -1475,23 +1475,23 @@ public final class AccessControlProtos { } private int bitField0_; - // optional .TableName table_name = 1; + // optional .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_; /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public boolean hasTableName() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() { return tableName_; } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() { return tableName_; @@ -1529,23 +1529,23 @@ public final class AccessControlProtos { return qualifier_; } - // repeated .Permission.Action action = 4; + // repeated .hbase.pb.Permission.Action action = 4; public static final int ACTION_FIELD_NUMBER = 4; private java.util.List action_; /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public java.util.List getActionList() { return action_; } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public int getActionCount() { return action_.size(); } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index) { return action_.get(index); @@ -1758,19 +1758,19 @@ public final class AccessControlProtos { return builder; } /** - * Protobuf type {@code TablePermission} + * Protobuf type {@code hbase.pb.TablePermission} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermissionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_TablePermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_TablePermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_TablePermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_TablePermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission.Builder.class); } @@ -1817,7 +1817,7 @@ public final class AccessControlProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_TablePermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_TablePermission_descriptor; } public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.TablePermission getDefaultInstanceForType() { @@ -1925,18 +1925,18 @@ public final class AccessControlProtos { } private int bitField0_; - // optional .TableName table_name = 1; + // optional .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 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_; /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public boolean hasTableName() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() { if (tableNameBuilder_ == null) { @@ -1946,7 +1946,7 @@ public final class AccessControlProtos { } } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { if (tableNameBuilder_ == null) { @@ -1962,7 +1962,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public Builder setTableName( org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { @@ -1976,7 +1976,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { if (tableNameBuilder_ == null) { @@ -1995,7 +1995,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public Builder clearTableName() { if (tableNameBuilder_ == null) { @@ -2008,7 +2008,7 @@ public final class AccessControlProtos { return this; } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() { bitField0_ |= 0x00000001; @@ -2016,7 +2016,7 @@ public final class AccessControlProtos { return getTableNameFieldBuilder().getBuilder(); } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() { if (tableNameBuilder_ != null) { @@ -2026,7 +2026,7 @@ public final class AccessControlProtos { } } /** - * optional .TableName table_name = 1; + * optional .hbase.pb.TableName table_name = 1; */ 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> @@ -2114,7 +2114,7 @@ public final class AccessControlProtos { return this; } - // repeated .Permission.Action action = 4; + // repeated .hbase.pb.Permission.Action action = 4; private java.util.List action_ = java.util.Collections.emptyList(); private void ensureActionIsMutable() { @@ -2124,25 +2124,25 @@ public final class AccessControlProtos { } } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public java.util.List getActionList() { return java.util.Collections.unmodifiableList(action_); } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public int getActionCount() { return action_.size(); } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index) { return action_.get(index); } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public Builder setAction( int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action value) { @@ -2155,7 +2155,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public Builder addAction(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action value) { if (value == null) { @@ -2167,7 +2167,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public Builder addAllAction( java.lang.Iterable values) { @@ -2177,7 +2177,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 4; + * repeated .hbase.pb.Permission.Action action = 4; */ public Builder clearAction() { action_ = java.util.Collections.emptyList(); @@ -2186,7 +2186,7 @@ public final class AccessControlProtos { return this; } - // @@protoc_insertion_point(builder_scope:TablePermission) + // @@protoc_insertion_point(builder_scope:hbase.pb.TablePermission) } static { @@ -2194,7 +2194,7 @@ public final class AccessControlProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:TablePermission) + // @@protoc_insertion_point(class_scope:hbase.pb.TablePermission) } public interface NamespacePermissionOrBuilder @@ -2210,22 +2210,22 @@ public final class AccessControlProtos { */ com.google.protobuf.ByteString getNamespaceName(); - // repeated .Permission.Action action = 2; + // repeated .hbase.pb.Permission.Action action = 2; /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ java.util.List getActionList(); /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ int getActionCount(); /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index); } /** - * Protobuf type {@code NamespacePermission} + * Protobuf type {@code hbase.pb.NamespacePermission} */ public static final class NamespacePermission extends com.google.protobuf.GeneratedMessage @@ -2330,12 +2330,12 @@ public final class AccessControlProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_NamespacePermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_NamespacePermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_NamespacePermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_NamespacePermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.Builder.class); } @@ -2372,23 +2372,23 @@ public final class AccessControlProtos { return namespaceName_; } - // repeated .Permission.Action action = 2; + // repeated .hbase.pb.Permission.Action action = 2; public static final int ACTION_FIELD_NUMBER = 2; private java.util.List action_; /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public java.util.List getActionList() { return action_; } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public int getActionCount() { return action_.size(); } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index) { return action_.get(index); @@ -2561,19 +2561,19 @@ public final class AccessControlProtos { return builder; } /** - * Protobuf type {@code NamespacePermission} + * Protobuf type {@code hbase.pb.NamespacePermission} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermissionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_NamespacePermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_NamespacePermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_NamespacePermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_NamespacePermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission.Builder.class); } @@ -2611,7 +2611,7 @@ public final class AccessControlProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_NamespacePermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_NamespacePermission_descriptor; } public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.NamespacePermission getDefaultInstanceForType() { @@ -2731,7 +2731,7 @@ public final class AccessControlProtos { return this; } - // repeated .Permission.Action action = 2; + // repeated .hbase.pb.Permission.Action action = 2; private java.util.List action_ = java.util.Collections.emptyList(); private void ensureActionIsMutable() { @@ -2741,25 +2741,25 @@ public final class AccessControlProtos { } } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public java.util.List getActionList() { return java.util.Collections.unmodifiableList(action_); } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public int getActionCount() { return action_.size(); } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index) { return action_.get(index); } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public Builder setAction( int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action value) { @@ -2772,7 +2772,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public Builder addAction(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action value) { if (value == null) { @@ -2784,7 +2784,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public Builder addAllAction( java.lang.Iterable values) { @@ -2794,7 +2794,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 2; + * repeated .hbase.pb.Permission.Action action = 2; */ public Builder clearAction() { action_ = java.util.Collections.emptyList(); @@ -2803,7 +2803,7 @@ public final class AccessControlProtos { return this; } - // @@protoc_insertion_point(builder_scope:NamespacePermission) + // @@protoc_insertion_point(builder_scope:hbase.pb.NamespacePermission) } static { @@ -2811,28 +2811,28 @@ public final class AccessControlProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:NamespacePermission) + // @@protoc_insertion_point(class_scope:hbase.pb.NamespacePermission) } public interface GlobalPermissionOrBuilder extends com.google.protobuf.MessageOrBuilder { - // repeated .Permission.Action action = 1; + // repeated .hbase.pb.Permission.Action action = 1; /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ java.util.List getActionList(); /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ int getActionCount(); /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index); } /** - * Protobuf type {@code GlobalPermission} + * Protobuf type {@code hbase.pb.GlobalPermission} */ public static final class GlobalPermission extends com.google.protobuf.GeneratedMessage @@ -2932,12 +2932,12 @@ public final class AccessControlProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GlobalPermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GlobalPermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GlobalPermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GlobalPermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.Builder.class); } @@ -2957,23 +2957,23 @@ public final class AccessControlProtos { return PARSER; } - // repeated .Permission.Action action = 1; + // repeated .hbase.pb.Permission.Action action = 1; public static final int ACTION_FIELD_NUMBER = 1; private java.util.List action_; /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public java.util.List getActionList() { return action_; } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public int getActionCount() { return action_.size(); } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index) { return action_.get(index); @@ -3129,19 +3129,19 @@ public final class AccessControlProtos { return builder; } /** - * Protobuf type {@code GlobalPermission} + * Protobuf type {@code hbase.pb.GlobalPermission} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermissionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GlobalPermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GlobalPermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GlobalPermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GlobalPermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission.Builder.class); } @@ -3177,7 +3177,7 @@ public final class AccessControlProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GlobalPermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GlobalPermission_descriptor; } public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GlobalPermission getDefaultInstanceForType() { @@ -3252,7 +3252,7 @@ public final class AccessControlProtos { } private int bitField0_; - // repeated .Permission.Action action = 1; + // repeated .hbase.pb.Permission.Action action = 1; private java.util.List action_ = java.util.Collections.emptyList(); private void ensureActionIsMutable() { @@ -3262,25 +3262,25 @@ public final class AccessControlProtos { } } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public java.util.List getActionList() { return java.util.Collections.unmodifiableList(action_); } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public int getActionCount() { return action_.size(); } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action getAction(int index) { return action_.get(index); } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public Builder setAction( int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action value) { @@ -3293,7 +3293,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public Builder addAction(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Action value) { if (value == null) { @@ -3305,7 +3305,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public Builder addAllAction( java.lang.Iterable values) { @@ -3315,7 +3315,7 @@ public final class AccessControlProtos { return this; } /** - * repeated .Permission.Action action = 1; + * repeated .hbase.pb.Permission.Action action = 1; */ public Builder clearAction() { action_ = java.util.Collections.emptyList(); @@ -3324,7 +3324,7 @@ public final class AccessControlProtos { return this; } - // @@protoc_insertion_point(builder_scope:GlobalPermission) + // @@protoc_insertion_point(builder_scope:hbase.pb.GlobalPermission) } static { @@ -3332,7 +3332,7 @@ public final class AccessControlProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:GlobalPermission) + // @@protoc_insertion_point(class_scope:hbase.pb.GlobalPermission) } public interface UserPermissionOrBuilder @@ -3348,22 +3348,22 @@ public final class AccessControlProtos { */ com.google.protobuf.ByteString getUser(); - // required .Permission permission = 3; + // required .hbase.pb.Permission permission = 3; /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ boolean hasPermission(); /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermission(); /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionOrBuilder(); } /** - * Protobuf type {@code UserPermission} + * Protobuf type {@code hbase.pb.UserPermission} */ public static final class UserPermission extends com.google.protobuf.GeneratedMessage @@ -3445,12 +3445,12 @@ public final class AccessControlProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UserPermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UserPermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UserPermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UserPermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder.class); } @@ -3487,23 +3487,23 @@ public final class AccessControlProtos { return user_; } - // required .Permission permission = 3; + // required .hbase.pb.Permission permission = 3; public static final int PERMISSION_FIELD_NUMBER = 3; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission permission_; /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public boolean hasPermission() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermission() { return permission_; } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionOrBuilder() { return permission_; @@ -3686,19 +3686,19 @@ public final class AccessControlProtos { return builder; } /** - * Protobuf type {@code UserPermission} + * Protobuf type {@code hbase.pb.UserPermission} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UserPermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UserPermission_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UserPermission_fieldAccessorTable + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UserPermission_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder.class); } @@ -3741,7 +3741,7 @@ public final class AccessControlProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UserPermission_descriptor; + return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UserPermission_descriptor; } public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getDefaultInstanceForType() { @@ -3869,18 +3869,18 @@ public final class AccessControlProtos { return this; } - // required .Permission permission = 3; + // required .hbase.pb.Permission permission = 3; private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission permission_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder> permissionBuilder_; /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public boolean hasPermission() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermission() { if (permissionBuilder_ == null) { @@ -3890,7 +3890,7 @@ public final class AccessControlProtos { } } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public Builder setPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) { if (permissionBuilder_ == null) { @@ -3906,7 +3906,7 @@ public final class AccessControlProtos { return this; } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public Builder setPermission( org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) { @@ -3920,7 +3920,7 @@ public final class AccessControlProtos { return this; } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public Builder mergePermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) { if (permissionBuilder_ == null) { @@ -3939,7 +3939,7 @@ public final class AccessControlProtos { return this; } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public Builder clearPermission() { if (permissionBuilder_ == null) { @@ -3952,7 +3952,7 @@ public final class AccessControlProtos { return this; } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder getPermissionBuilder() { bitField0_ |= 0x00000002; @@ -3960,7 +3960,7 @@ public final class AccessControlProtos { return getPermissionFieldBuilder().getBuilder(); } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionOrBuilder() { if (permissionBuilder_ != null) { @@ -3970,7 +3970,7 @@ public final class AccessControlProtos { } } /** - * required .Permission permission = 3; + * required .hbase.pb.Permission permission = 3; */ private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder> @@ -3986,7 +3986,7 @@ public final class AccessControlProtos { return permissionBuilder_; } - // @@protoc_insertion_point(builder_scope:UserPermission) + // @@protoc_insertion_point(builder_scope:hbase.pb.UserPermission) } static { @@ -3994,39 +3994,39 @@ public final class AccessControlProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:UserPermission) + // @@protoc_insertion_point(class_scope:hbase.pb.UserPermission) } public interface UsersAndPermissionsOrBuilder extends com.google.protobuf.MessageOrBuilder { - // repeated .UsersAndPermissions.UserPermissions user_permissions = 1; + // repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1; /** - * repeated .UsersAndPermissions.UserPermissions user_permissions = 1; + * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1; */ java.util.List getUserPermissionsList(); /** - * repeated .UsersAndPermissions.UserPermissions user_permissions = 1; + * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions getUserPermissions(int index); /** - * repeated .UsersAndPermissions.UserPermissions user_permissions = 1; + * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1; */ int getUserPermissionsCount(); /** - * repeated .UsersAndPermissions.UserPermissions user_permissions = 1; + * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1; */ java.util.List getUserPermissionsOrBuilderList(); /** - * repeated .UsersAndPermissions.UserPermissions user_permissions = 1; + * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1; */ org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissionsOrBuilder getUserPermissionsOrBuilder( int index); } /** - * Protobuf type {@code UsersAndPermissions} + * Protobuf type {@code hbase.pb.UsersAndPermissions} * * 
    **
@@ -4106,12 +4106,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.Builder.class);
     }
@@ -4144,33 +4144,33 @@ public final class AccessControlProtos {
        */
       com.google.protobuf.ByteString getUser();
 
-      // repeated .Permission permissions = 2;
+      // repeated .hbase.pb.Permission permissions = 2;
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       java.util.List 
           getPermissionsList();
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermissions(int index);
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       int getPermissionsCount();
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       java.util.List 
           getPermissionsOrBuilderList();
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionsOrBuilder(
           int index);
     }
     /**
-     * Protobuf type {@code UsersAndPermissions.UserPermissions}
+     * Protobuf type {@code hbase.pb.UsersAndPermissions.UserPermissions}
      */
     public static final class UserPermissions extends
         com.google.protobuf.GeneratedMessage
@@ -4250,12 +4250,12 @@ public final class AccessControlProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_UserPermissions_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_UserPermissions_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_UserPermissions_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_UserPermissions_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder.class);
       }
@@ -4292,36 +4292,36 @@ public final class AccessControlProtos {
         return user_;
       }
 
-      // repeated .Permission permissions = 2;
+      // repeated .hbase.pb.Permission permissions = 2;
       public static final int PERMISSIONS_FIELD_NUMBER = 2;
       private java.util.List permissions_;
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       public java.util.List getPermissionsList() {
         return permissions_;
       }
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       public java.util.List 
           getPermissionsOrBuilderList() {
         return permissions_;
       }
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       public int getPermissionsCount() {
         return permissions_.size();
       }
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermissions(int index) {
         return permissions_.get(index);
       }
       /**
-       * repeated .Permission permissions = 2;
+       * repeated .hbase.pb.Permission permissions = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionsOrBuilder(
           int index) {
@@ -4500,19 +4500,19 @@ public final class AccessControlProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code UsersAndPermissions.UserPermissions}
+       * Protobuf type {@code hbase.pb.UsersAndPermissions.UserPermissions}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissionsOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_UserPermissions_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_UserPermissions_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_UserPermissions_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_UserPermissions_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder.class);
         }
@@ -4555,7 +4555,7 @@ public final class AccessControlProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_UserPermissions_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_UserPermissions_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions getDefaultInstanceForType() {
@@ -4705,7 +4705,7 @@ public final class AccessControlProtos {
           return this;
         }
 
-        // repeated .Permission permissions = 2;
+        // repeated .hbase.pb.Permission permissions = 2;
         private java.util.List permissions_ =
           java.util.Collections.emptyList();
         private void ensurePermissionsIsMutable() {
@@ -4719,7 +4719,7 @@ public final class AccessControlProtos {
             org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder> permissionsBuilder_;
 
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public java.util.List getPermissionsList() {
           if (permissionsBuilder_ == null) {
@@ -4729,7 +4729,7 @@ public final class AccessControlProtos {
           }
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public int getPermissionsCount() {
           if (permissionsBuilder_ == null) {
@@ -4739,7 +4739,7 @@ public final class AccessControlProtos {
           }
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermissions(int index) {
           if (permissionsBuilder_ == null) {
@@ -4749,7 +4749,7 @@ public final class AccessControlProtos {
           }
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder setPermissions(
             int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) {
@@ -4766,7 +4766,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder setPermissions(
             int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) {
@@ -4780,7 +4780,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder addPermissions(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) {
           if (permissionsBuilder_ == null) {
@@ -4796,7 +4796,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder addPermissions(
             int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) {
@@ -4813,7 +4813,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder addPermissions(
             org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) {
@@ -4827,7 +4827,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder addPermissions(
             int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) {
@@ -4841,7 +4841,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder addAllPermissions(
             java.lang.Iterable values) {
@@ -4855,7 +4855,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder clearPermissions() {
           if (permissionsBuilder_ == null) {
@@ -4868,7 +4868,7 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public Builder removePermissions(int index) {
           if (permissionsBuilder_ == null) {
@@ -4881,14 +4881,14 @@ public final class AccessControlProtos {
           return this;
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder getPermissionsBuilder(
             int index) {
           return getPermissionsFieldBuilder().getBuilder(index);
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionsOrBuilder(
             int index) {
@@ -4898,7 +4898,7 @@ public final class AccessControlProtos {
           }
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public java.util.List 
              getPermissionsOrBuilderList() {
@@ -4909,14 +4909,14 @@ public final class AccessControlProtos {
           }
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder addPermissionsBuilder() {
           return getPermissionsFieldBuilder().addBuilder(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.getDefaultInstance());
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder addPermissionsBuilder(
             int index) {
@@ -4924,7 +4924,7 @@ public final class AccessControlProtos {
               index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.getDefaultInstance());
         }
         /**
-         * repeated .Permission permissions = 2;
+         * repeated .hbase.pb.Permission permissions = 2;
          */
         public java.util.List 
              getPermissionsBuilderList() {
@@ -4945,7 +4945,7 @@ public final class AccessControlProtos {
           return permissionsBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:UsersAndPermissions.UserPermissions)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.UsersAndPermissions.UserPermissions)
       }
 
       static {
@@ -4953,39 +4953,39 @@ public final class AccessControlProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:UsersAndPermissions.UserPermissions)
+      // @@protoc_insertion_point(class_scope:hbase.pb.UsersAndPermissions.UserPermissions)
     }
 
-    // repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+    // repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
     public static final int USER_PERMISSIONS_FIELD_NUMBER = 1;
     private java.util.List userPermissions_;
     /**
-     * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+     * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
      */
     public java.util.List getUserPermissionsList() {
       return userPermissions_;
     }
     /**
-     * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+     * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
      */
     public java.util.List 
         getUserPermissionsOrBuilderList() {
       return userPermissions_;
     }
     /**
-     * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+     * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
      */
     public int getUserPermissionsCount() {
       return userPermissions_.size();
     }
     /**
-     * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+     * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions getUserPermissions(int index) {
       return userPermissions_.get(index);
     }
     /**
-     * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+     * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissionsOrBuilder getUserPermissionsOrBuilder(
         int index) {
@@ -5143,7 +5143,7 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UsersAndPermissions}
+     * Protobuf type {@code hbase.pb.UsersAndPermissions}
      *
      * 
      **
@@ -5155,12 +5155,12 @@ public final class AccessControlProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissionsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.Builder.class);
       }
@@ -5201,7 +5201,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_UsersAndPermissions_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_UsersAndPermissions_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions getDefaultInstanceForType() {
@@ -5302,7 +5302,7 @@ public final class AccessControlProtos {
       }
       private int bitField0_;
 
-      // repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+      // repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
       private java.util.List userPermissions_ =
         java.util.Collections.emptyList();
       private void ensureUserPermissionsIsMutable() {
@@ -5316,7 +5316,7 @@ public final class AccessControlProtos {
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissionsOrBuilder> userPermissionsBuilder_;
 
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public java.util.List getUserPermissionsList() {
         if (userPermissionsBuilder_ == null) {
@@ -5326,7 +5326,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public int getUserPermissionsCount() {
         if (userPermissionsBuilder_ == null) {
@@ -5336,7 +5336,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions getUserPermissions(int index) {
         if (userPermissionsBuilder_ == null) {
@@ -5346,7 +5346,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder setUserPermissions(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions value) {
@@ -5363,7 +5363,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder setUserPermissions(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder builderForValue) {
@@ -5377,7 +5377,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder addUserPermissions(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions value) {
         if (userPermissionsBuilder_ == null) {
@@ -5393,7 +5393,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder addUserPermissions(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions value) {
@@ -5410,7 +5410,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder addUserPermissions(
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder builderForValue) {
@@ -5424,7 +5424,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder addUserPermissions(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder builderForValue) {
@@ -5438,7 +5438,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder addAllUserPermissions(
           java.lang.Iterable values) {
@@ -5452,7 +5452,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder clearUserPermissions() {
         if (userPermissionsBuilder_ == null) {
@@ -5465,7 +5465,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public Builder removeUserPermissions(int index) {
         if (userPermissionsBuilder_ == null) {
@@ -5478,14 +5478,14 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder getUserPermissionsBuilder(
           int index) {
         return getUserPermissionsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissionsOrBuilder getUserPermissionsOrBuilder(
           int index) {
@@ -5495,7 +5495,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public java.util.List 
            getUserPermissionsOrBuilderList() {
@@ -5506,14 +5506,14 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder addUserPermissionsBuilder() {
         return getUserPermissionsFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.getDefaultInstance());
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.Builder addUserPermissionsBuilder(
           int index) {
@@ -5521,7 +5521,7 @@ public final class AccessControlProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UsersAndPermissions.UserPermissions.getDefaultInstance());
       }
       /**
-       * repeated .UsersAndPermissions.UserPermissions user_permissions = 1;
+       * repeated .hbase.pb.UsersAndPermissions.UserPermissions user_permissions = 1;
        */
       public java.util.List 
            getUserPermissionsBuilderList() {
@@ -5542,7 +5542,7 @@ public final class AccessControlProtos {
         return userPermissionsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:UsersAndPermissions)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UsersAndPermissions)
     }
 
     static {
@@ -5550,28 +5550,28 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UsersAndPermissions)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UsersAndPermissions)
   }
 
   public interface GrantRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserPermission user_permission = 1;
+    // required .hbase.pb.UserPermission user_permission = 1;
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     boolean hasUserPermission();
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission();
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder();
   }
   /**
-   * Protobuf type {@code GrantRequest}
+   * Protobuf type {@code hbase.pb.GrantRequest}
    */
   public static final class GrantRequest extends
       com.google.protobuf.GeneratedMessage
@@ -5648,12 +5648,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantRequest.Builder.class);
     }
@@ -5674,23 +5674,23 @@ public final class AccessControlProtos {
     }
 
     private int bitField0_;
-    // required .UserPermission user_permission = 1;
+    // required .hbase.pb.UserPermission user_permission = 1;
     public static final int USER_PERMISSION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission userPermission_;
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     public boolean hasUserPermission() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission() {
       return userPermission_;
     }
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder() {
       return userPermission_;
@@ -5852,19 +5852,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GrantRequest}
+     * Protobuf type {@code hbase.pb.GrantRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantRequest.Builder.class);
       }
@@ -5905,7 +5905,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantRequest getDefaultInstanceForType() {
@@ -5986,18 +5986,18 @@ public final class AccessControlProtos {
       }
       private int bitField0_;
 
-      // required .UserPermission user_permission = 1;
+      // required .hbase.pb.UserPermission user_permission = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission userPermission_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder> userPermissionBuilder_;
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public boolean hasUserPermission() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission() {
         if (userPermissionBuilder_ == null) {
@@ -6007,7 +6007,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder setUserPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
         if (userPermissionBuilder_ == null) {
@@ -6023,7 +6023,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder setUserPermission(
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder builderForValue) {
@@ -6037,7 +6037,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder mergeUserPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
         if (userPermissionBuilder_ == null) {
@@ -6056,7 +6056,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder clearUserPermission() {
         if (userPermissionBuilder_ == null) {
@@ -6069,7 +6069,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder getUserPermissionBuilder() {
         bitField0_ |= 0x00000001;
@@ -6077,7 +6077,7 @@ public final class AccessControlProtos {
         return getUserPermissionFieldBuilder().getBuilder();
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder() {
         if (userPermissionBuilder_ != null) {
@@ -6087,7 +6087,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder> 
@@ -6103,7 +6103,7 @@ public final class AccessControlProtos {
         return userPermissionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GrantRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GrantRequest)
     }
 
     static {
@@ -6111,14 +6111,14 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GrantRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GrantRequest)
   }
 
   public interface GrantResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code GrantResponse}
+   * Protobuf type {@code hbase.pb.GrantResponse}
    */
   public static final class GrantResponse extends
       com.google.protobuf.GeneratedMessage
@@ -6181,12 +6181,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantResponse.Builder.class);
     }
@@ -6337,19 +6337,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GrantResponse}
+     * Protobuf type {@code hbase.pb.GrantResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantResponse.Builder.class);
       }
@@ -6383,7 +6383,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GrantResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GrantResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GrantResponse getDefaultInstanceForType() {
@@ -6441,7 +6441,7 @@ public final class AccessControlProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GrantResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GrantResponse)
     }
 
     static {
@@ -6449,28 +6449,28 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GrantResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GrantResponse)
   }
 
   public interface RevokeRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserPermission user_permission = 1;
+    // required .hbase.pb.UserPermission user_permission = 1;
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     boolean hasUserPermission();
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission();
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder();
   }
   /**
-   * Protobuf type {@code RevokeRequest}
+   * Protobuf type {@code hbase.pb.RevokeRequest}
    */
   public static final class RevokeRequest extends
       com.google.protobuf.GeneratedMessage
@@ -6547,12 +6547,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeRequest.Builder.class);
     }
@@ -6573,23 +6573,23 @@ public final class AccessControlProtos {
     }
 
     private int bitField0_;
-    // required .UserPermission user_permission = 1;
+    // required .hbase.pb.UserPermission user_permission = 1;
     public static final int USER_PERMISSION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission userPermission_;
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     public boolean hasUserPermission() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission() {
       return userPermission_;
     }
     /**
-     * required .UserPermission user_permission = 1;
+     * required .hbase.pb.UserPermission user_permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder() {
       return userPermission_;
@@ -6751,19 +6751,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RevokeRequest}
+     * Protobuf type {@code hbase.pb.RevokeRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeRequest.Builder.class);
       }
@@ -6804,7 +6804,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeRequest getDefaultInstanceForType() {
@@ -6885,18 +6885,18 @@ public final class AccessControlProtos {
       }
       private int bitField0_;
 
-      // required .UserPermission user_permission = 1;
+      // required .hbase.pb.UserPermission user_permission = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission userPermission_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder> userPermissionBuilder_;
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public boolean hasUserPermission() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission() {
         if (userPermissionBuilder_ == null) {
@@ -6906,7 +6906,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder setUserPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
         if (userPermissionBuilder_ == null) {
@@ -6922,7 +6922,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder setUserPermission(
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder builderForValue) {
@@ -6936,7 +6936,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder mergeUserPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
         if (userPermissionBuilder_ == null) {
@@ -6955,7 +6955,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder clearUserPermission() {
         if (userPermissionBuilder_ == null) {
@@ -6968,7 +6968,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder getUserPermissionBuilder() {
         bitField0_ |= 0x00000001;
@@ -6976,7 +6976,7 @@ public final class AccessControlProtos {
         return getUserPermissionFieldBuilder().getBuilder();
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder() {
         if (userPermissionBuilder_ != null) {
@@ -6986,7 +6986,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * required .UserPermission user_permission = 1;
+       * required .hbase.pb.UserPermission user_permission = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder> 
@@ -7002,7 +7002,7 @@ public final class AccessControlProtos {
         return userPermissionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RevokeRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RevokeRequest)
     }
 
     static {
@@ -7010,14 +7010,14 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RevokeRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RevokeRequest)
   }
 
   public interface RevokeResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code RevokeResponse}
+   * Protobuf type {@code hbase.pb.RevokeResponse}
    */
   public static final class RevokeResponse extends
       com.google.protobuf.GeneratedMessage
@@ -7080,12 +7080,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponse.Builder.class);
     }
@@ -7236,19 +7236,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RevokeResponse}
+     * Protobuf type {@code hbase.pb.RevokeResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponse.Builder.class);
       }
@@ -7282,7 +7282,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_RevokeResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_RevokeResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.RevokeResponse getDefaultInstanceForType() {
@@ -7340,7 +7340,7 @@ public final class AccessControlProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RevokeResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RevokeResponse)
     }
 
     static {
@@ -7348,33 +7348,33 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RevokeResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RevokeResponse)
   }
 
   public interface GetUserPermissionsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .Permission.Type type = 1;
+    // optional .hbase.pb.Permission.Type type = 1;
     /**
-     * optional .Permission.Type type = 1;
+     * optional .hbase.pb.Permission.Type type = 1;
      */
     boolean hasType();
     /**
-     * optional .Permission.Type type = 1;
+     * optional .hbase.pb.Permission.Type type = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type getType();
 
-    // optional .TableName table_name = 2;
+    // optional .hbase.pb.TableName table_name = 2;
     /**
-     * optional .TableName table_name = 2;
+     * optional .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * optional .TableName table_name = 2;
+     * optional .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * optional .TableName table_name = 2;
+     * optional .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -7389,7 +7389,7 @@ public final class AccessControlProtos {
     com.google.protobuf.ByteString getNamespaceName();
   }
   /**
-   * Protobuf type {@code GetUserPermissionsRequest}
+   * Protobuf type {@code hbase.pb.GetUserPermissionsRequest}
    */
   public static final class GetUserPermissionsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -7482,12 +7482,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsRequest.Builder.class);
     }
@@ -7508,39 +7508,39 @@ public final class AccessControlProtos {
     }
 
     private int bitField0_;
-    // optional .Permission.Type type = 1;
+    // optional .hbase.pb.Permission.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type type_;
     /**
-     * optional .Permission.Type type = 1;
+     * optional .hbase.pb.Permission.Type type = 1;
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .Permission.Type type = 1;
+     * optional .hbase.pb.Permission.Type type = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type getType() {
       return type_;
     }
 
-    // optional .TableName table_name = 2;
+    // optional .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * optional .TableName table_name = 2;
+     * optional .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .TableName table_name = 2;
+     * optional .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * optional .TableName table_name = 2;
+     * optional .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -7750,19 +7750,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetUserPermissionsRequest}
+     * Protobuf type {@code hbase.pb.GetUserPermissionsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsRequest.Builder.class);
       }
@@ -7807,7 +7807,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsRequest getDefaultInstanceForType() {
@@ -7900,22 +7900,22 @@ public final class AccessControlProtos {
       }
       private int bitField0_;
 
-      // optional .Permission.Type type = 1;
+      // optional .hbase.pb.Permission.Type type = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type type_ = org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type.Global;
       /**
-       * optional .Permission.Type type = 1;
+       * optional .hbase.pb.Permission.Type type = 1;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .Permission.Type type = 1;
+       * optional .hbase.pb.Permission.Type type = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type getType() {
         return type_;
       }
       /**
-       * optional .Permission.Type type = 1;
+       * optional .hbase.pb.Permission.Type type = 1;
        */
       public Builder setType(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Type value) {
         if (value == null) {
@@ -7927,7 +7927,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * optional .Permission.Type type = 1;
+       * optional .hbase.pb.Permission.Type type = 1;
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -7936,18 +7936,18 @@ public final class AccessControlProtos {
         return this;
       }
 
-      // optional .TableName table_name = 2;
+      // optional .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -7957,7 +7957,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -7973,7 +7973,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -7987,7 +7987,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -8006,7 +8006,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -8019,7 +8019,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -8027,7 +8027,7 @@ public final class AccessControlProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -8037,7 +8037,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * optional .TableName table_name = 2;
+       * optional .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -8089,7 +8089,7 @@ public final class AccessControlProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetUserPermissionsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetUserPermissionsRequest)
     }
 
     static {
@@ -8097,39 +8097,39 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetUserPermissionsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetUserPermissionsRequest)
   }
 
   public interface GetUserPermissionsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .UserPermission user_permission = 1;
+    // repeated .hbase.pb.UserPermission user_permission = 1;
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     java.util.List 
         getUserPermissionList();
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission(int index);
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     int getUserPermissionCount();
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     java.util.List 
         getUserPermissionOrBuilderList();
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code GetUserPermissionsResponse}
+   * Protobuf type {@code hbase.pb.GetUserPermissionsResponse}
    */
   public static final class GetUserPermissionsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -8204,12 +8204,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponse.Builder.class);
     }
@@ -8229,36 +8229,36 @@ public final class AccessControlProtos {
       return PARSER;
     }
 
-    // repeated .UserPermission user_permission = 1;
+    // repeated .hbase.pb.UserPermission user_permission = 1;
     public static final int USER_PERMISSION_FIELD_NUMBER = 1;
     private java.util.List userPermission_;
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     public java.util.List getUserPermissionList() {
       return userPermission_;
     }
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     public java.util.List 
         getUserPermissionOrBuilderList() {
       return userPermission_;
     }
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     public int getUserPermissionCount() {
       return userPermission_.size();
     }
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission(int index) {
       return userPermission_.get(index);
     }
     /**
-     * repeated .UserPermission user_permission = 1;
+     * repeated .hbase.pb.UserPermission user_permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder(
         int index) {
@@ -8416,19 +8416,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetUserPermissionsResponse}
+     * Protobuf type {@code hbase.pb.GetUserPermissionsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponse.Builder.class);
       }
@@ -8469,7 +8469,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_GetUserPermissionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_GetUserPermissionsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.GetUserPermissionsResponse getDefaultInstanceForType() {
@@ -8570,7 +8570,7 @@ public final class AccessControlProtos {
       }
       private int bitField0_;
 
-      // repeated .UserPermission user_permission = 1;
+      // repeated .hbase.pb.UserPermission user_permission = 1;
       private java.util.List userPermission_ =
         java.util.Collections.emptyList();
       private void ensureUserPermissionIsMutable() {
@@ -8584,7 +8584,7 @@ public final class AccessControlProtos {
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder> userPermissionBuilder_;
 
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public java.util.List getUserPermissionList() {
         if (userPermissionBuilder_ == null) {
@@ -8594,7 +8594,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public int getUserPermissionCount() {
         if (userPermissionBuilder_ == null) {
@@ -8604,7 +8604,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission getUserPermission(int index) {
         if (userPermissionBuilder_ == null) {
@@ -8614,7 +8614,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder setUserPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
@@ -8631,7 +8631,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder setUserPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder builderForValue) {
@@ -8645,7 +8645,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder addUserPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
         if (userPermissionBuilder_ == null) {
@@ -8661,7 +8661,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder addUserPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission value) {
@@ -8678,7 +8678,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder addUserPermission(
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder builderForValue) {
@@ -8692,7 +8692,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder addUserPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder builderForValue) {
@@ -8706,7 +8706,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder addAllUserPermission(
           java.lang.Iterable values) {
@@ -8720,7 +8720,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder clearUserPermission() {
         if (userPermissionBuilder_ == null) {
@@ -8733,7 +8733,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public Builder removeUserPermission(int index) {
         if (userPermissionBuilder_ == null) {
@@ -8746,14 +8746,14 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder getUserPermissionBuilder(
           int index) {
         return getUserPermissionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermissionOrBuilder getUserPermissionOrBuilder(
           int index) {
@@ -8763,7 +8763,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public java.util.List 
            getUserPermissionOrBuilderList() {
@@ -8774,14 +8774,14 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder addUserPermissionBuilder() {
         return getUserPermissionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.getDefaultInstance());
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.Builder addUserPermissionBuilder(
           int index) {
@@ -8789,7 +8789,7 @@ public final class AccessControlProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission.getDefaultInstance());
       }
       /**
-       * repeated .UserPermission user_permission = 1;
+       * repeated .hbase.pb.UserPermission user_permission = 1;
        */
       public java.util.List 
            getUserPermissionBuilderList() {
@@ -8810,7 +8810,7 @@ public final class AccessControlProtos {
         return userPermissionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetUserPermissionsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetUserPermissionsResponse)
     }
 
     static {
@@ -8818,39 +8818,39 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetUserPermissionsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetUserPermissionsResponse)
   }
 
   public interface CheckPermissionsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .Permission permission = 1;
+    // repeated .hbase.pb.Permission permission = 1;
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     java.util.List 
         getPermissionList();
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermission(int index);
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     int getPermissionCount();
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     java.util.List 
         getPermissionOrBuilderList();
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code CheckPermissionsRequest}
+   * Protobuf type {@code hbase.pb.CheckPermissionsRequest}
    */
   public static final class CheckPermissionsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -8925,12 +8925,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequest.Builder.class);
     }
@@ -8950,36 +8950,36 @@ public final class AccessControlProtos {
       return PARSER;
     }
 
-    // repeated .Permission permission = 1;
+    // repeated .hbase.pb.Permission permission = 1;
     public static final int PERMISSION_FIELD_NUMBER = 1;
     private java.util.List permission_;
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     public java.util.List getPermissionList() {
       return permission_;
     }
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     public java.util.List 
         getPermissionOrBuilderList() {
       return permission_;
     }
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     public int getPermissionCount() {
       return permission_.size();
     }
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermission(int index) {
       return permission_.get(index);
     }
     /**
-     * repeated .Permission permission = 1;
+     * repeated .hbase.pb.Permission permission = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionOrBuilder(
         int index) {
@@ -9137,19 +9137,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CheckPermissionsRequest}
+     * Protobuf type {@code hbase.pb.CheckPermissionsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequest.Builder.class);
       }
@@ -9190,7 +9190,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequest getDefaultInstanceForType() {
@@ -9291,7 +9291,7 @@ public final class AccessControlProtos {
       }
       private int bitField0_;
 
-      // repeated .Permission permission = 1;
+      // repeated .hbase.pb.Permission permission = 1;
       private java.util.List permission_ =
         java.util.Collections.emptyList();
       private void ensurePermissionIsMutable() {
@@ -9305,7 +9305,7 @@ public final class AccessControlProtos {
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder> permissionBuilder_;
 
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public java.util.List getPermissionList() {
         if (permissionBuilder_ == null) {
@@ -9315,7 +9315,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public int getPermissionCount() {
         if (permissionBuilder_ == null) {
@@ -9325,7 +9325,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission getPermission(int index) {
         if (permissionBuilder_ == null) {
@@ -9335,7 +9335,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder setPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) {
@@ -9352,7 +9352,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder setPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) {
@@ -9366,7 +9366,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder addPermission(org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) {
         if (permissionBuilder_ == null) {
@@ -9382,7 +9382,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder addPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission value) {
@@ -9399,7 +9399,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder addPermission(
           org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) {
@@ -9413,7 +9413,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder addPermission(
           int index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder builderForValue) {
@@ -9427,7 +9427,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder addAllPermission(
           java.lang.Iterable values) {
@@ -9441,7 +9441,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder clearPermission() {
         if (permissionBuilder_ == null) {
@@ -9454,7 +9454,7 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public Builder removePermission(int index) {
         if (permissionBuilder_ == null) {
@@ -9467,14 +9467,14 @@ public final class AccessControlProtos {
         return this;
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder getPermissionBuilder(
           int index) {
         return getPermissionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.PermissionOrBuilder getPermissionOrBuilder(
           int index) {
@@ -9484,7 +9484,7 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public java.util.List 
            getPermissionOrBuilderList() {
@@ -9495,14 +9495,14 @@ public final class AccessControlProtos {
         }
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder addPermissionBuilder() {
         return getPermissionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.getDefaultInstance());
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.Builder addPermissionBuilder(
           int index) {
@@ -9510,7 +9510,7 @@ public final class AccessControlProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission.getDefaultInstance());
       }
       /**
-       * repeated .Permission permission = 1;
+       * repeated .hbase.pb.Permission permission = 1;
        */
       public java.util.List 
            getPermissionBuilderList() {
@@ -9531,7 +9531,7 @@ public final class AccessControlProtos {
         return permissionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CheckPermissionsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CheckPermissionsRequest)
     }
 
     static {
@@ -9539,14 +9539,14 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CheckPermissionsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CheckPermissionsRequest)
   }
 
   public interface CheckPermissionsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code CheckPermissionsResponse}
+   * Protobuf type {@code hbase.pb.CheckPermissionsResponse}
    */
   public static final class CheckPermissionsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -9609,12 +9609,12 @@ public final class AccessControlProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsResponse.Builder.class);
     }
@@ -9765,19 +9765,19 @@ public final class AccessControlProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CheckPermissionsResponse}
+     * Protobuf type {@code hbase.pb.CheckPermissionsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsResponse.Builder.class);
       }
@@ -9811,7 +9811,7 @@ public final class AccessControlProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_CheckPermissionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.internal_static_hbase_pb_CheckPermissionsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsResponse getDefaultInstanceForType() {
@@ -9869,7 +9869,7 @@ public final class AccessControlProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CheckPermissionsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CheckPermissionsResponse)
     }
 
     static {
@@ -9877,11 +9877,11 @@ public final class AccessControlProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CheckPermissionsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CheckPermissionsResponse)
   }
 
   /**
-   * Protobuf service {@code AccessControlService}
+   * Protobuf service {@code hbase.pb.AccessControlService}
    */
   public static abstract class AccessControlService
       implements com.google.protobuf.Service {
@@ -9889,7 +9889,7 @@ public final class AccessControlProtos {
 
     public interface Interface {
       /**
-       * rpc Grant(.GrantRequest) returns (.GrantResponse);
+       * rpc Grant(.hbase.pb.GrantRequest) returns (.hbase.pb.GrantResponse);
        */
       public abstract void grant(
           com.google.protobuf.RpcController controller,
@@ -9897,7 +9897,7 @@ public final class AccessControlProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Revoke(.RevokeRequest) returns (.RevokeResponse);
+       * rpc Revoke(.hbase.pb.RevokeRequest) returns (.hbase.pb.RevokeResponse);
        */
       public abstract void revoke(
           com.google.protobuf.RpcController controller,
@@ -9905,7 +9905,7 @@ public final class AccessControlProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetUserPermissions(.GetUserPermissionsRequest) returns (.GetUserPermissionsResponse);
+       * rpc GetUserPermissions(.hbase.pb.GetUserPermissionsRequest) returns (.hbase.pb.GetUserPermissionsResponse);
        */
       public abstract void getUserPermissions(
           com.google.protobuf.RpcController controller,
@@ -9913,7 +9913,7 @@ public final class AccessControlProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc CheckPermissions(.CheckPermissionsRequest) returns (.CheckPermissionsResponse);
+       * rpc CheckPermissions(.hbase.pb.CheckPermissionsRequest) returns (.hbase.pb.CheckPermissionsResponse);
        */
       public abstract void checkPermissions(
           com.google.protobuf.RpcController controller,
@@ -10040,7 +10040,7 @@ public final class AccessControlProtos {
     }
 
     /**
-     * rpc Grant(.GrantRequest) returns (.GrantResponse);
+     * rpc Grant(.hbase.pb.GrantRequest) returns (.hbase.pb.GrantResponse);
      */
     public abstract void grant(
         com.google.protobuf.RpcController controller,
@@ -10048,7 +10048,7 @@ public final class AccessControlProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Revoke(.RevokeRequest) returns (.RevokeResponse);
+     * rpc Revoke(.hbase.pb.RevokeRequest) returns (.hbase.pb.RevokeResponse);
      */
     public abstract void revoke(
         com.google.protobuf.RpcController controller,
@@ -10056,7 +10056,7 @@ public final class AccessControlProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetUserPermissions(.GetUserPermissionsRequest) returns (.GetUserPermissionsResponse);
+     * rpc GetUserPermissions(.hbase.pb.GetUserPermissionsRequest) returns (.hbase.pb.GetUserPermissionsResponse);
      */
     public abstract void getUserPermissions(
         com.google.protobuf.RpcController controller,
@@ -10064,7 +10064,7 @@ public final class AccessControlProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc CheckPermissions(.CheckPermissionsRequest) returns (.CheckPermissionsResponse);
+     * rpc CheckPermissions(.hbase.pb.CheckPermissionsRequest) returns (.hbase.pb.CheckPermissionsResponse);
      */
     public abstract void checkPermissions(
         com.google.protobuf.RpcController controller,
@@ -10322,84 +10322,84 @@ public final class AccessControlProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:AccessControlService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AccessControlService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Permission_descriptor;
+    internal_static_hbase_pb_Permission_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Permission_fieldAccessorTable;
+      internal_static_hbase_pb_Permission_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TablePermission_descriptor;
+    internal_static_hbase_pb_TablePermission_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TablePermission_fieldAccessorTable;
+      internal_static_hbase_pb_TablePermission_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_NamespacePermission_descriptor;
+    internal_static_hbase_pb_NamespacePermission_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_NamespacePermission_fieldAccessorTable;
+      internal_static_hbase_pb_NamespacePermission_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GlobalPermission_descriptor;
+    internal_static_hbase_pb_GlobalPermission_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GlobalPermission_fieldAccessorTable;
+      internal_static_hbase_pb_GlobalPermission_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UserPermission_descriptor;
+    internal_static_hbase_pb_UserPermission_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UserPermission_fieldAccessorTable;
+      internal_static_hbase_pb_UserPermission_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UsersAndPermissions_descriptor;
+    internal_static_hbase_pb_UsersAndPermissions_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UsersAndPermissions_fieldAccessorTable;
+      internal_static_hbase_pb_UsersAndPermissions_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UsersAndPermissions_UserPermissions_descriptor;
+    internal_static_hbase_pb_UsersAndPermissions_UserPermissions_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UsersAndPermissions_UserPermissions_fieldAccessorTable;
+      internal_static_hbase_pb_UsersAndPermissions_UserPermissions_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GrantRequest_descriptor;
+    internal_static_hbase_pb_GrantRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GrantRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GrantRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GrantResponse_descriptor;
+    internal_static_hbase_pb_GrantResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GrantResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GrantResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RevokeRequest_descriptor;
+    internal_static_hbase_pb_RevokeRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RevokeRequest_fieldAccessorTable;
+      internal_static_hbase_pb_RevokeRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RevokeResponse_descriptor;
+    internal_static_hbase_pb_RevokeResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RevokeResponse_fieldAccessorTable;
+      internal_static_hbase_pb_RevokeResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetUserPermissionsRequest_descriptor;
+    internal_static_hbase_pb_GetUserPermissionsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetUserPermissionsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetUserPermissionsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetUserPermissionsResponse_descriptor;
+    internal_static_hbase_pb_GetUserPermissionsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetUserPermissionsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetUserPermissionsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CheckPermissionsRequest_descriptor;
+    internal_static_hbase_pb_CheckPermissionsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CheckPermissionsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CheckPermissionsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CheckPermissionsResponse_descriptor;
+    internal_static_hbase_pb_CheckPermissionsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CheckPermissionsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CheckPermissionsResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -10409,141 +10409,147 @@ public final class AccessControlProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023AccessControl.proto\032\013HBase.proto\"\250\002\n\nP" +
-      "ermission\022\036\n\004type\030\001 \002(\0162\020.Permission.Typ" +
-      "e\022,\n\021global_permission\030\002 \001(\0132\021.GlobalPer" +
-      "mission\0222\n\024namespace_permission\030\003 \001(\0132\024." +
-      "NamespacePermission\022*\n\020table_permission\030" +
-      "\004 \001(\0132\020.TablePermission\">\n\006Action\022\010\n\004REA" +
-      "D\020\000\022\t\n\005WRITE\020\001\022\010\n\004EXEC\020\002\022\n\n\006CREATE\020\003\022\t\n\005" +
-      "ADMIN\020\004\",\n\004Type\022\n\n\006Global\020\001\022\r\n\tNamespace" +
-      "\020\002\022\t\n\005Table\020\003\"x\n\017TablePermission\022\036\n\ntabl" +
-      "e_name\030\001 \001(\0132\n.TableName\022\016\n\006family\030\002 \001(\014",
-      "\022\021\n\tqualifier\030\003 \001(\014\022\"\n\006action\030\004 \003(\0162\022.Pe" +
-      "rmission.Action\"Q\n\023NamespacePermission\022\026" +
-      "\n\016namespace_name\030\001 \001(\014\022\"\n\006action\030\002 \003(\0162\022" +
-      ".Permission.Action\"6\n\020GlobalPermission\022\"" +
-      "\n\006action\030\001 \003(\0162\022.Permission.Action\"?\n\016Us" +
-      "erPermission\022\014\n\004user\030\001 \002(\014\022\037\n\npermission" +
-      "\030\003 \002(\0132\013.Permission\"\230\001\n\023UsersAndPermissi" +
-      "ons\022>\n\020user_permissions\030\001 \003(\0132$.UsersAnd" +
-      "Permissions.UserPermissions\032A\n\017UserPermi" +
-      "ssions\022\014\n\004user\030\001 \002(\014\022 \n\013permissions\030\002 \003(",
-      "\0132\013.Permission\"8\n\014GrantRequest\022(\n\017user_p" +
-      "ermission\030\001 \002(\0132\017.UserPermission\"\017\n\rGran" +
-      "tResponse\"9\n\rRevokeRequest\022(\n\017user_permi" +
-      "ssion\030\001 \002(\0132\017.UserPermission\"\020\n\016RevokeRe" +
-      "sponse\"s\n\031GetUserPermissionsRequest\022\036\n\004t" +
-      "ype\030\001 \001(\0162\020.Permission.Type\022\036\n\ntable_nam" +
-      "e\030\002 \001(\0132\n.TableName\022\026\n\016namespace_name\030\003 " +
-      "\001(\014\"F\n\032GetUserPermissionsResponse\022(\n\017use" +
-      "r_permission\030\001 \003(\0132\017.UserPermission\":\n\027C" +
-      "heckPermissionsRequest\022\037\n\npermission\030\001 \003",
-      "(\0132\013.Permission\"\032\n\030CheckPermissionsRespo" +
-      "nse2\201\002\n\024AccessControlService\022&\n\005Grant\022\r." +
-      "GrantRequest\032\016.GrantResponse\022)\n\006Revoke\022\016" +
-      ".RevokeRequest\032\017.RevokeResponse\022M\n\022GetUs" +
-      "erPermissions\022\032.GetUserPermissionsReques" +
-      "t\032\033.GetUserPermissionsResponse\022G\n\020CheckP" +
-      "ermissions\022\030.CheckPermissionsRequest\032\031.C" +
-      "heckPermissionsResponseBI\n*org.apache.ha" +
-      "doop.hbase.protobuf.generatedB\023AccessCon" +
-      "trolProtosH\001\210\001\001\240\001\001"
+      "\n\023AccessControl.proto\022\010hbase.pb\032\013HBase.p" +
+      "roto\"\314\002\n\nPermission\022\'\n\004type\030\001 \002(\0162\031.hbas" +
+      "e.pb.Permission.Type\0225\n\021global_permissio" +
+      "n\030\002 \001(\0132\032.hbase.pb.GlobalPermission\022;\n\024n" +
+      "amespace_permission\030\003 \001(\0132\035.hbase.pb.Nam" +
+      "espacePermission\0223\n\020table_permission\030\004 \001" +
+      "(\0132\031.hbase.pb.TablePermission\">\n\006Action\022" +
+      "\010\n\004READ\020\000\022\t\n\005WRITE\020\001\022\010\n\004EXEC\020\002\022\n\n\006CREATE" +
+      "\020\003\022\t\n\005ADMIN\020\004\",\n\004Type\022\n\n\006Global\020\001\022\r\n\tNam" +
+      "espace\020\002\022\t\n\005Table\020\003\"\212\001\n\017TablePermission\022",
+      "\'\n\ntable_name\030\001 \001(\0132\023.hbase.pb.TableName" +
+      "\022\016\n\006family\030\002 \001(\014\022\021\n\tqualifier\030\003 \001(\014\022+\n\006a" +
+      "ction\030\004 \003(\0162\033.hbase.pb.Permission.Action" +
+      "\"Z\n\023NamespacePermission\022\026\n\016namespace_nam" +
+      "e\030\001 \001(\014\022+\n\006action\030\002 \003(\0162\033.hbase.pb.Permi" +
+      "ssion.Action\"?\n\020GlobalPermission\022+\n\006acti" +
+      "on\030\001 \003(\0162\033.hbase.pb.Permission.Action\"H\n" +
+      "\016UserPermission\022\014\n\004user\030\001 \002(\014\022(\n\npermiss" +
+      "ion\030\003 \002(\0132\024.hbase.pb.Permission\"\252\001\n\023User" +
+      "sAndPermissions\022G\n\020user_permissions\030\001 \003(",
+      "\0132-.hbase.pb.UsersAndPermissions.UserPer" +
+      "missions\032J\n\017UserPermissions\022\014\n\004user\030\001 \002(" +
+      "\014\022)\n\013permissions\030\002 \003(\0132\024.hbase.pb.Permis" +
+      "sion\"A\n\014GrantRequest\0221\n\017user_permission\030" +
+      "\001 \002(\0132\030.hbase.pb.UserPermission\"\017\n\rGrant" +
+      "Response\"B\n\rRevokeRequest\0221\n\017user_permis" +
+      "sion\030\001 \002(\0132\030.hbase.pb.UserPermission\"\020\n\016" +
+      "RevokeResponse\"\205\001\n\031GetUserPermissionsReq" +
+      "uest\022\'\n\004type\030\001 \001(\0162\031.hbase.pb.Permission" +
+      ".Type\022\'\n\ntable_name\030\002 \001(\0132\023.hbase.pb.Tab",
+      "leName\022\026\n\016namespace_name\030\003 \001(\014\"O\n\032GetUse" +
+      "rPermissionsResponse\0221\n\017user_permission\030" +
+      "\001 \003(\0132\030.hbase.pb.UserPermission\"C\n\027Check" +
+      "PermissionsRequest\022(\n\npermission\030\001 \003(\0132\024" +
+      ".hbase.pb.Permission\"\032\n\030CheckPermissions" +
+      "Response2\311\002\n\024AccessControlService\0228\n\005Gra" +
+      "nt\022\026.hbase.pb.GrantRequest\032\027.hbase.pb.Gr" +
+      "antResponse\022;\n\006Revoke\022\027.hbase.pb.RevokeR" +
+      "equest\032\030.hbase.pb.RevokeResponse\022_\n\022GetU" +
+      "serPermissions\022#.hbase.pb.GetUserPermiss",
+      "ionsRequest\032$.hbase.pb.GetUserPermission" +
+      "sResponse\022Y\n\020CheckPermissions\022!.hbase.pb" +
+      ".CheckPermissionsRequest\032\".hbase.pb.Chec" +
+      "kPermissionsResponseBI\n*org.apache.hadoo" +
+      "p.hbase.protobuf.generatedB\023AccessContro" +
+      "lProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_Permission_descriptor =
+          internal_static_hbase_pb_Permission_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_Permission_fieldAccessorTable = new
+          internal_static_hbase_pb_Permission_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Permission_descriptor,
+              internal_static_hbase_pb_Permission_descriptor,
               new java.lang.String[] { "Type", "GlobalPermission", "NamespacePermission", "TablePermission", });
-          internal_static_TablePermission_descriptor =
+          internal_static_hbase_pb_TablePermission_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_TablePermission_fieldAccessorTable = new
+          internal_static_hbase_pb_TablePermission_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TablePermission_descriptor,
+              internal_static_hbase_pb_TablePermission_descriptor,
               new java.lang.String[] { "TableName", "Family", "Qualifier", "Action", });
-          internal_static_NamespacePermission_descriptor =
+          internal_static_hbase_pb_NamespacePermission_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_NamespacePermission_fieldAccessorTable = new
+          internal_static_hbase_pb_NamespacePermission_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_NamespacePermission_descriptor,
+              internal_static_hbase_pb_NamespacePermission_descriptor,
               new java.lang.String[] { "NamespaceName", "Action", });
-          internal_static_GlobalPermission_descriptor =
+          internal_static_hbase_pb_GlobalPermission_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_GlobalPermission_fieldAccessorTable = new
+          internal_static_hbase_pb_GlobalPermission_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GlobalPermission_descriptor,
+              internal_static_hbase_pb_GlobalPermission_descriptor,
               new java.lang.String[] { "Action", });
-          internal_static_UserPermission_descriptor =
+          internal_static_hbase_pb_UserPermission_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_UserPermission_fieldAccessorTable = new
+          internal_static_hbase_pb_UserPermission_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UserPermission_descriptor,
+              internal_static_hbase_pb_UserPermission_descriptor,
               new java.lang.String[] { "User", "Permission", });
-          internal_static_UsersAndPermissions_descriptor =
+          internal_static_hbase_pb_UsersAndPermissions_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_UsersAndPermissions_fieldAccessorTable = new
+          internal_static_hbase_pb_UsersAndPermissions_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UsersAndPermissions_descriptor,
+              internal_static_hbase_pb_UsersAndPermissions_descriptor,
               new java.lang.String[] { "UserPermissions", });
-          internal_static_UsersAndPermissions_UserPermissions_descriptor =
-            internal_static_UsersAndPermissions_descriptor.getNestedTypes().get(0);
-          internal_static_UsersAndPermissions_UserPermissions_fieldAccessorTable = new
+          internal_static_hbase_pb_UsersAndPermissions_UserPermissions_descriptor =
+            internal_static_hbase_pb_UsersAndPermissions_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_UsersAndPermissions_UserPermissions_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UsersAndPermissions_UserPermissions_descriptor,
+              internal_static_hbase_pb_UsersAndPermissions_UserPermissions_descriptor,
               new java.lang.String[] { "User", "Permissions", });
-          internal_static_GrantRequest_descriptor =
+          internal_static_hbase_pb_GrantRequest_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_GrantRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GrantRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GrantRequest_descriptor,
+              internal_static_hbase_pb_GrantRequest_descriptor,
               new java.lang.String[] { "UserPermission", });
-          internal_static_GrantResponse_descriptor =
+          internal_static_hbase_pb_GrantResponse_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_GrantResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GrantResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GrantResponse_descriptor,
+              internal_static_hbase_pb_GrantResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_RevokeRequest_descriptor =
+          internal_static_hbase_pb_RevokeRequest_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_RevokeRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_RevokeRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RevokeRequest_descriptor,
+              internal_static_hbase_pb_RevokeRequest_descriptor,
               new java.lang.String[] { "UserPermission", });
-          internal_static_RevokeResponse_descriptor =
+          internal_static_hbase_pb_RevokeResponse_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_RevokeResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_RevokeResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RevokeResponse_descriptor,
+              internal_static_hbase_pb_RevokeResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_GetUserPermissionsRequest_descriptor =
+          internal_static_hbase_pb_GetUserPermissionsRequest_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_GetUserPermissionsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetUserPermissionsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetUserPermissionsRequest_descriptor,
+              internal_static_hbase_pb_GetUserPermissionsRequest_descriptor,
               new java.lang.String[] { "Type", "TableName", "NamespaceName", });
-          internal_static_GetUserPermissionsResponse_descriptor =
+          internal_static_hbase_pb_GetUserPermissionsResponse_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_GetUserPermissionsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetUserPermissionsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetUserPermissionsResponse_descriptor,
+              internal_static_hbase_pb_GetUserPermissionsResponse_descriptor,
               new java.lang.String[] { "UserPermission", });
-          internal_static_CheckPermissionsRequest_descriptor =
+          internal_static_hbase_pb_CheckPermissionsRequest_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_CheckPermissionsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CheckPermissionsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CheckPermissionsRequest_descriptor,
+              internal_static_hbase_pb_CheckPermissionsRequest_descriptor,
               new java.lang.String[] { "Permission", });
-          internal_static_CheckPermissionsResponse_descriptor =
+          internal_static_hbase_pb_CheckPermissionsResponse_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_CheckPermissionsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CheckPermissionsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CheckPermissionsResponse_descriptor,
+              internal_static_hbase_pb_CheckPermissionsResponse_descriptor,
               new java.lang.String[] { });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
index 256f8652382..b4c378b0c3d 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java
@@ -11,17 +11,17 @@ public final class AdminProtos {
   public interface GetRegionInfoRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -36,7 +36,7 @@ public final class AdminProtos {
     boolean getCompactionState();
   }
   /**
-   * Protobuf type {@code GetRegionInfoRequest}
+   * Protobuf type {@code hbase.pb.GetRegionInfoRequest}
    */
   public static final class GetRegionInfoRequest extends
       com.google.protobuf.GeneratedMessage
@@ -118,12 +118,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoRequest.Builder.class);
     }
@@ -144,23 +144,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -355,19 +355,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetRegionInfoRequest}
+     * Protobuf type {@code hbase.pb.GetRegionInfoRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoRequest.Builder.class);
       }
@@ -410,7 +410,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoRequest getDefaultInstanceForType() {
@@ -498,18 +498,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -519,7 +519,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -535,7 +535,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -549,7 +549,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -568,7 +568,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -581,7 +581,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -589,7 +589,7 @@ public final class AdminProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -599,7 +599,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -648,7 +648,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetRegionInfoRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetRegionInfoRequest)
     }
 
     static {
@@ -656,33 +656,33 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetRegionInfoRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetRegionInfoRequest)
   }
 
   public interface GetRegionInfoResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionInfo region_info = 1;
+    // required .hbase.pb.RegionInfo region_info = 1;
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     boolean hasRegionInfo();
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo();
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder();
 
-    // optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+    // optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
     /**
-     * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+     * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
      */
     boolean hasCompactionState();
     /**
-     * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+     * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState getCompactionState();
 
@@ -697,7 +697,7 @@ public final class AdminProtos {
     boolean getIsRecovering();
   }
   /**
-   * Protobuf type {@code GetRegionInfoResponse}
+   * Protobuf type {@code hbase.pb.GetRegionInfoResponse}
    */
   public static final class GetRegionInfoResponse extends
       com.google.protobuf.GeneratedMessage
@@ -790,12 +790,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.Builder.class);
     }
@@ -816,7 +816,7 @@ public final class AdminProtos {
     }
 
     /**
-     * Protobuf enum {@code GetRegionInfoResponse.CompactionState}
+     * Protobuf enum {@code hbase.pb.GetRegionInfoResponse.CompactionState}
      */
     public enum CompactionState
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -912,43 +912,43 @@ public final class AdminProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:GetRegionInfoResponse.CompactionState)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.GetRegionInfoResponse.CompactionState)
     }
 
     private int bitField0_;
-    // required .RegionInfo region_info = 1;
+    // required .hbase.pb.RegionInfo region_info = 1;
     public static final int REGION_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo regionInfo_;
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     public boolean hasRegionInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo() {
       return regionInfo_;
     }
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder() {
       return regionInfo_;
     }
 
-    // optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+    // optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
     public static final int COMPACTION_STATE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState compactionState_;
     /**
-     * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+     * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
      */
     public boolean hasCompactionState() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+     * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState getCompactionState() {
       return compactionState_;
@@ -1160,19 +1160,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetRegionInfoResponse}
+     * Protobuf type {@code hbase.pb.GetRegionInfoResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.Builder.class);
       }
@@ -1217,7 +1217,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetRegionInfoResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetRegionInfoResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse getDefaultInstanceForType() {
@@ -1312,18 +1312,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionInfo region_info = 1;
+      // required .hbase.pb.RegionInfo region_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo regionInfo_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public boolean hasRegionInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -1333,7 +1333,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder setRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -1349,7 +1349,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder setRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -1363,7 +1363,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder mergeRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -1382,7 +1382,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -1395,7 +1395,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -1403,7 +1403,7 @@ public final class AdminProtos {
         return getRegionInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder() {
         if (regionInfoBuilder_ != null) {
@@ -1413,7 +1413,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> 
@@ -1429,22 +1429,22 @@ public final class AdminProtos {
         return regionInfoBuilder_;
       }
 
-      // optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+      // optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
       private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState compactionState_ = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState.NONE;
       /**
-       * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+       * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
        */
       public boolean hasCompactionState() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+       * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState getCompactionState() {
         return compactionState_;
       }
       /**
-       * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+       * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
        */
       public Builder setCompactionState(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState value) {
         if (value == null) {
@@ -1456,7 +1456,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * optional .GetRegionInfoResponse.CompactionState compaction_state = 2;
+       * optional .hbase.pb.GetRegionInfoResponse.CompactionState compaction_state = 2;
        */
       public Builder clearCompactionState() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1498,7 +1498,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetRegionInfoResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetRegionInfoResponse)
     }
 
     static {
@@ -1506,23 +1506,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetRegionInfoResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetRegionInfoResponse)
   }
 
   public interface GetStoreFileRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -1541,7 +1541,7 @@ public final class AdminProtos {
     com.google.protobuf.ByteString getFamily(int index);
   }
   /**
-   * Protobuf type {@code GetStoreFileRequest}
+   * Protobuf type {@code hbase.pb.GetStoreFileRequest}
    *
    * 
    **
@@ -1635,12 +1635,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequest.Builder.class);
     }
@@ -1661,23 +1661,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -1881,7 +1881,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetStoreFileRequest}
+     * Protobuf type {@code hbase.pb.GetStoreFileRequest}
      *
      * 
      **
@@ -1894,12 +1894,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequest.Builder.class);
       }
@@ -1942,7 +1942,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileRequest getDefaultInstanceForType() {
@@ -2038,18 +2038,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -2059,7 +2059,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -2075,7 +2075,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -2089,7 +2089,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -2108,7 +2108,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -2121,7 +2121,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -2129,7 +2129,7 @@ public final class AdminProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -2139,7 +2139,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -2227,7 +2227,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetStoreFileRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetStoreFileRequest)
     }
 
     static {
@@ -2235,7 +2235,7 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetStoreFileRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetStoreFileRequest)
   }
 
   public interface GetStoreFileResponseOrBuilder
@@ -2262,7 +2262,7 @@ public final class AdminProtos {
         getStoreFileBytes(int index);
   }
   /**
-   * Protobuf type {@code GetStoreFileResponse}
+   * Protobuf type {@code hbase.pb.GetStoreFileResponse}
    */
   public static final class GetStoreFileResponse extends
       com.google.protobuf.GeneratedMessage
@@ -2337,12 +2337,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponse.Builder.class);
     }
@@ -2542,19 +2542,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetStoreFileResponse}
+     * Protobuf type {@code hbase.pb.GetStoreFileResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponse.Builder.class);
       }
@@ -2590,7 +2590,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetStoreFileResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetStoreFileResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetStoreFileResponse getDefaultInstanceForType() {
@@ -2759,7 +2759,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetStoreFileResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetStoreFileResponse)
     }
 
     static {
@@ -2767,14 +2767,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetStoreFileResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetStoreFileResponse)
   }
 
   public interface GetOnlineRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code GetOnlineRegionRequest}
+   * Protobuf type {@code hbase.pb.GetOnlineRegionRequest}
    */
   public static final class GetOnlineRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -2837,12 +2837,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest.Builder.class);
     }
@@ -2993,19 +2993,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetOnlineRegionRequest}
+     * Protobuf type {@code hbase.pb.GetOnlineRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest.Builder.class);
       }
@@ -3039,7 +3039,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest getDefaultInstanceForType() {
@@ -3097,7 +3097,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetOnlineRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetOnlineRegionRequest)
     }
 
     static {
@@ -3105,39 +3105,39 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetOnlineRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetOnlineRegionRequest)
   }
 
   public interface GetOnlineRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .RegionInfo region_info = 1;
+    // repeated .hbase.pb.RegionInfo region_info = 1;
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     java.util.List 
         getRegionInfoList();
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index);
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     int getRegionInfoCount();
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     java.util.List 
         getRegionInfoOrBuilderList();
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code GetOnlineRegionResponse}
+   * Protobuf type {@code hbase.pb.GetOnlineRegionResponse}
    */
   public static final class GetOnlineRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -3212,12 +3212,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponse.Builder.class);
     }
@@ -3237,36 +3237,36 @@ public final class AdminProtos {
       return PARSER;
     }
 
-    // repeated .RegionInfo region_info = 1;
+    // repeated .hbase.pb.RegionInfo region_info = 1;
     public static final int REGION_INFO_FIELD_NUMBER = 1;
     private java.util.List regionInfo_;
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     public java.util.List getRegionInfoList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     public java.util.List 
         getRegionInfoOrBuilderList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     public int getRegionInfoCount() {
       return regionInfo_.size();
     }
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
       return regionInfo_.get(index);
     }
     /**
-     * repeated .RegionInfo region_info = 1;
+     * repeated .hbase.pb.RegionInfo region_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index) {
@@ -3424,19 +3424,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetOnlineRegionResponse}
+     * Protobuf type {@code hbase.pb.GetOnlineRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponse.Builder.class);
       }
@@ -3477,7 +3477,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetOnlineRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetOnlineRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionResponse getDefaultInstanceForType() {
@@ -3578,7 +3578,7 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // repeated .RegionInfo region_info = 1;
+      // repeated .hbase.pb.RegionInfo region_info = 1;
       private java.util.List regionInfo_ =
         java.util.Collections.emptyList();
       private void ensureRegionInfoIsMutable() {
@@ -3592,7 +3592,7 @@ public final class AdminProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
 
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public java.util.List getRegionInfoList() {
         if (regionInfoBuilder_ == null) {
@@ -3602,7 +3602,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public int getRegionInfoCount() {
         if (regionInfoBuilder_ == null) {
@@ -3612,7 +3612,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -3622,7 +3622,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -3639,7 +3639,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -3653,7 +3653,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder addRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -3669,7 +3669,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -3686,7 +3686,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder addRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -3700,7 +3700,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -3714,7 +3714,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder addAllRegionInfo(
           java.lang.Iterable values) {
@@ -3728,7 +3728,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -3741,7 +3741,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder removeRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -3754,14 +3754,14 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder(
           int index) {
         return getRegionInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
           int index) {
@@ -3771,7 +3771,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public java.util.List 
            getRegionInfoOrBuilderList() {
@@ -3782,14 +3782,14 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder() {
         return getRegionInfoFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder(
           int index) {
@@ -3797,7 +3797,7 @@ public final class AdminProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 1;
+       * repeated .hbase.pb.RegionInfo region_info = 1;
        */
       public java.util.List 
            getRegionInfoBuilderList() {
@@ -3818,7 +3818,7 @@ public final class AdminProtos {
         return regionInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetOnlineRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetOnlineRegionResponse)
     }
 
     static {
@@ -3826,33 +3826,33 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetOnlineRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetOnlineRegionResponse)
   }
 
   public interface OpenRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+    // repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     java.util.List 
         getOpenInfoList();
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo getOpenInfo(int index);
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     int getOpenInfoCount();
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     java.util.List 
         getOpenInfoOrBuilderList();
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfoOrBuilder getOpenInfoOrBuilder(
         int index);
@@ -3894,7 +3894,7 @@ public final class AdminProtos {
     long getMasterSystemTime();
   }
   /**
-   * Protobuf type {@code OpenRegionRequest}
+   * Protobuf type {@code hbase.pb.OpenRegionRequest}
    */
   public static final class OpenRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -3979,12 +3979,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.Builder.class);
     }
@@ -4007,17 +4007,17 @@ public final class AdminProtos {
     public interface RegionOpenInfoOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
 
-      // required .RegionInfo region = 1;
+      // required .hbase.pb.RegionInfo region = 1;
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       boolean hasRegion();
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion();
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder();
 
@@ -4031,27 +4031,27 @@ public final class AdminProtos {
        */
       int getVersionOfOfflineNode();
 
-      // repeated .ServerName favored_nodes = 3;
+      // repeated .hbase.pb.ServerName favored_nodes = 3;
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       java.util.List 
           getFavoredNodesList();
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNodes(int index);
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       int getFavoredNodesCount();
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       java.util.List 
           getFavoredNodesOrBuilderList();
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodesOrBuilder(
           int index);
@@ -4075,7 +4075,7 @@ public final class AdminProtos {
       boolean getOpenForDistributedLogReplay();
     }
     /**
-     * Protobuf type {@code OpenRegionRequest.RegionOpenInfo}
+     * Protobuf type {@code hbase.pb.OpenRegionRequest.RegionOpenInfo}
      */
     public static final class RegionOpenInfo extends
         com.google.protobuf.GeneratedMessage
@@ -4173,12 +4173,12 @@ public final class AdminProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_RegionOpenInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder.class);
       }
@@ -4199,23 +4199,23 @@ public final class AdminProtos {
       }
 
       private int bitField0_;
-      // required .RegionInfo region = 1;
+      // required .hbase.pb.RegionInfo region = 1;
       public static final int REGION_FIELD_NUMBER = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo region_;
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion() {
         return region_;
       }
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder() {
         return region_;
@@ -4237,36 +4237,36 @@ public final class AdminProtos {
         return versionOfOfflineNode_;
       }
 
-      // repeated .ServerName favored_nodes = 3;
+      // repeated .hbase.pb.ServerName favored_nodes = 3;
       public static final int FAVORED_NODES_FIELD_NUMBER = 3;
       private java.util.List favoredNodes_;
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       public java.util.List getFavoredNodesList() {
         return favoredNodes_;
       }
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       public java.util.List 
           getFavoredNodesOrBuilderList() {
         return favoredNodes_;
       }
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       public int getFavoredNodesCount() {
         return favoredNodes_.size();
       }
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNodes(int index) {
         return favoredNodes_.get(index);
       }
       /**
-       * repeated .ServerName favored_nodes = 3;
+       * repeated .hbase.pb.ServerName favored_nodes = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodesOrBuilder(
           int index) {
@@ -4507,19 +4507,19 @@ public final class AdminProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code OpenRegionRequest.RegionOpenInfo}
+       * Protobuf type {@code hbase.pb.OpenRegionRequest.RegionOpenInfo}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfoOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_RegionOpenInfo_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder.class);
         }
@@ -4571,7 +4571,7 @@ public final class AdminProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_RegionOpenInfo_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo getDefaultInstanceForType() {
@@ -4707,18 +4707,18 @@ public final class AdminProtos {
         }
         private int bitField0_;
 
-        // required .RegionInfo region = 1;
+        // required .hbase.pb.RegionInfo region = 1;
         private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionBuilder_;
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public boolean hasRegion() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion() {
           if (regionBuilder_ == null) {
@@ -4728,7 +4728,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
           if (regionBuilder_ == null) {
@@ -4744,7 +4744,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder setRegion(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -4758,7 +4758,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
           if (regionBuilder_ == null) {
@@ -4777,7 +4777,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder clearRegion() {
           if (regionBuilder_ == null) {
@@ -4790,7 +4790,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionBuilder() {
           bitField0_ |= 0x00000001;
@@ -4798,7 +4798,7 @@ public final class AdminProtos {
           return getRegionFieldBuilder().getBuilder();
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder() {
           if (regionBuilder_ != null) {
@@ -4808,7 +4808,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> 
@@ -4857,7 +4857,7 @@ public final class AdminProtos {
           return this;
         }
 
-        // repeated .ServerName favored_nodes = 3;
+        // repeated .hbase.pb.ServerName favored_nodes = 3;
         private java.util.List favoredNodes_ =
           java.util.Collections.emptyList();
         private void ensureFavoredNodesIsMutable() {
@@ -4871,7 +4871,7 @@ public final class AdminProtos {
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> favoredNodesBuilder_;
 
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public java.util.List getFavoredNodesList() {
           if (favoredNodesBuilder_ == null) {
@@ -4881,7 +4881,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public int getFavoredNodesCount() {
           if (favoredNodesBuilder_ == null) {
@@ -4891,7 +4891,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNodes(int index) {
           if (favoredNodesBuilder_ == null) {
@@ -4901,7 +4901,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder setFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -4918,7 +4918,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder setFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -4932,7 +4932,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder addFavoredNodes(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
           if (favoredNodesBuilder_ == null) {
@@ -4948,7 +4948,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder addFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -4965,7 +4965,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder addFavoredNodes(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -4979,7 +4979,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder addFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -4993,7 +4993,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder addAllFavoredNodes(
             java.lang.Iterable values) {
@@ -5007,7 +5007,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder clearFavoredNodes() {
           if (favoredNodesBuilder_ == null) {
@@ -5020,7 +5020,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public Builder removeFavoredNodes(int index) {
           if (favoredNodesBuilder_ == null) {
@@ -5033,14 +5033,14 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getFavoredNodesBuilder(
             int index) {
           return getFavoredNodesFieldBuilder().getBuilder(index);
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodesOrBuilder(
             int index) {
@@ -5050,7 +5050,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public java.util.List 
              getFavoredNodesOrBuilderList() {
@@ -5061,14 +5061,14 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addFavoredNodesBuilder() {
           return getFavoredNodesFieldBuilder().addBuilder(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addFavoredNodesBuilder(
             int index) {
@@ -5076,7 +5076,7 @@ public final class AdminProtos {
               index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
         }
         /**
-         * repeated .ServerName favored_nodes = 3;
+         * repeated .hbase.pb.ServerName favored_nodes = 3;
          */
         public java.util.List 
              getFavoredNodesBuilderList() {
@@ -5146,7 +5146,7 @@ public final class AdminProtos {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:OpenRegionRequest.RegionOpenInfo)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.OpenRegionRequest.RegionOpenInfo)
       }
 
       static {
@@ -5154,40 +5154,40 @@ public final class AdminProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:OpenRegionRequest.RegionOpenInfo)
+      // @@protoc_insertion_point(class_scope:hbase.pb.OpenRegionRequest.RegionOpenInfo)
     }
 
     private int bitField0_;
-    // repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+    // repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
     public static final int OPEN_INFO_FIELD_NUMBER = 1;
     private java.util.List openInfo_;
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     public java.util.List getOpenInfoList() {
       return openInfo_;
     }
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     public java.util.List 
         getOpenInfoOrBuilderList() {
       return openInfo_;
     }
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     public int getOpenInfoCount() {
       return openInfo_.size();
     }
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo getOpenInfo(int index) {
       return openInfo_.get(index);
     }
     /**
-     * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+     * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfoOrBuilder getOpenInfoOrBuilder(
         int index) {
@@ -5427,19 +5427,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code OpenRegionRequest}
+     * Protobuf type {@code hbase.pb.OpenRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.Builder.class);
       }
@@ -5484,7 +5484,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest getDefaultInstanceForType() {
@@ -5601,7 +5601,7 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+      // repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
       private java.util.List openInfo_ =
         java.util.Collections.emptyList();
       private void ensureOpenInfoIsMutable() {
@@ -5615,7 +5615,7 @@ public final class AdminProtos {
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfoOrBuilder> openInfoBuilder_;
 
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public java.util.List getOpenInfoList() {
         if (openInfoBuilder_ == null) {
@@ -5625,7 +5625,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public int getOpenInfoCount() {
         if (openInfoBuilder_ == null) {
@@ -5635,7 +5635,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo getOpenInfo(int index) {
         if (openInfoBuilder_ == null) {
@@ -5645,7 +5645,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder setOpenInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo value) {
@@ -5662,7 +5662,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder setOpenInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder builderForValue) {
@@ -5676,7 +5676,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder addOpenInfo(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo value) {
         if (openInfoBuilder_ == null) {
@@ -5692,7 +5692,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder addOpenInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo value) {
@@ -5709,7 +5709,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder addOpenInfo(
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder builderForValue) {
@@ -5723,7 +5723,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder addOpenInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder builderForValue) {
@@ -5737,7 +5737,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder addAllOpenInfo(
           java.lang.Iterable values) {
@@ -5751,7 +5751,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder clearOpenInfo() {
         if (openInfoBuilder_ == null) {
@@ -5764,7 +5764,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public Builder removeOpenInfo(int index) {
         if (openInfoBuilder_ == null) {
@@ -5777,14 +5777,14 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder getOpenInfoBuilder(
           int index) {
         return getOpenInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfoOrBuilder getOpenInfoOrBuilder(
           int index) {
@@ -5794,7 +5794,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public java.util.List 
            getOpenInfoOrBuilderList() {
@@ -5805,14 +5805,14 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder addOpenInfoBuilder() {
         return getOpenInfoFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.getDefaultInstance());
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.Builder addOpenInfoBuilder(
           int index) {
@@ -5820,7 +5820,7 @@ public final class AdminProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo.getDefaultInstance());
       }
       /**
-       * repeated .OpenRegionRequest.RegionOpenInfo open_info = 1;
+       * repeated .hbase.pb.OpenRegionRequest.RegionOpenInfo open_info = 1;
        */
       public java.util.List 
            getOpenInfoBuilderList() {
@@ -5939,7 +5939,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:OpenRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.OpenRegionRequest)
     }
 
     static {
@@ -5947,28 +5947,28 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:OpenRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.OpenRegionRequest)
   }
 
   public interface OpenRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+    // repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
     /**
-     * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+     * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
      */
     java.util.List getOpeningStateList();
     /**
-     * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+     * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
      */
     int getOpeningStateCount();
     /**
-     * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+     * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.RegionOpeningState getOpeningState(int index);
   }
   /**
-   * Protobuf type {@code OpenRegionResponse}
+   * Protobuf type {@code hbase.pb.OpenRegionResponse}
    */
   public static final class OpenRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -6068,12 +6068,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.Builder.class);
     }
@@ -6094,7 +6094,7 @@ public final class AdminProtos {
     }
 
     /**
-     * Protobuf enum {@code OpenRegionResponse.RegionOpeningState}
+     * Protobuf enum {@code hbase.pb.OpenRegionResponse.RegionOpeningState}
      */
     public enum RegionOpeningState
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -6181,26 +6181,26 @@ public final class AdminProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:OpenRegionResponse.RegionOpeningState)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.OpenRegionResponse.RegionOpeningState)
     }
 
-    // repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+    // repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
     public static final int OPENING_STATE_FIELD_NUMBER = 1;
     private java.util.List openingState_;
     /**
-     * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+     * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
      */
     public java.util.List getOpeningStateList() {
       return openingState_;
     }
     /**
-     * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+     * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
      */
     public int getOpeningStateCount() {
       return openingState_.size();
     }
     /**
-     * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+     * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.RegionOpeningState getOpeningState(int index) {
       return openingState_.get(index);
@@ -6356,19 +6356,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code OpenRegionResponse}
+     * Protobuf type {@code hbase.pb.OpenRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.Builder.class);
       }
@@ -6404,7 +6404,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_OpenRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_OpenRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse getDefaultInstanceForType() {
@@ -6479,7 +6479,7 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+      // repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
       private java.util.List openingState_ =
         java.util.Collections.emptyList();
       private void ensureOpeningStateIsMutable() {
@@ -6489,25 +6489,25 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public java.util.List getOpeningStateList() {
         return java.util.Collections.unmodifiableList(openingState_);
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public int getOpeningStateCount() {
         return openingState_.size();
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.RegionOpeningState getOpeningState(int index) {
         return openingState_.get(index);
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public Builder setOpeningState(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.RegionOpeningState value) {
@@ -6520,7 +6520,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public Builder addOpeningState(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.RegionOpeningState value) {
         if (value == null) {
@@ -6532,7 +6532,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public Builder addAllOpeningState(
           java.lang.Iterable values) {
@@ -6542,7 +6542,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .OpenRegionResponse.RegionOpeningState opening_state = 1;
+       * repeated .hbase.pb.OpenRegionResponse.RegionOpeningState opening_state = 1;
        */
       public Builder clearOpeningState() {
         openingState_ = java.util.Collections.emptyList();
@@ -6551,7 +6551,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:OpenRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.OpenRegionResponse)
     }
 
     static {
@@ -6559,28 +6559,28 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:OpenRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.OpenRegionResponse)
   }
 
   public interface WarmupRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionInfo regionInfo = 1;
+    // required .hbase.pb.RegionInfo regionInfo = 1;
     /**
-     * required .RegionInfo regionInfo = 1;
+     * required .hbase.pb.RegionInfo regionInfo = 1;
      */
     boolean hasRegionInfo();
     /**
-     * required .RegionInfo regionInfo = 1;
+     * required .hbase.pb.RegionInfo regionInfo = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo();
     /**
-     * required .RegionInfo regionInfo = 1;
+     * required .hbase.pb.RegionInfo regionInfo = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder();
   }
   /**
-   * Protobuf type {@code WarmupRegionRequest}
+   * Protobuf type {@code hbase.pb.WarmupRegionRequest}
    */
   public static final class WarmupRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -6657,12 +6657,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionRequest.Builder.class);
     }
@@ -6683,23 +6683,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionInfo regionInfo = 1;
+    // required .hbase.pb.RegionInfo regionInfo = 1;
     public static final int REGIONINFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo regionInfo_;
     /**
-     * required .RegionInfo regionInfo = 1;
+     * required .hbase.pb.RegionInfo regionInfo = 1;
      */
     public boolean hasRegionInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionInfo regionInfo = 1;
+     * required .hbase.pb.RegionInfo regionInfo = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo() {
       return regionInfo_;
     }
     /**
-     * required .RegionInfo regionInfo = 1;
+     * required .hbase.pb.RegionInfo regionInfo = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder() {
       return regionInfo_;
@@ -6861,19 +6861,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WarmupRegionRequest}
+     * Protobuf type {@code hbase.pb.WarmupRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionRequest.Builder.class);
       }
@@ -6914,7 +6914,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionRequest getDefaultInstanceForType() {
@@ -6995,18 +6995,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionInfo regionInfo = 1;
+      // required .hbase.pb.RegionInfo regionInfo = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo regionInfo_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public boolean hasRegionInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -7016,7 +7016,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public Builder setRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -7032,7 +7032,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public Builder setRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -7046,7 +7046,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public Builder mergeRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -7065,7 +7065,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -7078,7 +7078,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -7086,7 +7086,7 @@ public final class AdminProtos {
         return getRegionInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder() {
         if (regionInfoBuilder_ != null) {
@@ -7096,7 +7096,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionInfo regionInfo = 1;
+       * required .hbase.pb.RegionInfo regionInfo = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> 
@@ -7112,7 +7112,7 @@ public final class AdminProtos {
         return regionInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:WarmupRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WarmupRegionRequest)
     }
 
     static {
@@ -7120,14 +7120,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WarmupRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WarmupRegionRequest)
   }
 
   public interface WarmupRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code WarmupRegionResponse}
+   * Protobuf type {@code hbase.pb.WarmupRegionResponse}
    */
   public static final class WarmupRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -7190,12 +7190,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionResponse.Builder.class);
     }
@@ -7346,19 +7346,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WarmupRegionResponse}
+     * Protobuf type {@code hbase.pb.WarmupRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionResponse.Builder.class);
       }
@@ -7392,7 +7392,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WarmupRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WarmupRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WarmupRegionResponse getDefaultInstanceForType() {
@@ -7450,7 +7450,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WarmupRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WarmupRegionResponse)
     }
 
     static {
@@ -7458,23 +7458,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WarmupRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WarmupRegionResponse)
   }
 
   public interface CloseRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -7498,17 +7498,17 @@ public final class AdminProtos {
      */
     boolean getTransitionInZK();
 
-    // optional .ServerName destination_server = 4;
+    // optional .hbase.pb.ServerName destination_server = 4;
     /**
-     * optional .ServerName destination_server = 4;
+     * optional .hbase.pb.ServerName destination_server = 4;
      */
     boolean hasDestinationServer();
     /**
-     * optional .ServerName destination_server = 4;
+     * optional .hbase.pb.ServerName destination_server = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDestinationServer();
     /**
-     * optional .ServerName destination_server = 4;
+     * optional .hbase.pb.ServerName destination_server = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDestinationServerOrBuilder();
 
@@ -7531,7 +7531,7 @@ public final class AdminProtos {
     long getServerStartCode();
   }
   /**
-   * Protobuf type {@code CloseRegionRequest}
+   * Protobuf type {@code hbase.pb.CloseRegionRequest}
    *
    * 
    **
@@ -7642,12 +7642,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest.Builder.class);
     }
@@ -7668,23 +7668,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -7722,23 +7722,23 @@ public final class AdminProtos {
       return transitionInZK_;
     }
 
-    // optional .ServerName destination_server = 4;
+    // optional .hbase.pb.ServerName destination_server = 4;
     public static final int DESTINATION_SERVER_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName destinationServer_;
     /**
-     * optional .ServerName destination_server = 4;
+     * optional .hbase.pb.ServerName destination_server = 4;
      */
     public boolean hasDestinationServer() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .ServerName destination_server = 4;
+     * optional .hbase.pb.ServerName destination_server = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDestinationServer() {
       return destinationServer_;
     }
     /**
-     * optional .ServerName destination_server = 4;
+     * optional .hbase.pb.ServerName destination_server = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDestinationServerOrBuilder() {
       return destinationServer_;
@@ -7998,7 +7998,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CloseRegionRequest}
+     * Protobuf type {@code hbase.pb.CloseRegionRequest}
      *
      * 
      **
@@ -8011,12 +8011,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest.Builder.class);
       }
@@ -8070,7 +8070,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest getDefaultInstanceForType() {
@@ -8189,18 +8189,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -8210,7 +8210,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -8226,7 +8226,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -8240,7 +8240,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -8259,7 +8259,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -8272,7 +8272,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -8280,7 +8280,7 @@ public final class AdminProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -8290,7 +8290,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -8372,18 +8372,18 @@ public final class AdminProtos {
         return this;
       }
 
-      // optional .ServerName destination_server = 4;
+      // optional .hbase.pb.ServerName destination_server = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName destinationServer_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> destinationServerBuilder_;
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public boolean hasDestinationServer() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDestinationServer() {
         if (destinationServerBuilder_ == null) {
@@ -8393,7 +8393,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public Builder setDestinationServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (destinationServerBuilder_ == null) {
@@ -8409,7 +8409,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public Builder setDestinationServer(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -8423,7 +8423,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public Builder mergeDestinationServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (destinationServerBuilder_ == null) {
@@ -8442,7 +8442,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public Builder clearDestinationServer() {
         if (destinationServerBuilder_ == null) {
@@ -8455,7 +8455,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getDestinationServerBuilder() {
         bitField0_ |= 0x00000008;
@@ -8463,7 +8463,7 @@ public final class AdminProtos {
         return getDestinationServerFieldBuilder().getBuilder();
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDestinationServerOrBuilder() {
         if (destinationServerBuilder_ != null) {
@@ -8473,7 +8473,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * optional .ServerName destination_server = 4;
+       * optional .hbase.pb.ServerName destination_server = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -8538,7 +8538,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CloseRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CloseRegionRequest)
     }
 
     static {
@@ -8546,7 +8546,7 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CloseRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CloseRegionRequest)
   }
 
   public interface CloseRegionResponseOrBuilder
@@ -8563,7 +8563,7 @@ public final class AdminProtos {
     boolean getClosed();
   }
   /**
-   * Protobuf type {@code CloseRegionResponse}
+   * Protobuf type {@code hbase.pb.CloseRegionResponse}
    */
   public static final class CloseRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -8632,12 +8632,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse.Builder.class);
     }
@@ -8826,19 +8826,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CloseRegionResponse}
+     * Protobuf type {@code hbase.pb.CloseRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse.Builder.class);
       }
@@ -8874,7 +8874,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CloseRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CloseRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse getDefaultInstanceForType() {
@@ -8980,7 +8980,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CloseRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CloseRegionResponse)
     }
 
     static {
@@ -8988,23 +8988,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CloseRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CloseRegionResponse)
   }
 
   public interface FlushRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -9037,7 +9037,7 @@ public final class AdminProtos {
     boolean getWriteFlushWalMarker();
   }
   /**
-   * Protobuf type {@code FlushRegionRequest}
+   * Protobuf type {@code hbase.pb.FlushRegionRequest}
    *
    * 
    **
@@ -9131,12 +9131,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequest.Builder.class);
     }
@@ -9157,23 +9157,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -9409,7 +9409,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FlushRegionRequest}
+     * Protobuf type {@code hbase.pb.FlushRegionRequest}
      *
      * 
      **
@@ -9423,12 +9423,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequest.Builder.class);
       }
@@ -9473,7 +9473,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionRequest getDefaultInstanceForType() {
@@ -9568,18 +9568,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -9589,7 +9589,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -9605,7 +9605,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -9619,7 +9619,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -9638,7 +9638,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -9651,7 +9651,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -9659,7 +9659,7 @@ public final class AdminProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -9669,7 +9669,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -9767,7 +9767,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FlushRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FlushRegionRequest)
     }
 
     static {
@@ -9775,7 +9775,7 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FlushRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FlushRegionRequest)
   }
 
   public interface FlushRegionResponseOrBuilder
@@ -9812,7 +9812,7 @@ public final class AdminProtos {
     boolean getWroteFlushWalMarker();
   }
   /**
-   * Protobuf type {@code FlushRegionResponse}
+   * Protobuf type {@code hbase.pb.FlushRegionResponse}
    */
   public static final class FlushRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -9891,12 +9891,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionResponse.Builder.class);
     }
@@ -10151,19 +10151,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FlushRegionResponse}
+     * Protobuf type {@code hbase.pb.FlushRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionResponse.Builder.class);
       }
@@ -10203,7 +10203,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_FlushRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_FlushRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.FlushRegionResponse getDefaultInstanceForType() {
@@ -10389,7 +10389,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FlushRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FlushRegionResponse)
     }
 
     static {
@@ -10397,23 +10397,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FlushRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FlushRegionResponse)
   }
 
   public interface SplitRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -10428,7 +10428,7 @@ public final class AdminProtos {
     com.google.protobuf.ByteString getSplitPoint();
   }
   /**
-   * Protobuf type {@code SplitRegionRequest}
+   * Protobuf type {@code hbase.pb.SplitRegionRequest}
    *
    * 
    **
@@ -10519,12 +10519,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest.Builder.class);
     }
@@ -10545,23 +10545,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -10756,7 +10756,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SplitRegionRequest}
+     * Protobuf type {@code hbase.pb.SplitRegionRequest}
      *
      * 
      **
@@ -10772,12 +10772,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest.Builder.class);
       }
@@ -10820,7 +10820,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionRequest getDefaultInstanceForType() {
@@ -10908,18 +10908,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -10929,7 +10929,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -10945,7 +10945,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -10959,7 +10959,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -10978,7 +10978,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -10991,7 +10991,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -10999,7 +10999,7 @@ public final class AdminProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -11009,7 +11009,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -11061,7 +11061,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SplitRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SplitRegionRequest)
     }
 
     static {
@@ -11069,14 +11069,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SplitRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SplitRegionRequest)
   }
 
   public interface SplitRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code SplitRegionResponse}
+   * Protobuf type {@code hbase.pb.SplitRegionResponse}
    */
   public static final class SplitRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -11139,12 +11139,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionResponse.Builder.class);
     }
@@ -11295,19 +11295,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SplitRegionResponse}
+     * Protobuf type {@code hbase.pb.SplitRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionResponse.Builder.class);
       }
@@ -11341,7 +11341,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_SplitRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_SplitRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.SplitRegionResponse getDefaultInstanceForType() {
@@ -11399,7 +11399,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SplitRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SplitRegionResponse)
     }
 
     static {
@@ -11407,23 +11407,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SplitRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SplitRegionResponse)
   }
 
   public interface CompactRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -11448,7 +11448,7 @@ public final class AdminProtos {
     com.google.protobuf.ByteString getFamily();
   }
   /**
-   * Protobuf type {@code CompactRegionRequest}
+   * Protobuf type {@code hbase.pb.CompactRegionRequest}
    *
    * 
    **
@@ -11542,12 +11542,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest.Builder.class);
     }
@@ -11568,23 +11568,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -11812,7 +11812,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CompactRegionRequest}
+     * Protobuf type {@code hbase.pb.CompactRegionRequest}
      *
      * 
      **
@@ -11826,12 +11826,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest.Builder.class);
       }
@@ -11876,7 +11876,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest getDefaultInstanceForType() {
@@ -11971,18 +11971,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -11992,7 +11992,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -12008,7 +12008,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -12022,7 +12022,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -12041,7 +12041,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -12054,7 +12054,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -12062,7 +12062,7 @@ public final class AdminProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -12072,7 +12072,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -12157,7 +12157,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CompactRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CompactRegionRequest)
     }
 
     static {
@@ -12165,14 +12165,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CompactRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CompactRegionRequest)
   }
 
   public interface CompactRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code CompactRegionResponse}
+   * Protobuf type {@code hbase.pb.CompactRegionResponse}
    */
   public static final class CompactRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -12235,12 +12235,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionResponse.Builder.class);
     }
@@ -12391,19 +12391,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CompactRegionResponse}
+     * Protobuf type {@code hbase.pb.CompactRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionResponse.Builder.class);
       }
@@ -12437,7 +12437,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_CompactRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_CompactRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionResponse getDefaultInstanceForType() {
@@ -12495,7 +12495,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CompactRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CompactRegionResponse)
     }
 
     static {
@@ -12503,39 +12503,39 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CompactRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CompactRegionResponse)
   }
 
   public interface UpdateFavoredNodesRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+    // repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     java.util.List 
         getUpdateInfoList();
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo getUpdateInfo(int index);
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     int getUpdateInfoCount();
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     java.util.List 
         getUpdateInfoOrBuilderList();
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfoOrBuilder getUpdateInfoOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code UpdateFavoredNodesRequest}
+   * Protobuf type {@code hbase.pb.UpdateFavoredNodesRequest}
    */
   public static final class UpdateFavoredNodesRequest extends
       com.google.protobuf.GeneratedMessage
@@ -12610,12 +12610,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.Builder.class);
     }
@@ -12638,47 +12638,47 @@ public final class AdminProtos {
     public interface RegionUpdateInfoOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
 
-      // required .RegionInfo region = 1;
+      // required .hbase.pb.RegionInfo region = 1;
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       boolean hasRegion();
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion();
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder();
 
-      // repeated .ServerName favored_nodes = 2;
+      // repeated .hbase.pb.ServerName favored_nodes = 2;
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       java.util.List 
           getFavoredNodesList();
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNodes(int index);
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       int getFavoredNodesCount();
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       java.util.List 
           getFavoredNodesOrBuilderList();
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodesOrBuilder(
           int index);
     }
     /**
-     * Protobuf type {@code UpdateFavoredNodesRequest.RegionUpdateInfo}
+     * Protobuf type {@code hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo}
      */
     public static final class RegionUpdateInfo extends
         com.google.protobuf.GeneratedMessage
@@ -12766,12 +12766,12 @@ public final class AdminProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder.class);
       }
@@ -12792,58 +12792,58 @@ public final class AdminProtos {
       }
 
       private int bitField0_;
-      // required .RegionInfo region = 1;
+      // required .hbase.pb.RegionInfo region = 1;
       public static final int REGION_FIELD_NUMBER = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo region_;
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion() {
         return region_;
       }
       /**
-       * required .RegionInfo region = 1;
+       * required .hbase.pb.RegionInfo region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder() {
         return region_;
       }
 
-      // repeated .ServerName favored_nodes = 2;
+      // repeated .hbase.pb.ServerName favored_nodes = 2;
       public static final int FAVORED_NODES_FIELD_NUMBER = 2;
       private java.util.List favoredNodes_;
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       public java.util.List getFavoredNodesList() {
         return favoredNodes_;
       }
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       public java.util.List 
           getFavoredNodesOrBuilderList() {
         return favoredNodes_;
       }
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       public int getFavoredNodesCount() {
         return favoredNodes_.size();
       }
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNodes(int index) {
         return favoredNodes_.get(index);
       }
       /**
-       * repeated .ServerName favored_nodes = 2;
+       * repeated .hbase.pb.ServerName favored_nodes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodesOrBuilder(
           int index) {
@@ -13026,19 +13026,19 @@ public final class AdminProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code UpdateFavoredNodesRequest.RegionUpdateInfo}
+       * Protobuf type {@code hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfoOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder.class);
         }
@@ -13086,7 +13086,7 @@ public final class AdminProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo getDefaultInstanceForType() {
@@ -13208,18 +13208,18 @@ public final class AdminProtos {
         }
         private int bitField0_;
 
-        // required .RegionInfo region = 1;
+        // required .hbase.pb.RegionInfo region = 1;
         private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionBuilder_;
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public boolean hasRegion() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion() {
           if (regionBuilder_ == null) {
@@ -13229,7 +13229,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
           if (regionBuilder_ == null) {
@@ -13245,7 +13245,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder setRegion(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -13259,7 +13259,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
           if (regionBuilder_ == null) {
@@ -13278,7 +13278,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public Builder clearRegion() {
           if (regionBuilder_ == null) {
@@ -13291,7 +13291,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionBuilder() {
           bitField0_ |= 0x00000001;
@@ -13299,7 +13299,7 @@ public final class AdminProtos {
           return getRegionFieldBuilder().getBuilder();
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder() {
           if (regionBuilder_ != null) {
@@ -13309,7 +13309,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * required .RegionInfo region = 1;
+         * required .hbase.pb.RegionInfo region = 1;
          */
         private com.google.protobuf.SingleFieldBuilder<
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> 
@@ -13325,7 +13325,7 @@ public final class AdminProtos {
           return regionBuilder_;
         }
 
-        // repeated .ServerName favored_nodes = 2;
+        // repeated .hbase.pb.ServerName favored_nodes = 2;
         private java.util.List favoredNodes_ =
           java.util.Collections.emptyList();
         private void ensureFavoredNodesIsMutable() {
@@ -13339,7 +13339,7 @@ public final class AdminProtos {
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> favoredNodesBuilder_;
 
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public java.util.List getFavoredNodesList() {
           if (favoredNodesBuilder_ == null) {
@@ -13349,7 +13349,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public int getFavoredNodesCount() {
           if (favoredNodesBuilder_ == null) {
@@ -13359,7 +13359,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNodes(int index) {
           if (favoredNodesBuilder_ == null) {
@@ -13369,7 +13369,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder setFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -13386,7 +13386,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder setFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -13400,7 +13400,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder addFavoredNodes(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
           if (favoredNodesBuilder_ == null) {
@@ -13416,7 +13416,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder addFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -13433,7 +13433,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder addFavoredNodes(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -13447,7 +13447,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder addFavoredNodes(
             int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -13461,7 +13461,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder addAllFavoredNodes(
             java.lang.Iterable values) {
@@ -13475,7 +13475,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder clearFavoredNodes() {
           if (favoredNodesBuilder_ == null) {
@@ -13488,7 +13488,7 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public Builder removeFavoredNodes(int index) {
           if (favoredNodesBuilder_ == null) {
@@ -13501,14 +13501,14 @@ public final class AdminProtos {
           return this;
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getFavoredNodesBuilder(
             int index) {
           return getFavoredNodesFieldBuilder().getBuilder(index);
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodesOrBuilder(
             int index) {
@@ -13518,7 +13518,7 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public java.util.List 
              getFavoredNodesOrBuilderList() {
@@ -13529,14 +13529,14 @@ public final class AdminProtos {
           }
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addFavoredNodesBuilder() {
           return getFavoredNodesFieldBuilder().addBuilder(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addFavoredNodesBuilder(
             int index) {
@@ -13544,7 +13544,7 @@ public final class AdminProtos {
               index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
         }
         /**
-         * repeated .ServerName favored_nodes = 2;
+         * repeated .hbase.pb.ServerName favored_nodes = 2;
          */
         public java.util.List 
              getFavoredNodesBuilderList() {
@@ -13565,7 +13565,7 @@ public final class AdminProtos {
           return favoredNodesBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:UpdateFavoredNodesRequest.RegionUpdateInfo)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo)
       }
 
       static {
@@ -13573,39 +13573,39 @@ public final class AdminProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:UpdateFavoredNodesRequest.RegionUpdateInfo)
+      // @@protoc_insertion_point(class_scope:hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo)
     }
 
-    // repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+    // repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
     public static final int UPDATE_INFO_FIELD_NUMBER = 1;
     private java.util.List updateInfo_;
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     public java.util.List getUpdateInfoList() {
       return updateInfo_;
     }
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     public java.util.List 
         getUpdateInfoOrBuilderList() {
       return updateInfo_;
     }
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     public int getUpdateInfoCount() {
       return updateInfo_.size();
     }
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo getUpdateInfo(int index) {
       return updateInfo_.get(index);
     }
     /**
-     * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+     * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfoOrBuilder getUpdateInfoOrBuilder(
         int index) {
@@ -13763,19 +13763,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UpdateFavoredNodesRequest}
+     * Protobuf type {@code hbase.pb.UpdateFavoredNodesRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.Builder.class);
       }
@@ -13816,7 +13816,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest getDefaultInstanceForType() {
@@ -13917,7 +13917,7 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+      // repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
       private java.util.List updateInfo_ =
         java.util.Collections.emptyList();
       private void ensureUpdateInfoIsMutable() {
@@ -13931,7 +13931,7 @@ public final class AdminProtos {
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfoOrBuilder> updateInfoBuilder_;
 
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public java.util.List getUpdateInfoList() {
         if (updateInfoBuilder_ == null) {
@@ -13941,7 +13941,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public int getUpdateInfoCount() {
         if (updateInfoBuilder_ == null) {
@@ -13951,7 +13951,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo getUpdateInfo(int index) {
         if (updateInfoBuilder_ == null) {
@@ -13961,7 +13961,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder setUpdateInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo value) {
@@ -13978,7 +13978,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder setUpdateInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder builderForValue) {
@@ -13992,7 +13992,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder addUpdateInfo(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo value) {
         if (updateInfoBuilder_ == null) {
@@ -14008,7 +14008,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder addUpdateInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo value) {
@@ -14025,7 +14025,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder addUpdateInfo(
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder builderForValue) {
@@ -14039,7 +14039,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder addUpdateInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder builderForValue) {
@@ -14053,7 +14053,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder addAllUpdateInfo(
           java.lang.Iterable values) {
@@ -14067,7 +14067,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder clearUpdateInfo() {
         if (updateInfoBuilder_ == null) {
@@ -14080,7 +14080,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public Builder removeUpdateInfo(int index) {
         if (updateInfoBuilder_ == null) {
@@ -14093,14 +14093,14 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder getUpdateInfoBuilder(
           int index) {
         return getUpdateInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfoOrBuilder getUpdateInfoOrBuilder(
           int index) {
@@ -14110,7 +14110,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public java.util.List 
            getUpdateInfoOrBuilderList() {
@@ -14121,14 +14121,14 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder addUpdateInfoBuilder() {
         return getUpdateInfoFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.getDefaultInstance());
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.Builder addUpdateInfoBuilder(
           int index) {
@@ -14136,7 +14136,7 @@ public final class AdminProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest.RegionUpdateInfo.getDefaultInstance());
       }
       /**
-       * repeated .UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
+       * repeated .hbase.pb.UpdateFavoredNodesRequest.RegionUpdateInfo update_info = 1;
        */
       public java.util.List 
            getUpdateInfoBuilderList() {
@@ -14157,7 +14157,7 @@ public final class AdminProtos {
         return updateInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:UpdateFavoredNodesRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UpdateFavoredNodesRequest)
     }
 
     static {
@@ -14165,7 +14165,7 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UpdateFavoredNodesRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UpdateFavoredNodesRequest)
   }
 
   public interface UpdateFavoredNodesResponseOrBuilder
@@ -14182,7 +14182,7 @@ public final class AdminProtos {
     int getResponse();
   }
   /**
-   * Protobuf type {@code UpdateFavoredNodesResponse}
+   * Protobuf type {@code hbase.pb.UpdateFavoredNodesResponse}
    */
   public static final class UpdateFavoredNodesResponse extends
       com.google.protobuf.GeneratedMessage
@@ -14251,12 +14251,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse.Builder.class);
     }
@@ -14441,19 +14441,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UpdateFavoredNodesResponse}
+     * Protobuf type {@code hbase.pb.UpdateFavoredNodesResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse.Builder.class);
       }
@@ -14489,7 +14489,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateFavoredNodesResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateFavoredNodesResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse getDefaultInstanceForType() {
@@ -14591,7 +14591,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UpdateFavoredNodesResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UpdateFavoredNodesResponse)
     }
 
     static {
@@ -14599,37 +14599,37 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UpdateFavoredNodesResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UpdateFavoredNodesResponse)
   }
 
   public interface MergeRegionsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region_a = 1;
+    // required .hbase.pb.RegionSpecifier region_a = 1;
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     boolean hasRegionA();
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionA();
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionAOrBuilder();
 
-    // required .RegionSpecifier region_b = 2;
+    // required .hbase.pb.RegionSpecifier region_b = 2;
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     boolean hasRegionB();
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionB();
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionBOrBuilder();
 
@@ -14662,7 +14662,7 @@ public final class AdminProtos {
     long getMasterSystemTime();
   }
   /**
-   * Protobuf type {@code MergeRegionsRequest}
+   * Protobuf type {@code hbase.pb.MergeRegionsRequest}
    *
    * 
    **
@@ -14769,12 +14769,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequest.Builder.class);
     }
@@ -14795,45 +14795,45 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region_a = 1;
+    // required .hbase.pb.RegionSpecifier region_a = 1;
     public static final int REGION_A_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionA_;
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     public boolean hasRegionA() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionA() {
       return regionA_;
     }
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionAOrBuilder() {
       return regionA_;
     }
 
-    // required .RegionSpecifier region_b = 2;
+    // required .hbase.pb.RegionSpecifier region_b = 2;
     public static final int REGION_B_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionB_;
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     public boolean hasRegionB() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionB() {
       return regionB_;
     }
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionBOrBuilder() {
       return regionB_;
@@ -15094,7 +15094,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MergeRegionsRequest}
+     * Protobuf type {@code hbase.pb.MergeRegionsRequest}
      *
      * 
      **
@@ -15108,12 +15108,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequest.Builder.class);
       }
@@ -15165,7 +15165,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequest getDefaultInstanceForType() {
@@ -15279,18 +15279,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region_a = 1;
+      // required .hbase.pb.RegionSpecifier region_a = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionA_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionABuilder_;
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public boolean hasRegionA() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionA() {
         if (regionABuilder_ == null) {
@@ -15300,7 +15300,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder setRegionA(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionABuilder_ == null) {
@@ -15316,7 +15316,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder setRegionA(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -15330,7 +15330,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder mergeRegionA(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionABuilder_ == null) {
@@ -15349,7 +15349,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder clearRegionA() {
         if (regionABuilder_ == null) {
@@ -15362,7 +15362,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionABuilder() {
         bitField0_ |= 0x00000001;
@@ -15370,7 +15370,7 @@ public final class AdminProtos {
         return getRegionAFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionAOrBuilder() {
         if (regionABuilder_ != null) {
@@ -15380,7 +15380,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -15396,18 +15396,18 @@ public final class AdminProtos {
         return regionABuilder_;
       }
 
-      // required .RegionSpecifier region_b = 2;
+      // required .hbase.pb.RegionSpecifier region_b = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionB_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBBuilder_;
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public boolean hasRegionB() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionB() {
         if (regionBBuilder_ == null) {
@@ -15417,7 +15417,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder setRegionB(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBBuilder_ == null) {
@@ -15433,7 +15433,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder setRegionB(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -15447,7 +15447,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder mergeRegionB(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBBuilder_ == null) {
@@ -15466,7 +15466,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder clearRegionB() {
         if (regionBBuilder_ == null) {
@@ -15479,7 +15479,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBBuilder() {
         bitField0_ |= 0x00000002;
@@ -15487,7 +15487,7 @@ public final class AdminProtos {
         return getRegionBFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionBOrBuilder() {
         if (regionBBuilder_ != null) {
@@ -15497,7 +15497,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -15595,7 +15595,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MergeRegionsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MergeRegionsRequest)
     }
 
     static {
@@ -15603,14 +15603,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MergeRegionsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MergeRegionsRequest)
   }
 
   public interface MergeRegionsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code MergeRegionsResponse}
+   * Protobuf type {@code hbase.pb.MergeRegionsResponse}
    */
   public static final class MergeRegionsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -15673,12 +15673,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponse.Builder.class);
     }
@@ -15829,19 +15829,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MergeRegionsResponse}
+     * Protobuf type {@code hbase.pb.MergeRegionsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponse.Builder.class);
       }
@@ -15875,7 +15875,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_MergeRegionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_MergeRegionsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponse getDefaultInstanceForType() {
@@ -15933,7 +15933,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MergeRegionsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MergeRegionsResponse)
     }
 
     static {
@@ -15941,23 +15941,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MergeRegionsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MergeRegionsResponse)
   }
 
   public interface WALEntryOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .WALKey key = 1;
+    // required .hbase.pb.WALKey key = 1;
     /**
-     * required .WALKey key = 1;
+     * required .hbase.pb.WALKey key = 1;
      */
     boolean hasKey();
     /**
-     * required .WALKey key = 1;
+     * required .hbase.pb.WALKey key = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey getKey();
     /**
-     * required .WALKey key = 1;
+     * required .hbase.pb.WALKey key = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKeyOrBuilder getKeyOrBuilder();
 
@@ -16012,7 +16012,7 @@ public final class AdminProtos {
     int getAssociatedCellCount();
   }
   /**
-   * Protobuf type {@code WALEntry}
+   * Protobuf type {@code hbase.pb.WALEntry}
    *
    * 
    * Protocol buffer version of WAL for replication
@@ -16109,12 +16109,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WALEntry_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WALEntry_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WALEntry_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WALEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder.class);
     }
@@ -16135,23 +16135,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .WALKey key = 1;
+    // required .hbase.pb.WALKey key = 1;
     public static final int KEY_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey key_;
     /**
-     * required .WALKey key = 1;
+     * required .hbase.pb.WALKey key = 1;
      */
     public boolean hasKey() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .WALKey key = 1;
+     * required .hbase.pb.WALKey key = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey getKey() {
       return key_;
     }
     /**
-     * required .WALKey key = 1;
+     * required .hbase.pb.WALKey key = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKeyOrBuilder getKeyOrBuilder() {
       return key_;
@@ -16414,7 +16414,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WALEntry}
+     * Protobuf type {@code hbase.pb.WALEntry}
      *
      * 
      * Protocol buffer version of WAL for replication
@@ -16425,12 +16425,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntryOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WALEntry_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WALEntry_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WALEntry_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WALEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder.class);
       }
@@ -16475,7 +16475,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_WALEntry_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_WALEntry_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry getDefaultInstanceForType() {
@@ -16578,18 +16578,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .WALKey key = 1;
+      // required .hbase.pb.WALKey key = 1;
       private org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey key_ = org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.Builder, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKeyOrBuilder> keyBuilder_;
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public boolean hasKey() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey getKey() {
         if (keyBuilder_ == null) {
@@ -16599,7 +16599,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public Builder setKey(org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey value) {
         if (keyBuilder_ == null) {
@@ -16615,7 +16615,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public Builder setKey(
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.Builder builderForValue) {
@@ -16629,7 +16629,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public Builder mergeKey(org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey value) {
         if (keyBuilder_ == null) {
@@ -16648,7 +16648,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public Builder clearKey() {
         if (keyBuilder_ == null) {
@@ -16661,7 +16661,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.Builder getKeyBuilder() {
         bitField0_ |= 0x00000001;
@@ -16669,7 +16669,7 @@ public final class AdminProtos {
         return getKeyFieldBuilder().getBuilder();
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKeyOrBuilder getKeyOrBuilder() {
         if (keyBuilder_ != null) {
@@ -16679,7 +16679,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .WALKey key = 1;
+       * required .hbase.pb.WALKey key = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.Builder, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKeyOrBuilder> 
@@ -16858,7 +16858,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WALEntry)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WALEntry)
     }
 
     static {
@@ -16866,39 +16866,39 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WALEntry)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WALEntry)
   }
 
   public interface ReplicateWALEntryRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .WALEntry entry = 1;
+    // repeated .hbase.pb.WALEntry entry = 1;
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     java.util.List 
         getEntryList();
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry getEntry(int index);
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     int getEntryCount();
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     java.util.List 
         getEntryOrBuilderList();
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntryOrBuilder getEntryOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ReplicateWALEntryRequest}
+   * Protobuf type {@code hbase.pb.ReplicateWALEntryRequest}
    *
    * 
    **
@@ -16980,12 +16980,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequest.Builder.class);
     }
@@ -17005,36 +17005,36 @@ public final class AdminProtos {
       return PARSER;
     }
 
-    // repeated .WALEntry entry = 1;
+    // repeated .hbase.pb.WALEntry entry = 1;
     public static final int ENTRY_FIELD_NUMBER = 1;
     private java.util.List entry_;
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     public java.util.List getEntryList() {
       return entry_;
     }
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     public java.util.List 
         getEntryOrBuilderList() {
       return entry_;
     }
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     public int getEntryCount() {
       return entry_.size();
     }
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry getEntry(int index) {
       return entry_.get(index);
     }
     /**
-     * repeated .WALEntry entry = 1;
+     * repeated .hbase.pb.WALEntry entry = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntryOrBuilder getEntryOrBuilder(
         int index) {
@@ -17192,7 +17192,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicateWALEntryRequest}
+     * Protobuf type {@code hbase.pb.ReplicateWALEntryRequest}
      *
      * 
      **
@@ -17206,12 +17206,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequest.Builder.class);
       }
@@ -17252,7 +17252,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryRequest getDefaultInstanceForType() {
@@ -17353,7 +17353,7 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // repeated .WALEntry entry = 1;
+      // repeated .hbase.pb.WALEntry entry = 1;
       private java.util.List entry_ =
         java.util.Collections.emptyList();
       private void ensureEntryIsMutable() {
@@ -17367,7 +17367,7 @@ public final class AdminProtos {
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntryOrBuilder> entryBuilder_;
 
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public java.util.List getEntryList() {
         if (entryBuilder_ == null) {
@@ -17377,7 +17377,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public int getEntryCount() {
         if (entryBuilder_ == null) {
@@ -17387,7 +17387,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry getEntry(int index) {
         if (entryBuilder_ == null) {
@@ -17397,7 +17397,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder setEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry value) {
@@ -17414,7 +17414,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder setEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder builderForValue) {
@@ -17428,7 +17428,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder addEntry(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry value) {
         if (entryBuilder_ == null) {
@@ -17444,7 +17444,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder addEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry value) {
@@ -17461,7 +17461,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder addEntry(
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder builderForValue) {
@@ -17475,7 +17475,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder addEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder builderForValue) {
@@ -17489,7 +17489,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder addAllEntry(
           java.lang.Iterable values) {
@@ -17503,7 +17503,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder clearEntry() {
         if (entryBuilder_ == null) {
@@ -17516,7 +17516,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public Builder removeEntry(int index) {
         if (entryBuilder_ == null) {
@@ -17529,14 +17529,14 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder getEntryBuilder(
           int index) {
         return getEntryFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntryOrBuilder getEntryOrBuilder(
           int index) {
@@ -17546,7 +17546,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public java.util.List 
            getEntryOrBuilderList() {
@@ -17557,14 +17557,14 @@ public final class AdminProtos {
         }
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder addEntryBuilder() {
         return getEntryFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.getDefaultInstance());
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.Builder addEntryBuilder(
           int index) {
@@ -17572,7 +17572,7 @@ public final class AdminProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry.getDefaultInstance());
       }
       /**
-       * repeated .WALEntry entry = 1;
+       * repeated .hbase.pb.WALEntry entry = 1;
        */
       public java.util.List 
            getEntryBuilderList() {
@@ -17593,7 +17593,7 @@ public final class AdminProtos {
         return entryBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicateWALEntryRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicateWALEntryRequest)
     }
 
     static {
@@ -17601,14 +17601,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicateWALEntryRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicateWALEntryRequest)
   }
 
   public interface ReplicateWALEntryResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ReplicateWALEntryResponse}
+   * Protobuf type {@code hbase.pb.ReplicateWALEntryResponse}
    */
   public static final class ReplicateWALEntryResponse extends
       com.google.protobuf.GeneratedMessage
@@ -17671,12 +17671,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryResponse.Builder.class);
     }
@@ -17827,19 +17827,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicateWALEntryResponse}
+     * Protobuf type {@code hbase.pb.ReplicateWALEntryResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryResponse.Builder.class);
       }
@@ -17873,7 +17873,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ReplicateWALEntryResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ReplicateWALEntryResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ReplicateWALEntryResponse getDefaultInstanceForType() {
@@ -17931,7 +17931,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicateWALEntryResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicateWALEntryResponse)
     }
 
     static {
@@ -17939,14 +17939,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicateWALEntryResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicateWALEntryResponse)
   }
 
   public interface RollWALWriterRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code RollWALWriterRequest}
+   * Protobuf type {@code hbase.pb.RollWALWriterRequest}
    */
   public static final class RollWALWriterRequest extends
       com.google.protobuf.GeneratedMessage
@@ -18009,12 +18009,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequest.Builder.class);
     }
@@ -18165,19 +18165,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RollWALWriterRequest}
+     * Protobuf type {@code hbase.pb.RollWALWriterRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequest.Builder.class);
       }
@@ -18211,7 +18211,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterRequest getDefaultInstanceForType() {
@@ -18269,7 +18269,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RollWALWriterRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RollWALWriterRequest)
     }
 
     static {
@@ -18277,7 +18277,7 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RollWALWriterRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RollWALWriterRequest)
   }
 
   public interface RollWALWriterResponseOrBuilder
@@ -18310,7 +18310,7 @@ public final class AdminProtos {
     com.google.protobuf.ByteString getRegionToFlush(int index);
   }
   /**
-   * Protobuf type {@code RollWALWriterResponse}
+   * Protobuf type {@code hbase.pb.RollWALWriterResponse}
    *
    * 
    *
@@ -18391,12 +18391,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse.Builder.class);
     }
@@ -18601,7 +18601,7 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RollWALWriterResponse}
+     * Protobuf type {@code hbase.pb.RollWALWriterResponse}
      *
      * 
      *
@@ -18614,12 +18614,12 @@ public final class AdminProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse.Builder.class);
       }
@@ -18655,7 +18655,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_RollWALWriterResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_RollWALWriterResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.RollWALWriterResponse getDefaultInstanceForType() {
@@ -18830,7 +18830,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RollWALWriterResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RollWALWriterResponse)
     }
 
     static {
@@ -18838,7 +18838,7 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RollWALWriterResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RollWALWriterResponse)
   }
 
   public interface StopServerRequestOrBuilder
@@ -18860,7 +18860,7 @@ public final class AdminProtos {
         getReasonBytes();
   }
   /**
-   * Protobuf type {@code StopServerRequest}
+   * Protobuf type {@code hbase.pb.StopServerRequest}
    */
   public static final class StopServerRequest extends
       com.google.protobuf.GeneratedMessage
@@ -18929,12 +18929,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequest.Builder.class);
     }
@@ -19150,19 +19150,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StopServerRequest}
+     * Protobuf type {@code hbase.pb.StopServerRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequest.Builder.class);
       }
@@ -19198,7 +19198,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerRequest getDefaultInstanceForType() {
@@ -19347,7 +19347,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StopServerRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StopServerRequest)
     }
 
     static {
@@ -19355,14 +19355,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StopServerRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StopServerRequest)
   }
 
   public interface StopServerResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code StopServerResponse}
+   * Protobuf type {@code hbase.pb.StopServerResponse}
    */
   public static final class StopServerResponse extends
       com.google.protobuf.GeneratedMessage
@@ -19425,12 +19425,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponse.Builder.class);
     }
@@ -19581,19 +19581,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StopServerResponse}
+     * Protobuf type {@code hbase.pb.StopServerResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponse.Builder.class);
       }
@@ -19627,7 +19627,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_StopServerResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_StopServerResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponse getDefaultInstanceForType() {
@@ -19685,7 +19685,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StopServerResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StopServerResponse)
     }
 
     static {
@@ -19693,14 +19693,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StopServerResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StopServerResponse)
   }
 
   public interface GetServerInfoRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code GetServerInfoRequest}
+   * Protobuf type {@code hbase.pb.GetServerInfoRequest}
    */
   public static final class GetServerInfoRequest extends
       com.google.protobuf.GeneratedMessage
@@ -19763,12 +19763,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest.Builder.class);
     }
@@ -19919,19 +19919,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetServerInfoRequest}
+     * Protobuf type {@code hbase.pb.GetServerInfoRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest.Builder.class);
       }
@@ -19965,7 +19965,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest getDefaultInstanceForType() {
@@ -20023,7 +20023,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetServerInfoRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetServerInfoRequest)
     }
 
     static {
@@ -20031,23 +20031,23 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetServerInfoRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetServerInfoRequest)
   }
 
   public interface ServerInfoOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server_name = 1;
+    // required .hbase.pb.ServerName server_name = 1;
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     boolean hasServerName();
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName();
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder();
 
@@ -20062,7 +20062,7 @@ public final class AdminProtos {
     int getWebuiPort();
   }
   /**
-   * Protobuf type {@code ServerInfo}
+   * Protobuf type {@code hbase.pb.ServerInfo}
    */
   public static final class ServerInfo extends
       com.google.protobuf.GeneratedMessage
@@ -20144,12 +20144,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ServerInfo_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ServerInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder.class);
     }
@@ -20170,23 +20170,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server_name = 1;
+    // required .hbase.pb.ServerName server_name = 1;
     public static final int SERVER_NAME_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName serverName_;
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     public boolean hasServerName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName() {
       return serverName_;
     }
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder() {
       return serverName_;
@@ -20381,19 +20381,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ServerInfo}
+     * Protobuf type {@code hbase.pb.ServerInfo}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ServerInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ServerInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder.class);
       }
@@ -20436,7 +20436,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_ServerInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_ServerInfo_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getDefaultInstanceForType() {
@@ -20524,18 +20524,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server_name = 1;
+      // required .hbase.pb.ServerName server_name = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName serverName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverNameBuilder_;
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public boolean hasServerName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName() {
         if (serverNameBuilder_ == null) {
@@ -20545,7 +20545,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder setServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverNameBuilder_ == null) {
@@ -20561,7 +20561,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder setServerName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -20575,7 +20575,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder mergeServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverNameBuilder_ == null) {
@@ -20594,7 +20594,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder clearServerName() {
         if (serverNameBuilder_ == null) {
@@ -20607,7 +20607,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getServerNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -20615,7 +20615,7 @@ public final class AdminProtos {
         return getServerNameFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder() {
         if (serverNameBuilder_ != null) {
@@ -20625,7 +20625,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -20674,7 +20674,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ServerInfo)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ServerInfo)
     }
 
     static {
@@ -20682,28 +20682,28 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ServerInfo)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ServerInfo)
   }
 
   public interface GetServerInfoResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerInfo server_info = 1;
+    // required .hbase.pb.ServerInfo server_info = 1;
     /**
-     * required .ServerInfo server_info = 1;
+     * required .hbase.pb.ServerInfo server_info = 1;
      */
     boolean hasServerInfo();
     /**
-     * required .ServerInfo server_info = 1;
+     * required .hbase.pb.ServerInfo server_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getServerInfo();
     /**
-     * required .ServerInfo server_info = 1;
+     * required .hbase.pb.ServerInfo server_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder getServerInfoOrBuilder();
   }
   /**
-   * Protobuf type {@code GetServerInfoResponse}
+   * Protobuf type {@code hbase.pb.GetServerInfoResponse}
    */
   public static final class GetServerInfoResponse extends
       com.google.protobuf.GeneratedMessage
@@ -20780,12 +20780,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.Builder.class);
     }
@@ -20806,23 +20806,23 @@ public final class AdminProtos {
     }
 
     private int bitField0_;
-    // required .ServerInfo server_info = 1;
+    // required .hbase.pb.ServerInfo server_info = 1;
     public static final int SERVER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo serverInfo_;
     /**
-     * required .ServerInfo server_info = 1;
+     * required .hbase.pb.ServerInfo server_info = 1;
      */
     public boolean hasServerInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerInfo server_info = 1;
+     * required .hbase.pb.ServerInfo server_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getServerInfo() {
       return serverInfo_;
     }
     /**
-     * required .ServerInfo server_info = 1;
+     * required .hbase.pb.ServerInfo server_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder getServerInfoOrBuilder() {
       return serverInfo_;
@@ -20984,19 +20984,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetServerInfoResponse}
+     * Protobuf type {@code hbase.pb.GetServerInfoResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse.Builder.class);
       }
@@ -21037,7 +21037,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_GetServerInfoResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_GetServerInfoResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse getDefaultInstanceForType() {
@@ -21118,18 +21118,18 @@ public final class AdminProtos {
       }
       private int bitField0_;
 
-      // required .ServerInfo server_info = 1;
+      // required .hbase.pb.ServerInfo server_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo serverInfo_ = org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder> serverInfoBuilder_;
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public boolean hasServerInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo getServerInfo() {
         if (serverInfoBuilder_ == null) {
@@ -21139,7 +21139,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public Builder setServerInfo(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo value) {
         if (serverInfoBuilder_ == null) {
@@ -21155,7 +21155,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public Builder setServerInfo(
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder builderForValue) {
@@ -21169,7 +21169,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public Builder mergeServerInfo(org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo value) {
         if (serverInfoBuilder_ == null) {
@@ -21188,7 +21188,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public Builder clearServerInfo() {
         if (serverInfoBuilder_ == null) {
@@ -21201,7 +21201,7 @@ public final class AdminProtos {
         return this;
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder getServerInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -21209,7 +21209,7 @@ public final class AdminProtos {
         return getServerInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder getServerInfoOrBuilder() {
         if (serverInfoBuilder_ != null) {
@@ -21219,7 +21219,7 @@ public final class AdminProtos {
         }
       }
       /**
-       * required .ServerInfo server_info = 1;
+       * required .hbase.pb.ServerInfo server_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfoOrBuilder> 
@@ -21235,7 +21235,7 @@ public final class AdminProtos {
         return serverInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetServerInfoResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetServerInfoResponse)
     }
 
     static {
@@ -21243,14 +21243,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetServerInfoResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetServerInfoResponse)
   }
 
   public interface UpdateConfigurationRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code UpdateConfigurationRequest}
+   * Protobuf type {@code hbase.pb.UpdateConfigurationRequest}
    */
   public static final class UpdateConfigurationRequest extends
       com.google.protobuf.GeneratedMessage
@@ -21313,12 +21313,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationRequest.Builder.class);
     }
@@ -21469,19 +21469,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UpdateConfigurationRequest}
+     * Protobuf type {@code hbase.pb.UpdateConfigurationRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationRequest.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationRequest.Builder.class);
       }
@@ -21515,7 +21515,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationRequest getDefaultInstanceForType() {
@@ -21573,7 +21573,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UpdateConfigurationRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UpdateConfigurationRequest)
     }
 
     static {
@@ -21581,14 +21581,14 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UpdateConfigurationRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UpdateConfigurationRequest)
   }
 
   public interface UpdateConfigurationResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code UpdateConfigurationResponse}
+   * Protobuf type {@code hbase.pb.UpdateConfigurationResponse}
    */
   public static final class UpdateConfigurationResponse extends
       com.google.protobuf.GeneratedMessage
@@ -21651,12 +21651,12 @@ public final class AdminProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationResponse.Builder.class);
     }
@@ -21807,19 +21807,19 @@ public final class AdminProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UpdateConfigurationResponse}
+     * Protobuf type {@code hbase.pb.UpdateConfigurationResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationResponse.class, org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationResponse.Builder.class);
       }
@@ -21853,7 +21853,7 @@ public final class AdminProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_UpdateConfigurationResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AdminProtos.internal_static_hbase_pb_UpdateConfigurationResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateConfigurationResponse getDefaultInstanceForType() {
@@ -21911,7 +21911,7 @@ public final class AdminProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UpdateConfigurationResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UpdateConfigurationResponse)
     }
 
     static {
@@ -21919,11 +21919,11 @@ public final class AdminProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UpdateConfigurationResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UpdateConfigurationResponse)
   }
 
   /**
-   * Protobuf service {@code AdminService}
+   * Protobuf service {@code hbase.pb.AdminService}
    */
   public static abstract class AdminService
       implements com.google.protobuf.Service {
@@ -21931,7 +21931,7 @@ public final class AdminProtos {
 
     public interface Interface {
       /**
-       * rpc GetRegionInfo(.GetRegionInfoRequest) returns (.GetRegionInfoResponse);
+       * rpc GetRegionInfo(.hbase.pb.GetRegionInfoRequest) returns (.hbase.pb.GetRegionInfoResponse);
        */
       public abstract void getRegionInfo(
           com.google.protobuf.RpcController controller,
@@ -21939,7 +21939,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetStoreFile(.GetStoreFileRequest) returns (.GetStoreFileResponse);
+       * rpc GetStoreFile(.hbase.pb.GetStoreFileRequest) returns (.hbase.pb.GetStoreFileResponse);
        */
       public abstract void getStoreFile(
           com.google.protobuf.RpcController controller,
@@ -21947,7 +21947,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetOnlineRegion(.GetOnlineRegionRequest) returns (.GetOnlineRegionResponse);
+       * rpc GetOnlineRegion(.hbase.pb.GetOnlineRegionRequest) returns (.hbase.pb.GetOnlineRegionResponse);
        */
       public abstract void getOnlineRegion(
           com.google.protobuf.RpcController controller,
@@ -21955,7 +21955,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc OpenRegion(.OpenRegionRequest) returns (.OpenRegionResponse);
+       * rpc OpenRegion(.hbase.pb.OpenRegionRequest) returns (.hbase.pb.OpenRegionResponse);
        */
       public abstract void openRegion(
           com.google.protobuf.RpcController controller,
@@ -21963,7 +21963,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc WarmupRegion(.WarmupRegionRequest) returns (.WarmupRegionResponse);
+       * rpc WarmupRegion(.hbase.pb.WarmupRegionRequest) returns (.hbase.pb.WarmupRegionResponse);
        */
       public abstract void warmupRegion(
           com.google.protobuf.RpcController controller,
@@ -21971,7 +21971,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc CloseRegion(.CloseRegionRequest) returns (.CloseRegionResponse);
+       * rpc CloseRegion(.hbase.pb.CloseRegionRequest) returns (.hbase.pb.CloseRegionResponse);
        */
       public abstract void closeRegion(
           com.google.protobuf.RpcController controller,
@@ -21979,7 +21979,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc FlushRegion(.FlushRegionRequest) returns (.FlushRegionResponse);
+       * rpc FlushRegion(.hbase.pb.FlushRegionRequest) returns (.hbase.pb.FlushRegionResponse);
        */
       public abstract void flushRegion(
           com.google.protobuf.RpcController controller,
@@ -21987,7 +21987,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc SplitRegion(.SplitRegionRequest) returns (.SplitRegionResponse);
+       * rpc SplitRegion(.hbase.pb.SplitRegionRequest) returns (.hbase.pb.SplitRegionResponse);
        */
       public abstract void splitRegion(
           com.google.protobuf.RpcController controller,
@@ -21995,7 +21995,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc CompactRegion(.CompactRegionRequest) returns (.CompactRegionResponse);
+       * rpc CompactRegion(.hbase.pb.CompactRegionRequest) returns (.hbase.pb.CompactRegionResponse);
        */
       public abstract void compactRegion(
           com.google.protobuf.RpcController controller,
@@ -22003,7 +22003,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc MergeRegions(.MergeRegionsRequest) returns (.MergeRegionsResponse);
+       * rpc MergeRegions(.hbase.pb.MergeRegionsRequest) returns (.hbase.pb.MergeRegionsResponse);
        */
       public abstract void mergeRegions(
           com.google.protobuf.RpcController controller,
@@ -22011,7 +22011,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ReplicateWALEntry(.ReplicateWALEntryRequest) returns (.ReplicateWALEntryResponse);
+       * rpc ReplicateWALEntry(.hbase.pb.ReplicateWALEntryRequest) returns (.hbase.pb.ReplicateWALEntryResponse);
        */
       public abstract void replicateWALEntry(
           com.google.protobuf.RpcController controller,
@@ -22019,7 +22019,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Replay(.ReplicateWALEntryRequest) returns (.ReplicateWALEntryResponse);
+       * rpc Replay(.hbase.pb.ReplicateWALEntryRequest) returns (.hbase.pb.ReplicateWALEntryResponse);
        */
       public abstract void replay(
           com.google.protobuf.RpcController controller,
@@ -22027,7 +22027,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc RollWALWriter(.RollWALWriterRequest) returns (.RollWALWriterResponse);
+       * rpc RollWALWriter(.hbase.pb.RollWALWriterRequest) returns (.hbase.pb.RollWALWriterResponse);
        */
       public abstract void rollWALWriter(
           com.google.protobuf.RpcController controller,
@@ -22035,7 +22035,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetServerInfo(.GetServerInfoRequest) returns (.GetServerInfoResponse);
+       * rpc GetServerInfo(.hbase.pb.GetServerInfoRequest) returns (.hbase.pb.GetServerInfoResponse);
        */
       public abstract void getServerInfo(
           com.google.protobuf.RpcController controller,
@@ -22043,7 +22043,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc StopServer(.StopServerRequest) returns (.StopServerResponse);
+       * rpc StopServer(.hbase.pb.StopServerRequest) returns (.hbase.pb.StopServerResponse);
        */
       public abstract void stopServer(
           com.google.protobuf.RpcController controller,
@@ -22051,7 +22051,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc UpdateFavoredNodes(.UpdateFavoredNodesRequest) returns (.UpdateFavoredNodesResponse);
+       * rpc UpdateFavoredNodes(.hbase.pb.UpdateFavoredNodesRequest) returns (.hbase.pb.UpdateFavoredNodesResponse);
        */
       public abstract void updateFavoredNodes(
           com.google.protobuf.RpcController controller,
@@ -22059,7 +22059,7 @@ public final class AdminProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc UpdateConfiguration(.UpdateConfigurationRequest) returns (.UpdateConfigurationResponse);
+       * rpc UpdateConfiguration(.hbase.pb.UpdateConfigurationRequest) returns (.hbase.pb.UpdateConfigurationResponse);
        */
       public abstract void updateConfiguration(
           com.google.protobuf.RpcController controller,
@@ -22368,7 +22368,7 @@ public final class AdminProtos {
     }
 
     /**
-     * rpc GetRegionInfo(.GetRegionInfoRequest) returns (.GetRegionInfoResponse);
+     * rpc GetRegionInfo(.hbase.pb.GetRegionInfoRequest) returns (.hbase.pb.GetRegionInfoResponse);
      */
     public abstract void getRegionInfo(
         com.google.protobuf.RpcController controller,
@@ -22376,7 +22376,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetStoreFile(.GetStoreFileRequest) returns (.GetStoreFileResponse);
+     * rpc GetStoreFile(.hbase.pb.GetStoreFileRequest) returns (.hbase.pb.GetStoreFileResponse);
      */
     public abstract void getStoreFile(
         com.google.protobuf.RpcController controller,
@@ -22384,7 +22384,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetOnlineRegion(.GetOnlineRegionRequest) returns (.GetOnlineRegionResponse);
+     * rpc GetOnlineRegion(.hbase.pb.GetOnlineRegionRequest) returns (.hbase.pb.GetOnlineRegionResponse);
      */
     public abstract void getOnlineRegion(
         com.google.protobuf.RpcController controller,
@@ -22392,7 +22392,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc OpenRegion(.OpenRegionRequest) returns (.OpenRegionResponse);
+     * rpc OpenRegion(.hbase.pb.OpenRegionRequest) returns (.hbase.pb.OpenRegionResponse);
      */
     public abstract void openRegion(
         com.google.protobuf.RpcController controller,
@@ -22400,7 +22400,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc WarmupRegion(.WarmupRegionRequest) returns (.WarmupRegionResponse);
+     * rpc WarmupRegion(.hbase.pb.WarmupRegionRequest) returns (.hbase.pb.WarmupRegionResponse);
      */
     public abstract void warmupRegion(
         com.google.protobuf.RpcController controller,
@@ -22408,7 +22408,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc CloseRegion(.CloseRegionRequest) returns (.CloseRegionResponse);
+     * rpc CloseRegion(.hbase.pb.CloseRegionRequest) returns (.hbase.pb.CloseRegionResponse);
      */
     public abstract void closeRegion(
         com.google.protobuf.RpcController controller,
@@ -22416,7 +22416,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc FlushRegion(.FlushRegionRequest) returns (.FlushRegionResponse);
+     * rpc FlushRegion(.hbase.pb.FlushRegionRequest) returns (.hbase.pb.FlushRegionResponse);
      */
     public abstract void flushRegion(
         com.google.protobuf.RpcController controller,
@@ -22424,7 +22424,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc SplitRegion(.SplitRegionRequest) returns (.SplitRegionResponse);
+     * rpc SplitRegion(.hbase.pb.SplitRegionRequest) returns (.hbase.pb.SplitRegionResponse);
      */
     public abstract void splitRegion(
         com.google.protobuf.RpcController controller,
@@ -22432,7 +22432,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc CompactRegion(.CompactRegionRequest) returns (.CompactRegionResponse);
+     * rpc CompactRegion(.hbase.pb.CompactRegionRequest) returns (.hbase.pb.CompactRegionResponse);
      */
     public abstract void compactRegion(
         com.google.protobuf.RpcController controller,
@@ -22440,7 +22440,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc MergeRegions(.MergeRegionsRequest) returns (.MergeRegionsResponse);
+     * rpc MergeRegions(.hbase.pb.MergeRegionsRequest) returns (.hbase.pb.MergeRegionsResponse);
      */
     public abstract void mergeRegions(
         com.google.protobuf.RpcController controller,
@@ -22448,7 +22448,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ReplicateWALEntry(.ReplicateWALEntryRequest) returns (.ReplicateWALEntryResponse);
+     * rpc ReplicateWALEntry(.hbase.pb.ReplicateWALEntryRequest) returns (.hbase.pb.ReplicateWALEntryResponse);
      */
     public abstract void replicateWALEntry(
         com.google.protobuf.RpcController controller,
@@ -22456,7 +22456,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Replay(.ReplicateWALEntryRequest) returns (.ReplicateWALEntryResponse);
+     * rpc Replay(.hbase.pb.ReplicateWALEntryRequest) returns (.hbase.pb.ReplicateWALEntryResponse);
      */
     public abstract void replay(
         com.google.protobuf.RpcController controller,
@@ -22464,7 +22464,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc RollWALWriter(.RollWALWriterRequest) returns (.RollWALWriterResponse);
+     * rpc RollWALWriter(.hbase.pb.RollWALWriterRequest) returns (.hbase.pb.RollWALWriterResponse);
      */
     public abstract void rollWALWriter(
         com.google.protobuf.RpcController controller,
@@ -22472,7 +22472,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetServerInfo(.GetServerInfoRequest) returns (.GetServerInfoResponse);
+     * rpc GetServerInfo(.hbase.pb.GetServerInfoRequest) returns (.hbase.pb.GetServerInfoResponse);
      */
     public abstract void getServerInfo(
         com.google.protobuf.RpcController controller,
@@ -22480,7 +22480,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc StopServer(.StopServerRequest) returns (.StopServerResponse);
+     * rpc StopServer(.hbase.pb.StopServerRequest) returns (.hbase.pb.StopServerResponse);
      */
     public abstract void stopServer(
         com.google.protobuf.RpcController controller,
@@ -22488,7 +22488,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc UpdateFavoredNodes(.UpdateFavoredNodesRequest) returns (.UpdateFavoredNodesResponse);
+     * rpc UpdateFavoredNodes(.hbase.pb.UpdateFavoredNodesRequest) returns (.hbase.pb.UpdateFavoredNodesResponse);
      */
     public abstract void updateFavoredNodes(
         com.google.protobuf.RpcController controller,
@@ -22496,7 +22496,7 @@ public final class AdminProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc UpdateConfiguration(.UpdateConfigurationRequest) returns (.UpdateConfigurationResponse);
+     * rpc UpdateConfiguration(.hbase.pb.UpdateConfigurationRequest) returns (.hbase.pb.UpdateConfigurationResponse);
      */
     public abstract void updateConfiguration(
         com.google.protobuf.RpcController controller,
@@ -23287,189 +23287,189 @@ public final class AdminProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:AdminService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AdminService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetRegionInfoRequest_descriptor;
+    internal_static_hbase_pb_GetRegionInfoRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetRegionInfoRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetRegionInfoRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetRegionInfoResponse_descriptor;
+    internal_static_hbase_pb_GetRegionInfoResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetRegionInfoResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetRegionInfoResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetStoreFileRequest_descriptor;
+    internal_static_hbase_pb_GetStoreFileRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetStoreFileRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetStoreFileRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetStoreFileResponse_descriptor;
+    internal_static_hbase_pb_GetStoreFileResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetStoreFileResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetStoreFileResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetOnlineRegionRequest_descriptor;
+    internal_static_hbase_pb_GetOnlineRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetOnlineRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetOnlineRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetOnlineRegionResponse_descriptor;
+    internal_static_hbase_pb_GetOnlineRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetOnlineRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetOnlineRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_OpenRegionRequest_descriptor;
+    internal_static_hbase_pb_OpenRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_OpenRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_OpenRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_OpenRegionRequest_RegionOpenInfo_descriptor;
+    internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable;
+      internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_OpenRegionResponse_descriptor;
+    internal_static_hbase_pb_OpenRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_OpenRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_OpenRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WarmupRegionRequest_descriptor;
+    internal_static_hbase_pb_WarmupRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WarmupRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_WarmupRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WarmupRegionResponse_descriptor;
+    internal_static_hbase_pb_WarmupRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WarmupRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_WarmupRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CloseRegionRequest_descriptor;
+    internal_static_hbase_pb_CloseRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CloseRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CloseRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CloseRegionResponse_descriptor;
+    internal_static_hbase_pb_CloseRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CloseRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CloseRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FlushRegionRequest_descriptor;
+    internal_static_hbase_pb_FlushRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FlushRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_FlushRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FlushRegionResponse_descriptor;
+    internal_static_hbase_pb_FlushRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FlushRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_FlushRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SplitRegionRequest_descriptor;
+    internal_static_hbase_pb_SplitRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SplitRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_SplitRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SplitRegionResponse_descriptor;
+    internal_static_hbase_pb_SplitRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SplitRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_SplitRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CompactRegionRequest_descriptor;
+    internal_static_hbase_pb_CompactRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CompactRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CompactRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CompactRegionResponse_descriptor;
+    internal_static_hbase_pb_CompactRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CompactRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CompactRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UpdateFavoredNodesRequest_descriptor;
+    internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UpdateFavoredNodesRequest_fieldAccessorTable;
+      internal_static_hbase_pb_UpdateFavoredNodesRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
+    internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable;
+      internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UpdateFavoredNodesResponse_descriptor;
+    internal_static_hbase_pb_UpdateFavoredNodesResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UpdateFavoredNodesResponse_fieldAccessorTable;
+      internal_static_hbase_pb_UpdateFavoredNodesResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MergeRegionsRequest_descriptor;
+    internal_static_hbase_pb_MergeRegionsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MergeRegionsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MergeRegionsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MergeRegionsResponse_descriptor;
+    internal_static_hbase_pb_MergeRegionsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MergeRegionsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MergeRegionsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WALEntry_descriptor;
+    internal_static_hbase_pb_WALEntry_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WALEntry_fieldAccessorTable;
+      internal_static_hbase_pb_WALEntry_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicateWALEntryRequest_descriptor;
+    internal_static_hbase_pb_ReplicateWALEntryRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicateWALEntryRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicateWALEntryRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicateWALEntryResponse_descriptor;
+    internal_static_hbase_pb_ReplicateWALEntryResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicateWALEntryResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicateWALEntryResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RollWALWriterRequest_descriptor;
+    internal_static_hbase_pb_RollWALWriterRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RollWALWriterRequest_fieldAccessorTable;
+      internal_static_hbase_pb_RollWALWriterRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RollWALWriterResponse_descriptor;
+    internal_static_hbase_pb_RollWALWriterResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RollWALWriterResponse_fieldAccessorTable;
+      internal_static_hbase_pb_RollWALWriterResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StopServerRequest_descriptor;
+    internal_static_hbase_pb_StopServerRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StopServerRequest_fieldAccessorTable;
+      internal_static_hbase_pb_StopServerRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StopServerResponse_descriptor;
+    internal_static_hbase_pb_StopServerResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StopServerResponse_fieldAccessorTable;
+      internal_static_hbase_pb_StopServerResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetServerInfoRequest_descriptor;
+    internal_static_hbase_pb_GetServerInfoRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetServerInfoRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetServerInfoRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ServerInfo_descriptor;
+    internal_static_hbase_pb_ServerInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ServerInfo_fieldAccessorTable;
+      internal_static_hbase_pb_ServerInfo_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetServerInfoResponse_descriptor;
+    internal_static_hbase_pb_GetServerInfoResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetServerInfoResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetServerInfoResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UpdateConfigurationRequest_descriptor;
+    internal_static_hbase_pb_UpdateConfigurationRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UpdateConfigurationRequest_fieldAccessorTable;
+      internal_static_hbase_pb_UpdateConfigurationRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UpdateConfigurationResponse_descriptor;
+    internal_static_hbase_pb_UpdateConfigurationResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UpdateConfigurationResponse_fieldAccessorTable;
+      internal_static_hbase_pb_UpdateConfigurationResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -23479,323 +23479,337 @@ public final class AdminProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013Admin.proto\032\014Client.proto\032\013HBase.proto" +
-      "\032\tWAL.proto\"R\n\024GetRegionInfoRequest\022 \n\006r" +
-      "egion\030\001 \002(\0132\020.RegionSpecifier\022\030\n\020compact" +
-      "ion_state\030\002 \001(\010\"\331\001\n\025GetRegionInfoRespons" +
-      "e\022 \n\013region_info\030\001 \002(\0132\013.RegionInfo\022@\n\020c" +
-      "ompaction_state\030\002 \001(\0162&.GetRegionInfoRes" +
-      "ponse.CompactionState\022\024\n\014isRecovering\030\003 " +
-      "\001(\010\"F\n\017CompactionState\022\010\n\004NONE\020\000\022\t\n\005MINO" +
-      "R\020\001\022\t\n\005MAJOR\020\002\022\023\n\017MAJOR_AND_MINOR\020\003\"G\n\023G" +
-      "etStoreFileRequest\022 \n\006region\030\001 \002(\0132\020.Reg",
-      "ionSpecifier\022\016\n\006family\030\002 \003(\014\"*\n\024GetStore" +
-      "FileResponse\022\022\n\nstore_file\030\001 \003(\t\"\030\n\026GetO" +
-      "nlineRegionRequest\";\n\027GetOnlineRegionRes" +
-      "ponse\022 \n\013region_info\030\001 \003(\0132\013.RegionInfo\"" +
-      "\230\002\n\021OpenRegionRequest\0224\n\topen_info\030\001 \003(\013" +
-      "2!.OpenRegionRequest.RegionOpenInfo\022\027\n\017s" +
-      "erverStartCode\030\002 \001(\004\022\032\n\022master_system_ti" +
-      "me\030\005 \001(\004\032\227\001\n\016RegionOpenInfo\022\033\n\006region\030\001 " +
-      "\002(\0132\013.RegionInfo\022\037\n\027version_of_offline_n" +
-      "ode\030\002 \001(\r\022\"\n\rfavored_nodes\030\003 \003(\0132\013.Serve",
-      "rName\022#\n\033openForDistributedLogReplay\030\004 \001" +
-      "(\010\"\235\001\n\022OpenRegionResponse\022=\n\ropening_sta" +
-      "te\030\001 \003(\0162&.OpenRegionResponse.RegionOpen" +
-      "ingState\"H\n\022RegionOpeningState\022\n\n\006OPENED" +
-      "\020\000\022\022\n\016ALREADY_OPENED\020\001\022\022\n\016FAILED_OPENING" +
-      "\020\002\"6\n\023WarmupRegionRequest\022\037\n\nregionInfo\030" +
-      "\001 \002(\0132\013.RegionInfo\"\026\n\024WarmupRegionRespon" +
-      "se\"\271\001\n\022CloseRegionRequest\022 \n\006region\030\001 \002(" +
-      "\0132\020.RegionSpecifier\022\037\n\027version_of_closin" +
-      "g_node\030\002 \001(\r\022\036\n\020transition_in_ZK\030\003 \001(\010:\004",
-      "true\022\'\n\022destination_server\030\004 \001(\0132\013.Serve" +
-      "rName\022\027\n\017serverStartCode\030\005 \001(\004\"%\n\023CloseR" +
-      "egionResponse\022\016\n\006closed\030\001 \002(\010\"p\n\022FlushRe" +
-      "gionRequest\022 \n\006region\030\001 \002(\0132\020.RegionSpec" +
-      "ifier\022\030\n\020if_older_than_ts\030\002 \001(\004\022\036\n\026write" +
-      "_flush_wal_marker\030\003 \001(\010\"_\n\023FlushRegionRe" +
-      "sponse\022\027\n\017last_flush_time\030\001 \002(\004\022\017\n\007flush" +
-      "ed\030\002 \001(\010\022\036\n\026wrote_flush_wal_marker\030\003 \001(\010" +
-      "\"K\n\022SplitRegionRequest\022 \n\006region\030\001 \002(\0132\020" +
-      ".RegionSpecifier\022\023\n\013split_point\030\002 \001(\014\"\025\n",
-      "\023SplitRegionResponse\"W\n\024CompactRegionReq" +
-      "uest\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier\022\r" +
-      "\n\005major\030\002 \001(\010\022\016\n\006family\030\003 \001(\014\"\027\n\025Compact" +
-      "RegionResponse\"\262\001\n\031UpdateFavoredNodesReq" +
-      "uest\022@\n\013update_info\030\001 \003(\0132+.UpdateFavore" +
-      "dNodesRequest.RegionUpdateInfo\032S\n\020Region" +
-      "UpdateInfo\022\033\n\006region\030\001 \002(\0132\013.RegionInfo\022" +
-      "\"\n\rfavored_nodes\030\002 \003(\0132\013.ServerName\".\n\032U" +
-      "pdateFavoredNodesResponse\022\020\n\010response\030\001 " +
-      "\001(\r\"\222\001\n\023MergeRegionsRequest\022\"\n\010region_a\030",
-      "\001 \002(\0132\020.RegionSpecifier\022\"\n\010region_b\030\002 \002(" +
-      "\0132\020.RegionSpecifier\022\027\n\010forcible\030\003 \001(\010:\005f" +
-      "alse\022\032\n\022master_system_time\030\004 \001(\004\"\026\n\024Merg" +
-      "eRegionsResponse\"X\n\010WALEntry\022\024\n\003key\030\001 \002(" +
-      "\0132\007.WALKey\022\027\n\017key_value_bytes\030\002 \003(\014\022\035\n\025a" +
-      "ssociated_cell_count\030\003 \001(\005\"4\n\030ReplicateW" +
-      "ALEntryRequest\022\030\n\005entry\030\001 \003(\0132\t.WALEntry" +
-      "\"\033\n\031ReplicateWALEntryResponse\"\026\n\024RollWAL" +
-      "WriterRequest\"0\n\025RollWALWriterResponse\022\027" +
-      "\n\017region_to_flush\030\001 \003(\014\"#\n\021StopServerReq",
-      "uest\022\016\n\006reason\030\001 \002(\t\"\024\n\022StopServerRespon" +
-      "se\"\026\n\024GetServerInfoRequest\"B\n\nServerInfo" +
-      "\022 \n\013server_name\030\001 \002(\0132\013.ServerName\022\022\n\nwe" +
-      "bui_port\030\002 \001(\r\"9\n\025GetServerInfoResponse\022" +
-      " \n\013server_info\030\001 \002(\0132\013.ServerInfo\"\034\n\032Upd" +
-      "ateConfigurationRequest\"\035\n\033UpdateConfigu" +
-      "rationResponse2\325\010\n\014AdminService\022>\n\rGetRe" +
-      "gionInfo\022\025.GetRegionInfoRequest\032\026.GetReg" +
-      "ionInfoResponse\022;\n\014GetStoreFile\022\024.GetSto" +
-      "reFileRequest\032\025.GetStoreFileResponse\022D\n\017",
-      "GetOnlineRegion\022\027.GetOnlineRegionRequest" +
-      "\032\030.GetOnlineRegionResponse\0225\n\nOpenRegion" +
-      "\022\022.OpenRegionRequest\032\023.OpenRegionRespons" +
-      "e\022;\n\014WarmupRegion\022\024.WarmupRegionRequest\032" +
-      "\025.WarmupRegionResponse\0228\n\013CloseRegion\022\023." +
-      "CloseRegionRequest\032\024.CloseRegionResponse" +
-      "\0228\n\013FlushRegion\022\023.FlushRegionRequest\032\024.F" +
-      "lushRegionResponse\0228\n\013SplitRegion\022\023.Spli" +
-      "tRegionRequest\032\024.SplitRegionResponse\022>\n\r" +
-      "CompactRegion\022\025.CompactRegionRequest\032\026.C",
-      "ompactRegionResponse\022;\n\014MergeRegions\022\024.M" +
-      "ergeRegionsRequest\032\025.MergeRegionsRespons" +
-      "e\022J\n\021ReplicateWALEntry\022\031.ReplicateWALEnt" +
-      "ryRequest\032\032.ReplicateWALEntryResponse\022?\n" +
-      "\006Replay\022\031.ReplicateWALEntryRequest\032\032.Rep" +
-      "licateWALEntryResponse\022>\n\rRollWALWriter\022" +
-      "\025.RollWALWriterRequest\032\026.RollWALWriterRe" +
-      "sponse\022>\n\rGetServerInfo\022\025.GetServerInfoR" +
-      "equest\032\026.GetServerInfoResponse\0225\n\nStopSe" +
-      "rver\022\022.StopServerRequest\032\023.StopServerRes",
-      "ponse\022M\n\022UpdateFavoredNodes\022\032.UpdateFavo" +
-      "redNodesRequest\032\033.UpdateFavoredNodesResp" +
-      "onse\022P\n\023UpdateConfiguration\022\033.UpdateConf" +
-      "igurationRequest\032\034.UpdateConfigurationRe" +
-      "sponseBA\n*org.apache.hadoop.hbase.protob" +
-      "uf.generatedB\013AdminProtosH\001\210\001\001\240\001\001"
+      "\n\013Admin.proto\022\010hbase.pb\032\014Client.proto\032\013H" +
+      "Base.proto\032\tWAL.proto\"[\n\024GetRegionInfoRe" +
+      "quest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionS" +
+      "pecifier\022\030\n\020compaction_state\030\002 \001(\010\"\353\001\n\025G" +
+      "etRegionInfoResponse\022)\n\013region_info\030\001 \002(" +
+      "\0132\024.hbase.pb.RegionInfo\022I\n\020compaction_st" +
+      "ate\030\002 \001(\0162/.hbase.pb.GetRegionInfoRespon" +
+      "se.CompactionState\022\024\n\014isRecovering\030\003 \001(\010" +
+      "\"F\n\017CompactionState\022\010\n\004NONE\020\000\022\t\n\005MINOR\020\001" +
+      "\022\t\n\005MAJOR\020\002\022\023\n\017MAJOR_AND_MINOR\020\003\"P\n\023GetS",
+      "toreFileRequest\022)\n\006region\030\001 \002(\0132\031.hbase." +
+      "pb.RegionSpecifier\022\016\n\006family\030\002 \003(\014\"*\n\024Ge" +
+      "tStoreFileResponse\022\022\n\nstore_file\030\001 \003(\t\"\030" +
+      "\n\026GetOnlineRegionRequest\"D\n\027GetOnlineReg" +
+      "ionResponse\022)\n\013region_info\030\001 \003(\0132\024.hbase" +
+      ".pb.RegionInfo\"\263\002\n\021OpenRegionRequest\022=\n\t" +
+      "open_info\030\001 \003(\0132*.hbase.pb.OpenRegionReq" +
+      "uest.RegionOpenInfo\022\027\n\017serverStartCode\030\002" +
+      " \001(\004\022\032\n\022master_system_time\030\005 \001(\004\032\251\001\n\016Reg" +
+      "ionOpenInfo\022$\n\006region\030\001 \002(\0132\024.hbase.pb.R",
+      "egionInfo\022\037\n\027version_of_offline_node\030\002 \001" +
+      "(\r\022+\n\rfavored_nodes\030\003 \003(\0132\024.hbase.pb.Ser" +
+      "verName\022#\n\033openForDistributedLogReplay\030\004" +
+      " \001(\010\"\246\001\n\022OpenRegionResponse\022F\n\ropening_s" +
+      "tate\030\001 \003(\0162/.hbase.pb.OpenRegionResponse" +
+      ".RegionOpeningState\"H\n\022RegionOpeningStat" +
+      "e\022\n\n\006OPENED\020\000\022\022\n\016ALREADY_OPENED\020\001\022\022\n\016FAI" +
+      "LED_OPENING\020\002\"?\n\023WarmupRegionRequest\022(\n\n" +
+      "regionInfo\030\001 \002(\0132\024.hbase.pb.RegionInfo\"\026" +
+      "\n\024WarmupRegionResponse\"\313\001\n\022CloseRegionRe",
+      "quest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionS" +
+      "pecifier\022\037\n\027version_of_closing_node\030\002 \001(" +
+      "\r\022\036\n\020transition_in_ZK\030\003 \001(\010:\004true\0220\n\022des" +
+      "tination_server\030\004 \001(\0132\024.hbase.pb.ServerN" +
+      "ame\022\027\n\017serverStartCode\030\005 \001(\004\"%\n\023CloseReg" +
+      "ionResponse\022\016\n\006closed\030\001 \002(\010\"y\n\022FlushRegi" +
+      "onRequest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.Reg" +
+      "ionSpecifier\022\030\n\020if_older_than_ts\030\002 \001(\004\022\036" +
+      "\n\026write_flush_wal_marker\030\003 \001(\010\"_\n\023FlushR" +
+      "egionResponse\022\027\n\017last_flush_time\030\001 \002(\004\022\017",
+      "\n\007flushed\030\002 \001(\010\022\036\n\026wrote_flush_wal_marke" +
+      "r\030\003 \001(\010\"T\n\022SplitRegionRequest\022)\n\006region\030" +
+      "\001 \002(\0132\031.hbase.pb.RegionSpecifier\022\023\n\013spli" +
+      "t_point\030\002 \001(\014\"\025\n\023SplitRegionResponse\"`\n\024" +
+      "CompactRegionRequest\022)\n\006region\030\001 \002(\0132\031.h" +
+      "base.pb.RegionSpecifier\022\r\n\005major\030\002 \001(\010\022\016" +
+      "\n\006family\030\003 \001(\014\"\027\n\025CompactRegionResponse\"" +
+      "\315\001\n\031UpdateFavoredNodesRequest\022I\n\013update_" +
+      "info\030\001 \003(\01324.hbase.pb.UpdateFavoredNodes" +
+      "Request.RegionUpdateInfo\032e\n\020RegionUpdate",
+      "Info\022$\n\006region\030\001 \002(\0132\024.hbase.pb.RegionIn" +
+      "fo\022+\n\rfavored_nodes\030\002 \003(\0132\024.hbase.pb.Ser" +
+      "verName\".\n\032UpdateFavoredNodesResponse\022\020\n" +
+      "\010response\030\001 \001(\r\"\244\001\n\023MergeRegionsRequest\022" +
+      "+\n\010region_a\030\001 \002(\0132\031.hbase.pb.RegionSpeci" +
+      "fier\022+\n\010region_b\030\002 \002(\0132\031.hbase.pb.Region" +
+      "Specifier\022\027\n\010forcible\030\003 \001(\010:\005false\022\032\n\022ma" +
+      "ster_system_time\030\004 \001(\004\"\026\n\024MergeRegionsRe" +
+      "sponse\"a\n\010WALEntry\022\035\n\003key\030\001 \002(\0132\020.hbase." +
+      "pb.WALKey\022\027\n\017key_value_bytes\030\002 \003(\014\022\035\n\025as",
+      "sociated_cell_count\030\003 \001(\005\"=\n\030ReplicateWA" +
+      "LEntryRequest\022!\n\005entry\030\001 \003(\0132\022.hbase.pb." +
+      "WALEntry\"\033\n\031ReplicateWALEntryResponse\"\026\n" +
+      "\024RollWALWriterRequest\"0\n\025RollWALWriterRe" +
+      "sponse\022\027\n\017region_to_flush\030\001 \003(\014\"#\n\021StopS" +
+      "erverRequest\022\016\n\006reason\030\001 \002(\t\"\024\n\022StopServ" +
+      "erResponse\"\026\n\024GetServerInfoRequest\"K\n\nSe" +
+      "rverInfo\022)\n\013server_name\030\001 \002(\0132\024.hbase.pb" +
+      ".ServerName\022\022\n\nwebui_port\030\002 \001(\r\"B\n\025GetSe" +
+      "rverInfoResponse\022)\n\013server_info\030\001 \002(\0132\024.",
+      "hbase.pb.ServerInfo\"\034\n\032UpdateConfigurati" +
+      "onRequest\"\035\n\033UpdateConfigurationResponse" +
+      "2\207\013\n\014AdminService\022P\n\rGetRegionInfo\022\036.hba" +
+      "se.pb.GetRegionInfoRequest\032\037.hbase.pb.Ge" +
+      "tRegionInfoResponse\022M\n\014GetStoreFile\022\035.hb" +
+      "ase.pb.GetStoreFileRequest\032\036.hbase.pb.Ge" +
+      "tStoreFileResponse\022V\n\017GetOnlineRegion\022 ." +
+      "hbase.pb.GetOnlineRegionRequest\032!.hbase." +
+      "pb.GetOnlineRegionResponse\022G\n\nOpenRegion" +
+      "\022\033.hbase.pb.OpenRegionRequest\032\034.hbase.pb",
+      ".OpenRegionResponse\022M\n\014WarmupRegion\022\035.hb" +
+      "ase.pb.WarmupRegionRequest\032\036.hbase.pb.Wa" +
+      "rmupRegionResponse\022J\n\013CloseRegion\022\034.hbas" +
+      "e.pb.CloseRegionRequest\032\035.hbase.pb.Close" +
+      "RegionResponse\022J\n\013FlushRegion\022\034.hbase.pb" +
+      ".FlushRegionRequest\032\035.hbase.pb.FlushRegi" +
+      "onResponse\022J\n\013SplitRegion\022\034.hbase.pb.Spl" +
+      "itRegionRequest\032\035.hbase.pb.SplitRegionRe" +
+      "sponse\022P\n\rCompactRegion\022\036.hbase.pb.Compa" +
+      "ctRegionRequest\032\037.hbase.pb.CompactRegion",
+      "Response\022M\n\014MergeRegions\022\035.hbase.pb.Merg" +
+      "eRegionsRequest\032\036.hbase.pb.MergeRegionsR" +
+      "esponse\022\\\n\021ReplicateWALEntry\022\".hbase.pb." +
+      "ReplicateWALEntryRequest\032#.hbase.pb.Repl" +
+      "icateWALEntryResponse\022Q\n\006Replay\022\".hbase." +
+      "pb.ReplicateWALEntryRequest\032#.hbase.pb.R" +
+      "eplicateWALEntryResponse\022P\n\rRollWALWrite" +
+      "r\022\036.hbase.pb.RollWALWriterRequest\032\037.hbas" +
+      "e.pb.RollWALWriterResponse\022P\n\rGetServerI" +
+      "nfo\022\036.hbase.pb.GetServerInfoRequest\032\037.hb",
+      "ase.pb.GetServerInfoResponse\022G\n\nStopServ" +
+      "er\022\033.hbase.pb.StopServerRequest\032\034.hbase." +
+      "pb.StopServerResponse\022_\n\022UpdateFavoredNo" +
+      "des\022#.hbase.pb.UpdateFavoredNodesRequest" +
+      "\032$.hbase.pb.UpdateFavoredNodesResponse\022b" +
+      "\n\023UpdateConfiguration\022$.hbase.pb.UpdateC" +
+      "onfigurationRequest\032%.hbase.pb.UpdateCon" +
+      "figurationResponseBA\n*org.apache.hadoop." +
+      "hbase.protobuf.generatedB\013AdminProtosH\001\210" +
+      "\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_GetRegionInfoRequest_descriptor =
+          internal_static_hbase_pb_GetRegionInfoRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_GetRegionInfoRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetRegionInfoRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetRegionInfoRequest_descriptor,
+              internal_static_hbase_pb_GetRegionInfoRequest_descriptor,
               new java.lang.String[] { "Region", "CompactionState", });
-          internal_static_GetRegionInfoResponse_descriptor =
+          internal_static_hbase_pb_GetRegionInfoResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_GetRegionInfoResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetRegionInfoResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetRegionInfoResponse_descriptor,
+              internal_static_hbase_pb_GetRegionInfoResponse_descriptor,
               new java.lang.String[] { "RegionInfo", "CompactionState", "IsRecovering", });
-          internal_static_GetStoreFileRequest_descriptor =
+          internal_static_hbase_pb_GetStoreFileRequest_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_GetStoreFileRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetStoreFileRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetStoreFileRequest_descriptor,
+              internal_static_hbase_pb_GetStoreFileRequest_descriptor,
               new java.lang.String[] { "Region", "Family", });
-          internal_static_GetStoreFileResponse_descriptor =
+          internal_static_hbase_pb_GetStoreFileResponse_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_GetStoreFileResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetStoreFileResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetStoreFileResponse_descriptor,
+              internal_static_hbase_pb_GetStoreFileResponse_descriptor,
               new java.lang.String[] { "StoreFile", });
-          internal_static_GetOnlineRegionRequest_descriptor =
+          internal_static_hbase_pb_GetOnlineRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_GetOnlineRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetOnlineRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetOnlineRegionRequest_descriptor,
+              internal_static_hbase_pb_GetOnlineRegionRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_GetOnlineRegionResponse_descriptor =
+          internal_static_hbase_pb_GetOnlineRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_GetOnlineRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetOnlineRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetOnlineRegionResponse_descriptor,
+              internal_static_hbase_pb_GetOnlineRegionResponse_descriptor,
               new java.lang.String[] { "RegionInfo", });
-          internal_static_OpenRegionRequest_descriptor =
+          internal_static_hbase_pb_OpenRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_OpenRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_OpenRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_OpenRegionRequest_descriptor,
+              internal_static_hbase_pb_OpenRegionRequest_descriptor,
               new java.lang.String[] { "OpenInfo", "ServerStartCode", "MasterSystemTime", });
-          internal_static_OpenRegionRequest_RegionOpenInfo_descriptor =
-            internal_static_OpenRegionRequest_descriptor.getNestedTypes().get(0);
-          internal_static_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_descriptor =
+            internal_static_hbase_pb_OpenRegionRequest_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_OpenRegionRequest_RegionOpenInfo_descriptor,
+              internal_static_hbase_pb_OpenRegionRequest_RegionOpenInfo_descriptor,
               new java.lang.String[] { "Region", "VersionOfOfflineNode", "FavoredNodes", "OpenForDistributedLogReplay", });
-          internal_static_OpenRegionResponse_descriptor =
+          internal_static_hbase_pb_OpenRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_OpenRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_OpenRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_OpenRegionResponse_descriptor,
+              internal_static_hbase_pb_OpenRegionResponse_descriptor,
               new java.lang.String[] { "OpeningState", });
-          internal_static_WarmupRegionRequest_descriptor =
+          internal_static_hbase_pb_WarmupRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_WarmupRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_WarmupRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WarmupRegionRequest_descriptor,
+              internal_static_hbase_pb_WarmupRegionRequest_descriptor,
               new java.lang.String[] { "RegionInfo", });
-          internal_static_WarmupRegionResponse_descriptor =
+          internal_static_hbase_pb_WarmupRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_WarmupRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_WarmupRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WarmupRegionResponse_descriptor,
+              internal_static_hbase_pb_WarmupRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_CloseRegionRequest_descriptor =
+          internal_static_hbase_pb_CloseRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_CloseRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CloseRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CloseRegionRequest_descriptor,
+              internal_static_hbase_pb_CloseRegionRequest_descriptor,
               new java.lang.String[] { "Region", "VersionOfClosingNode", "TransitionInZK", "DestinationServer", "ServerStartCode", });
-          internal_static_CloseRegionResponse_descriptor =
+          internal_static_hbase_pb_CloseRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_CloseRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CloseRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CloseRegionResponse_descriptor,
+              internal_static_hbase_pb_CloseRegionResponse_descriptor,
               new java.lang.String[] { "Closed", });
-          internal_static_FlushRegionRequest_descriptor =
+          internal_static_hbase_pb_FlushRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_FlushRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_FlushRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FlushRegionRequest_descriptor,
+              internal_static_hbase_pb_FlushRegionRequest_descriptor,
               new java.lang.String[] { "Region", "IfOlderThanTs", "WriteFlushWalMarker", });
-          internal_static_FlushRegionResponse_descriptor =
+          internal_static_hbase_pb_FlushRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_FlushRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_FlushRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FlushRegionResponse_descriptor,
+              internal_static_hbase_pb_FlushRegionResponse_descriptor,
               new java.lang.String[] { "LastFlushTime", "Flushed", "WroteFlushWalMarker", });
-          internal_static_SplitRegionRequest_descriptor =
+          internal_static_hbase_pb_SplitRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(14);
-          internal_static_SplitRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_SplitRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SplitRegionRequest_descriptor,
+              internal_static_hbase_pb_SplitRegionRequest_descriptor,
               new java.lang.String[] { "Region", "SplitPoint", });
-          internal_static_SplitRegionResponse_descriptor =
+          internal_static_hbase_pb_SplitRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(15);
-          internal_static_SplitRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_SplitRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SplitRegionResponse_descriptor,
+              internal_static_hbase_pb_SplitRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_CompactRegionRequest_descriptor =
+          internal_static_hbase_pb_CompactRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(16);
-          internal_static_CompactRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CompactRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CompactRegionRequest_descriptor,
+              internal_static_hbase_pb_CompactRegionRequest_descriptor,
               new java.lang.String[] { "Region", "Major", "Family", });
-          internal_static_CompactRegionResponse_descriptor =
+          internal_static_hbase_pb_CompactRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(17);
-          internal_static_CompactRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CompactRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CompactRegionResponse_descriptor,
+              internal_static_hbase_pb_CompactRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_UpdateFavoredNodesRequest_descriptor =
+          internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor =
             getDescriptor().getMessageTypes().get(18);
-          internal_static_UpdateFavoredNodesRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_UpdateFavoredNodesRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UpdateFavoredNodesRequest_descriptor,
+              internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor,
               new java.lang.String[] { "UpdateInfo", });
-          internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor =
-            internal_static_UpdateFavoredNodesRequest_descriptor.getNestedTypes().get(0);
-          internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor =
+            internal_static_hbase_pb_UpdateFavoredNodesRequest_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor,
+              internal_static_hbase_pb_UpdateFavoredNodesRequest_RegionUpdateInfo_descriptor,
               new java.lang.String[] { "Region", "FavoredNodes", });
-          internal_static_UpdateFavoredNodesResponse_descriptor =
+          internal_static_hbase_pb_UpdateFavoredNodesResponse_descriptor =
             getDescriptor().getMessageTypes().get(19);
-          internal_static_UpdateFavoredNodesResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_UpdateFavoredNodesResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UpdateFavoredNodesResponse_descriptor,
+              internal_static_hbase_pb_UpdateFavoredNodesResponse_descriptor,
               new java.lang.String[] { "Response", });
-          internal_static_MergeRegionsRequest_descriptor =
+          internal_static_hbase_pb_MergeRegionsRequest_descriptor =
             getDescriptor().getMessageTypes().get(20);
-          internal_static_MergeRegionsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MergeRegionsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MergeRegionsRequest_descriptor,
+              internal_static_hbase_pb_MergeRegionsRequest_descriptor,
               new java.lang.String[] { "RegionA", "RegionB", "Forcible", "MasterSystemTime", });
-          internal_static_MergeRegionsResponse_descriptor =
+          internal_static_hbase_pb_MergeRegionsResponse_descriptor =
             getDescriptor().getMessageTypes().get(21);
-          internal_static_MergeRegionsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MergeRegionsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MergeRegionsResponse_descriptor,
+              internal_static_hbase_pb_MergeRegionsResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_WALEntry_descriptor =
+          internal_static_hbase_pb_WALEntry_descriptor =
             getDescriptor().getMessageTypes().get(22);
-          internal_static_WALEntry_fieldAccessorTable = new
+          internal_static_hbase_pb_WALEntry_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WALEntry_descriptor,
+              internal_static_hbase_pb_WALEntry_descriptor,
               new java.lang.String[] { "Key", "KeyValueBytes", "AssociatedCellCount", });
-          internal_static_ReplicateWALEntryRequest_descriptor =
+          internal_static_hbase_pb_ReplicateWALEntryRequest_descriptor =
             getDescriptor().getMessageTypes().get(23);
-          internal_static_ReplicateWALEntryRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicateWALEntryRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicateWALEntryRequest_descriptor,
+              internal_static_hbase_pb_ReplicateWALEntryRequest_descriptor,
               new java.lang.String[] { "Entry", });
-          internal_static_ReplicateWALEntryResponse_descriptor =
+          internal_static_hbase_pb_ReplicateWALEntryResponse_descriptor =
             getDescriptor().getMessageTypes().get(24);
-          internal_static_ReplicateWALEntryResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicateWALEntryResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicateWALEntryResponse_descriptor,
+              internal_static_hbase_pb_ReplicateWALEntryResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_RollWALWriterRequest_descriptor =
+          internal_static_hbase_pb_RollWALWriterRequest_descriptor =
             getDescriptor().getMessageTypes().get(25);
-          internal_static_RollWALWriterRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_RollWALWriterRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RollWALWriterRequest_descriptor,
+              internal_static_hbase_pb_RollWALWriterRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_RollWALWriterResponse_descriptor =
+          internal_static_hbase_pb_RollWALWriterResponse_descriptor =
             getDescriptor().getMessageTypes().get(26);
-          internal_static_RollWALWriterResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_RollWALWriterResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RollWALWriterResponse_descriptor,
+              internal_static_hbase_pb_RollWALWriterResponse_descriptor,
               new java.lang.String[] { "RegionToFlush", });
-          internal_static_StopServerRequest_descriptor =
+          internal_static_hbase_pb_StopServerRequest_descriptor =
             getDescriptor().getMessageTypes().get(27);
-          internal_static_StopServerRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_StopServerRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StopServerRequest_descriptor,
+              internal_static_hbase_pb_StopServerRequest_descriptor,
               new java.lang.String[] { "Reason", });
-          internal_static_StopServerResponse_descriptor =
+          internal_static_hbase_pb_StopServerResponse_descriptor =
             getDescriptor().getMessageTypes().get(28);
-          internal_static_StopServerResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_StopServerResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StopServerResponse_descriptor,
+              internal_static_hbase_pb_StopServerResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_GetServerInfoRequest_descriptor =
+          internal_static_hbase_pb_GetServerInfoRequest_descriptor =
             getDescriptor().getMessageTypes().get(29);
-          internal_static_GetServerInfoRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetServerInfoRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetServerInfoRequest_descriptor,
+              internal_static_hbase_pb_GetServerInfoRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_ServerInfo_descriptor =
+          internal_static_hbase_pb_ServerInfo_descriptor =
             getDescriptor().getMessageTypes().get(30);
-          internal_static_ServerInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_ServerInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ServerInfo_descriptor,
+              internal_static_hbase_pb_ServerInfo_descriptor,
               new java.lang.String[] { "ServerName", "WebuiPort", });
-          internal_static_GetServerInfoResponse_descriptor =
+          internal_static_hbase_pb_GetServerInfoResponse_descriptor =
             getDescriptor().getMessageTypes().get(31);
-          internal_static_GetServerInfoResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetServerInfoResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetServerInfoResponse_descriptor,
+              internal_static_hbase_pb_GetServerInfoResponse_descriptor,
               new java.lang.String[] { "ServerInfo", });
-          internal_static_UpdateConfigurationRequest_descriptor =
+          internal_static_hbase_pb_UpdateConfigurationRequest_descriptor =
             getDescriptor().getMessageTypes().get(32);
-          internal_static_UpdateConfigurationRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_UpdateConfigurationRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UpdateConfigurationRequest_descriptor,
+              internal_static_hbase_pb_UpdateConfigurationRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_UpdateConfigurationResponse_descriptor =
+          internal_static_hbase_pb_UpdateConfigurationResponse_descriptor =
             getDescriptor().getMessageTypes().get(33);
-          internal_static_UpdateConfigurationResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_UpdateConfigurationResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UpdateConfigurationResponse_descriptor,
+              internal_static_hbase_pb_UpdateConfigurationResponse_descriptor,
               new java.lang.String[] { });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AggregateProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AggregateProtos.java
index 97e4b6a1250..508790c4e17 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AggregateProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AggregateProtos.java
@@ -50,17 +50,17 @@ public final class AggregateProtos {
     com.google.protobuf.ByteString
         getInterpreterClassNameBytes();
 
-    // required .Scan scan = 2;
+    // required .hbase.pb.Scan scan = 2;
     /**
-     * required .Scan scan = 2;
+     * required .hbase.pb.Scan scan = 2;
      */
     boolean hasScan();
     /**
-     * required .Scan scan = 2;
+     * required .hbase.pb.Scan scan = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan();
     /**
-     * required .Scan scan = 2;
+     * required .hbase.pb.Scan scan = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder();
 
@@ -75,7 +75,7 @@ public final class AggregateProtos {
     com.google.protobuf.ByteString getInterpreterSpecificBytes();
   }
   /**
-   * Protobuf type {@code AggregateRequest}
+   * Protobuf type {@code hbase.pb.AggregateRequest}
    */
   public static final class AggregateRequest extends
       com.google.protobuf.GeneratedMessage
@@ -162,12 +162,12 @@ public final class AggregateProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateRequest.class, org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateRequest.Builder.class);
     }
@@ -255,23 +255,23 @@ public final class AggregateProtos {
       }
     }
 
-    // required .Scan scan = 2;
+    // required .hbase.pb.Scan scan = 2;
     public static final int SCAN_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_;
     /**
-     * required .Scan scan = 2;
+     * required .hbase.pb.Scan scan = 2;
      */
     public boolean hasScan() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .Scan scan = 2;
+     * required .hbase.pb.Scan scan = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() {
       return scan_;
     }
     /**
-     * required .Scan scan = 2;
+     * required .hbase.pb.Scan scan = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() {
       return scan_;
@@ -487,19 +487,19 @@ public final class AggregateProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AggregateRequest}
+     * Protobuf type {@code hbase.pb.AggregateRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateRequest.class, org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateRequest.Builder.class);
       }
@@ -544,7 +544,7 @@ public final class AggregateProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateRequest getDefaultInstanceForType() {
@@ -767,18 +767,18 @@ public final class AggregateProtos {
         return this;
       }
 
-      // required .Scan scan = 2;
+      // required .hbase.pb.Scan scan = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> scanBuilder_;
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public boolean hasScan() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() {
         if (scanBuilder_ == null) {
@@ -788,7 +788,7 @@ public final class AggregateProtos {
         }
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public Builder setScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) {
         if (scanBuilder_ == null) {
@@ -804,7 +804,7 @@ public final class AggregateProtos {
         return this;
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public Builder setScan(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder builderForValue) {
@@ -818,7 +818,7 @@ public final class AggregateProtos {
         return this;
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public Builder mergeScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) {
         if (scanBuilder_ == null) {
@@ -837,7 +837,7 @@ public final class AggregateProtos {
         return this;
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public Builder clearScan() {
         if (scanBuilder_ == null) {
@@ -850,7 +850,7 @@ public final class AggregateProtos {
         return this;
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder getScanBuilder() {
         bitField0_ |= 0x00000002;
@@ -858,7 +858,7 @@ public final class AggregateProtos {
         return getScanFieldBuilder().getBuilder();
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() {
         if (scanBuilder_ != null) {
@@ -868,7 +868,7 @@ public final class AggregateProtos {
         }
       }
       /**
-       * required .Scan scan = 2;
+       * required .hbase.pb.Scan scan = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> 
@@ -920,7 +920,7 @@ public final class AggregateProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:AggregateRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AggregateRequest)
     }
 
     static {
@@ -928,7 +928,7 @@ public final class AggregateProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AggregateRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AggregateRequest)
   }
 
   public interface AggregateResponseOrBuilder
@@ -986,7 +986,7 @@ public final class AggregateProtos {
     com.google.protobuf.ByteString getSecondPart();
   }
   /**
-   * Protobuf type {@code AggregateResponse}
+   * Protobuf type {@code hbase.pb.AggregateResponse}
    */
   public static final class AggregateResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1066,12 +1066,12 @@ public final class AggregateProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateResponse.class, org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateResponse.Builder.class);
     }
@@ -1325,19 +1325,19 @@ public final class AggregateProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AggregateResponse}
+     * Protobuf type {@code hbase.pb.AggregateResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateResponse.class, org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateResponse.Builder.class);
       }
@@ -1375,7 +1375,7 @@ public final class AggregateProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_AggregateResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.internal_static_hbase_pb_AggregateResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AggregateProtos.AggregateResponse getDefaultInstanceForType() {
@@ -1630,7 +1630,7 @@ public final class AggregateProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:AggregateResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AggregateResponse)
     }
 
     static {
@@ -1638,11 +1638,11 @@ public final class AggregateProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AggregateResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AggregateResponse)
   }
 
   /**
-   * Protobuf service {@code AggregateService}
+   * Protobuf service {@code hbase.pb.AggregateService}
    *
    * 
    ** Refer to the AggregateImplementation class for an overview of the 
@@ -1655,7 +1655,7 @@ public final class AggregateProtos {
 
     public interface Interface {
       /**
-       * rpc GetMax(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetMax(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getMax(
           com.google.protobuf.RpcController controller,
@@ -1663,7 +1663,7 @@ public final class AggregateProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetMin(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetMin(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getMin(
           com.google.protobuf.RpcController controller,
@@ -1671,7 +1671,7 @@ public final class AggregateProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetSum(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetSum(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getSum(
           com.google.protobuf.RpcController controller,
@@ -1679,7 +1679,7 @@ public final class AggregateProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetRowNum(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetRowNum(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getRowNum(
           com.google.protobuf.RpcController controller,
@@ -1687,7 +1687,7 @@ public final class AggregateProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetAvg(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetAvg(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getAvg(
           com.google.protobuf.RpcController controller,
@@ -1695,7 +1695,7 @@ public final class AggregateProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetStd(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetStd(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getStd(
           com.google.protobuf.RpcController controller,
@@ -1703,7 +1703,7 @@ public final class AggregateProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetMedian(.AggregateRequest) returns (.AggregateResponse);
+       * rpc GetMedian(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
        */
       public abstract void getMedian(
           com.google.protobuf.RpcController controller,
@@ -1872,7 +1872,7 @@ public final class AggregateProtos {
     }
 
     /**
-     * rpc GetMax(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetMax(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getMax(
         com.google.protobuf.RpcController controller,
@@ -1880,7 +1880,7 @@ public final class AggregateProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetMin(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetMin(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getMin(
         com.google.protobuf.RpcController controller,
@@ -1888,7 +1888,7 @@ public final class AggregateProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetSum(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetSum(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getSum(
         com.google.protobuf.RpcController controller,
@@ -1896,7 +1896,7 @@ public final class AggregateProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetRowNum(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetRowNum(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getRowNum(
         com.google.protobuf.RpcController controller,
@@ -1904,7 +1904,7 @@ public final class AggregateProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetAvg(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetAvg(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getAvg(
         com.google.protobuf.RpcController controller,
@@ -1912,7 +1912,7 @@ public final class AggregateProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetStd(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetStd(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getStd(
         com.google.protobuf.RpcController controller,
@@ -1920,7 +1920,7 @@ public final class AggregateProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetMedian(.AggregateRequest) returns (.AggregateResponse);
+     * rpc GetMedian(.hbase.pb.AggregateRequest) returns (.hbase.pb.AggregateResponse);
      */
     public abstract void getMedian(
         com.google.protobuf.RpcController controller,
@@ -2301,19 +2301,19 @@ public final class AggregateProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:AggregateService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AggregateService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AggregateRequest_descriptor;
+    internal_static_hbase_pb_AggregateRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AggregateRequest_fieldAccessorTable;
+      internal_static_hbase_pb_AggregateRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AggregateResponse_descriptor;
+    internal_static_hbase_pb_AggregateResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AggregateResponse_fieldAccessorTable;
+      internal_static_hbase_pb_AggregateResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2323,40 +2323,43 @@ public final class AggregateProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017Aggregate.proto\032\014Client.proto\"k\n\020Aggre" +
-      "gateRequest\022\036\n\026interpreter_class_name\030\001 " +
-      "\002(\t\022\023\n\004scan\030\002 \002(\0132\005.Scan\022\"\n\032interpreter_" +
-      "specific_bytes\030\003 \001(\014\"<\n\021AggregateRespons" +
-      "e\022\022\n\nfirst_part\030\001 \003(\014\022\023\n\013second_part\030\002 \001" +
-      "(\0142\357\002\n\020AggregateService\022/\n\006GetMax\022\021.Aggr" +
-      "egateRequest\032\022.AggregateResponse\022/\n\006GetM" +
-      "in\022\021.AggregateRequest\032\022.AggregateRespons" +
-      "e\022/\n\006GetSum\022\021.AggregateRequest\032\022.Aggrega" +
-      "teResponse\0222\n\tGetRowNum\022\021.AggregateReque",
-      "st\032\022.AggregateResponse\022/\n\006GetAvg\022\021.Aggre" +
-      "gateRequest\032\022.AggregateResponse\022/\n\006GetSt" +
-      "d\022\021.AggregateRequest\032\022.AggregateResponse" +
-      "\0222\n\tGetMedian\022\021.AggregateRequest\032\022.Aggre" +
-      "gateResponseBE\n*org.apache.hadoop.hbase." +
-      "protobuf.generatedB\017AggregateProtosH\001\210\001\001" +
-      "\240\001\001"
+      "\n\017Aggregate.proto\022\010hbase.pb\032\014Client.prot" +
+      "o\"t\n\020AggregateRequest\022\036\n\026interpreter_cla" +
+      "ss_name\030\001 \002(\t\022\034\n\004scan\030\002 \002(\0132\016.hbase.pb.S" +
+      "can\022\"\n\032interpreter_specific_bytes\030\003 \001(\014\"" +
+      "<\n\021AggregateResponse\022\022\n\nfirst_part\030\001 \003(\014" +
+      "\022\023\n\013second_part\030\002 \001(\0142\355\003\n\020AggregateServi" +
+      "ce\022A\n\006GetMax\022\032.hbase.pb.AggregateRequest" +
+      "\032\033.hbase.pb.AggregateResponse\022A\n\006GetMin\022" +
+      "\032.hbase.pb.AggregateRequest\032\033.hbase.pb.A" +
+      "ggregateResponse\022A\n\006GetSum\022\032.hbase.pb.Ag",
+      "gregateRequest\032\033.hbase.pb.AggregateRespo" +
+      "nse\022D\n\tGetRowNum\022\032.hbase.pb.AggregateReq" +
+      "uest\032\033.hbase.pb.AggregateResponse\022A\n\006Get" +
+      "Avg\022\032.hbase.pb.AggregateRequest\032\033.hbase." +
+      "pb.AggregateResponse\022A\n\006GetStd\022\032.hbase.p" +
+      "b.AggregateRequest\032\033.hbase.pb.AggregateR" +
+      "esponse\022D\n\tGetMedian\022\032.hbase.pb.Aggregat" +
+      "eRequest\032\033.hbase.pb.AggregateResponseBE\n" +
+      "*org.apache.hadoop.hbase.protobuf.genera" +
+      "tedB\017AggregateProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_AggregateRequest_descriptor =
+          internal_static_hbase_pb_AggregateRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_AggregateRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_AggregateRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AggregateRequest_descriptor,
+              internal_static_hbase_pb_AggregateRequest_descriptor,
               new java.lang.String[] { "InterpreterClassName", "Scan", "InterpreterSpecificBytes", });
-          internal_static_AggregateResponse_descriptor =
+          internal_static_hbase_pb_AggregateResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_AggregateResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_AggregateResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AggregateResponse_descriptor,
+              internal_static_hbase_pb_AggregateResponse_descriptor,
               new java.lang.String[] { "FirstPart", "SecondPart", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java
index fb115fac39a..3be88ab27d1 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java
@@ -42,7 +42,7 @@ public final class AuthenticationProtos {
     com.google.protobuf.ByteString getKey();
   }
   /**
-   * Protobuf type {@code AuthenticationKey}
+   * Protobuf type {@code hbase.pb.AuthenticationKey}
    */
   public static final class AuthenticationKey extends
       com.google.protobuf.GeneratedMessage
@@ -121,12 +121,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_AuthenticationKey_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_AuthenticationKey_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.Builder.class);
     }
@@ -389,19 +389,19 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AuthenticationKey}
+     * Protobuf type {@code hbase.pb.AuthenticationKey}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKeyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_AuthenticationKey_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_AuthenticationKey_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey.Builder.class);
       }
@@ -441,7 +441,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_AuthenticationKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_AuthenticationKey_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.AuthenticationKey getDefaultInstanceForType() {
@@ -638,7 +638,7 @@ public final class AuthenticationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:AuthenticationKey)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AuthenticationKey)
     }
 
     static {
@@ -646,19 +646,19 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AuthenticationKey)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AuthenticationKey)
   }
 
   public interface TokenIdentifierOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TokenIdentifier.Kind kind = 1;
+    // required .hbase.pb.TokenIdentifier.Kind kind = 1;
     /**
-     * required .TokenIdentifier.Kind kind = 1;
+     * required .hbase.pb.TokenIdentifier.Kind kind = 1;
      */
     boolean hasKind();
     /**
-     * required .TokenIdentifier.Kind kind = 1;
+     * required .hbase.pb.TokenIdentifier.Kind kind = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind getKind();
 
@@ -713,7 +713,7 @@ public final class AuthenticationProtos {
     long getSequenceNumber();
   }
   /**
-   * Protobuf type {@code TokenIdentifier}
+   * Protobuf type {@code hbase.pb.TokenIdentifier}
    */
   public static final class TokenIdentifier extends
       com.google.protobuf.GeneratedMessage
@@ -813,12 +813,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_TokenIdentifier_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_TokenIdentifier_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Builder.class);
     }
@@ -839,7 +839,7 @@ public final class AuthenticationProtos {
     }
 
     /**
-     * Protobuf enum {@code TokenIdentifier.Kind}
+     * Protobuf enum {@code hbase.pb.TokenIdentifier.Kind}
      */
     public enum Kind
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -908,21 +908,21 @@ public final class AuthenticationProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:TokenIdentifier.Kind)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.TokenIdentifier.Kind)
     }
 
     private int bitField0_;
-    // required .TokenIdentifier.Kind kind = 1;
+    // required .hbase.pb.TokenIdentifier.Kind kind = 1;
     public static final int KIND_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind kind_;
     /**
-     * required .TokenIdentifier.Kind kind = 1;
+     * required .hbase.pb.TokenIdentifier.Kind kind = 1;
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TokenIdentifier.Kind kind = 1;
+     * required .hbase.pb.TokenIdentifier.Kind kind = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind getKind() {
       return kind_;
@@ -1253,19 +1253,19 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TokenIdentifier}
+     * Protobuf type {@code hbase.pb.TokenIdentifier}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifierOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_TokenIdentifier_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_TokenIdentifier_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Builder.class);
       }
@@ -1311,7 +1311,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_TokenIdentifier_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_TokenIdentifier_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier getDefaultInstanceForType() {
@@ -1427,22 +1427,22 @@ public final class AuthenticationProtos {
       }
       private int bitField0_;
 
-      // required .TokenIdentifier.Kind kind = 1;
+      // required .hbase.pb.TokenIdentifier.Kind kind = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind kind_ = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind.HBASE_AUTH_TOKEN;
       /**
-       * required .TokenIdentifier.Kind kind = 1;
+       * required .hbase.pb.TokenIdentifier.Kind kind = 1;
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TokenIdentifier.Kind kind = 1;
+       * required .hbase.pb.TokenIdentifier.Kind kind = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind getKind() {
         return kind_;
       }
       /**
-       * required .TokenIdentifier.Kind kind = 1;
+       * required .hbase.pb.TokenIdentifier.Kind kind = 1;
        */
       public Builder setKind(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenIdentifier.Kind value) {
         if (value == null) {
@@ -1454,7 +1454,7 @@ public final class AuthenticationProtos {
         return this;
       }
       /**
-       * required .TokenIdentifier.Kind kind = 1;
+       * required .hbase.pb.TokenIdentifier.Kind kind = 1;
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -1631,7 +1631,7 @@ public final class AuthenticationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TokenIdentifier)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TokenIdentifier)
     }
 
     static {
@@ -1639,7 +1639,7 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TokenIdentifier)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TokenIdentifier)
   }
 
   public interface TokenOrBuilder
@@ -1688,7 +1688,7 @@ public final class AuthenticationProtos {
     com.google.protobuf.ByteString getService();
   }
   /**
-   * Protobuf type {@code Token}
+   * Protobuf type {@code hbase.pb.Token}
    *
    * 
    * Serialization of the org.apache.hadoop.security.token.Token class
@@ -1772,12 +1772,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_Token_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_Token_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder.class);
     }
@@ -2040,7 +2040,7 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Token}
+     * Protobuf type {@code hbase.pb.Token}
      *
      * 
      * Serialization of the org.apache.hadoop.security.token.Token class
@@ -2052,12 +2052,12 @@ public final class AuthenticationProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_Token_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_Token_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder.class);
       }
@@ -2097,7 +2097,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_Token_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_Token_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token getDefaultInstanceForType() {
@@ -2312,7 +2312,7 @@ public final class AuthenticationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Token)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Token)
     }
 
     static {
@@ -2320,14 +2320,14 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Token)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Token)
   }
 
   public interface GetAuthenticationTokenRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code GetAuthenticationTokenRequest}
+   * Protobuf type {@code hbase.pb.GetAuthenticationTokenRequest}
    *
    * 
    * RPC request & response messages
@@ -2394,12 +2394,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenRequest.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenRequest.Builder.class);
     }
@@ -2550,7 +2550,7 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetAuthenticationTokenRequest}
+     * Protobuf type {@code hbase.pb.GetAuthenticationTokenRequest}
      *
      * 
      * RPC request & response messages
@@ -2561,12 +2561,12 @@ public final class AuthenticationProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenRequest.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenRequest.Builder.class);
       }
@@ -2600,7 +2600,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenRequest getDefaultInstanceForType() {
@@ -2658,7 +2658,7 @@ public final class AuthenticationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetAuthenticationTokenRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetAuthenticationTokenRequest)
     }
 
     static {
@@ -2666,28 +2666,28 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetAuthenticationTokenRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetAuthenticationTokenRequest)
   }
 
   public interface GetAuthenticationTokenResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .Token token = 1;
+    // optional .hbase.pb.Token token = 1;
     /**
-     * optional .Token token = 1;
+     * optional .hbase.pb.Token token = 1;
      */
     boolean hasToken();
     /**
-     * optional .Token token = 1;
+     * optional .hbase.pb.Token token = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token getToken();
     /**
-     * optional .Token token = 1;
+     * optional .hbase.pb.Token token = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder getTokenOrBuilder();
   }
   /**
-   * Protobuf type {@code GetAuthenticationTokenResponse}
+   * Protobuf type {@code hbase.pb.GetAuthenticationTokenResponse}
    */
   public static final class GetAuthenticationTokenResponse extends
       com.google.protobuf.GeneratedMessage
@@ -2764,12 +2764,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenResponse.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenResponse.Builder.class);
     }
@@ -2790,23 +2790,23 @@ public final class AuthenticationProtos {
     }
 
     private int bitField0_;
-    // optional .Token token = 1;
+    // optional .hbase.pb.Token token = 1;
     public static final int TOKEN_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token token_;
     /**
-     * optional .Token token = 1;
+     * optional .hbase.pb.Token token = 1;
      */
     public boolean hasToken() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .Token token = 1;
+     * optional .hbase.pb.Token token = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token getToken() {
       return token_;
     }
     /**
-     * optional .Token token = 1;
+     * optional .hbase.pb.Token token = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder getTokenOrBuilder() {
       return token_;
@@ -2960,19 +2960,19 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetAuthenticationTokenResponse}
+     * Protobuf type {@code hbase.pb.GetAuthenticationTokenResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenResponse.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenResponse.Builder.class);
       }
@@ -3013,7 +3013,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_GetAuthenticationTokenResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_GetAuthenticationTokenResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.GetAuthenticationTokenResponse getDefaultInstanceForType() {
@@ -3086,18 +3086,18 @@ public final class AuthenticationProtos {
       }
       private int bitField0_;
 
-      // optional .Token token = 1;
+      // optional .hbase.pb.Token token = 1;
       private org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token token_ = org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder> tokenBuilder_;
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public boolean hasToken() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token getToken() {
         if (tokenBuilder_ == null) {
@@ -3107,7 +3107,7 @@ public final class AuthenticationProtos {
         }
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public Builder setToken(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token value) {
         if (tokenBuilder_ == null) {
@@ -3123,7 +3123,7 @@ public final class AuthenticationProtos {
         return this;
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public Builder setToken(
           org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder builderForValue) {
@@ -3137,7 +3137,7 @@ public final class AuthenticationProtos {
         return this;
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public Builder mergeToken(org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token value) {
         if (tokenBuilder_ == null) {
@@ -3156,7 +3156,7 @@ public final class AuthenticationProtos {
         return this;
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public Builder clearToken() {
         if (tokenBuilder_ == null) {
@@ -3169,7 +3169,7 @@ public final class AuthenticationProtos {
         return this;
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder getTokenBuilder() {
         bitField0_ |= 0x00000001;
@@ -3177,7 +3177,7 @@ public final class AuthenticationProtos {
         return getTokenFieldBuilder().getBuilder();
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder getTokenOrBuilder() {
         if (tokenBuilder_ != null) {
@@ -3187,7 +3187,7 @@ public final class AuthenticationProtos {
         }
       }
       /**
-       * optional .Token token = 1;
+       * optional .hbase.pb.Token token = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.Token.Builder, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.TokenOrBuilder> 
@@ -3203,7 +3203,7 @@ public final class AuthenticationProtos {
         return tokenBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetAuthenticationTokenResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetAuthenticationTokenResponse)
     }
 
     static {
@@ -3211,14 +3211,14 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetAuthenticationTokenResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetAuthenticationTokenResponse)
   }
 
   public interface WhoAmIRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code WhoAmIRequest}
+   * Protobuf type {@code hbase.pb.WhoAmIRequest}
    */
   public static final class WhoAmIRequest extends
       com.google.protobuf.GeneratedMessage
@@ -3281,12 +3281,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIRequest.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIRequest.Builder.class);
     }
@@ -3437,19 +3437,19 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WhoAmIRequest}
+     * Protobuf type {@code hbase.pb.WhoAmIRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIRequest.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIRequest.Builder.class);
       }
@@ -3483,7 +3483,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIRequest getDefaultInstanceForType() {
@@ -3541,7 +3541,7 @@ public final class AuthenticationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WhoAmIRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WhoAmIRequest)
     }
 
     static {
@@ -3549,7 +3549,7 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WhoAmIRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WhoAmIRequest)
   }
 
   public interface WhoAmIResponseOrBuilder
@@ -3586,7 +3586,7 @@ public final class AuthenticationProtos {
         getAuthMethodBytes();
   }
   /**
-   * Protobuf type {@code WhoAmIResponse}
+   * Protobuf type {@code hbase.pb.WhoAmIResponse}
    */
   public static final class WhoAmIResponse extends
       com.google.protobuf.GeneratedMessage
@@ -3660,12 +3660,12 @@ public final class AuthenticationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIResponse.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIResponse.Builder.class);
     }
@@ -3937,19 +3937,19 @@ public final class AuthenticationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WhoAmIResponse}
+     * Protobuf type {@code hbase.pb.WhoAmIResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIResponse.class, org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIResponse.Builder.class);
       }
@@ -3987,7 +3987,7 @@ public final class AuthenticationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_WhoAmIResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.internal_static_hbase_pb_WhoAmIResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos.WhoAmIResponse getDefaultInstanceForType() {
@@ -4215,7 +4215,7 @@ public final class AuthenticationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WhoAmIResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WhoAmIResponse)
     }
 
     static {
@@ -4223,11 +4223,11 @@ public final class AuthenticationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WhoAmIResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WhoAmIResponse)
   }
 
   /**
-   * Protobuf service {@code AuthenticationService}
+   * Protobuf service {@code hbase.pb.AuthenticationService}
    *
    * 
    * RPC service
@@ -4239,7 +4239,7 @@ public final class AuthenticationProtos {
 
     public interface Interface {
       /**
-       * rpc GetAuthenticationToken(.GetAuthenticationTokenRequest) returns (.GetAuthenticationTokenResponse);
+       * rpc GetAuthenticationToken(.hbase.pb.GetAuthenticationTokenRequest) returns (.hbase.pb.GetAuthenticationTokenResponse);
        */
       public abstract void getAuthenticationToken(
           com.google.protobuf.RpcController controller,
@@ -4247,7 +4247,7 @@ public final class AuthenticationProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc WhoAmI(.WhoAmIRequest) returns (.WhoAmIResponse);
+       * rpc WhoAmI(.hbase.pb.WhoAmIRequest) returns (.hbase.pb.WhoAmIResponse);
        */
       public abstract void whoAmI(
           com.google.protobuf.RpcController controller,
@@ -4346,7 +4346,7 @@ public final class AuthenticationProtos {
     }
 
     /**
-     * rpc GetAuthenticationToken(.GetAuthenticationTokenRequest) returns (.GetAuthenticationTokenResponse);
+     * rpc GetAuthenticationToken(.hbase.pb.GetAuthenticationTokenRequest) returns (.hbase.pb.GetAuthenticationTokenResponse);
      */
     public abstract void getAuthenticationToken(
         com.google.protobuf.RpcController controller,
@@ -4354,7 +4354,7 @@ public final class AuthenticationProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc WhoAmI(.WhoAmIRequest) returns (.WhoAmIResponse);
+     * rpc WhoAmI(.hbase.pb.WhoAmIRequest) returns (.hbase.pb.WhoAmIResponse);
      */
     public abstract void whoAmI(
         com.google.protobuf.RpcController controller,
@@ -4530,44 +4530,44 @@ public final class AuthenticationProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:AuthenticationService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AuthenticationService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AuthenticationKey_descriptor;
+    internal_static_hbase_pb_AuthenticationKey_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AuthenticationKey_fieldAccessorTable;
+      internal_static_hbase_pb_AuthenticationKey_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TokenIdentifier_descriptor;
+    internal_static_hbase_pb_TokenIdentifier_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TokenIdentifier_fieldAccessorTable;
+      internal_static_hbase_pb_TokenIdentifier_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Token_descriptor;
+    internal_static_hbase_pb_Token_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Token_fieldAccessorTable;
+      internal_static_hbase_pb_Token_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetAuthenticationTokenRequest_descriptor;
+    internal_static_hbase_pb_GetAuthenticationTokenRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetAuthenticationTokenRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetAuthenticationTokenRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetAuthenticationTokenResponse_descriptor;
+    internal_static_hbase_pb_GetAuthenticationTokenResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetAuthenticationTokenResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetAuthenticationTokenResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WhoAmIRequest_descriptor;
+    internal_static_hbase_pb_WhoAmIRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WhoAmIRequest_fieldAccessorTable;
+      internal_static_hbase_pb_WhoAmIRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WhoAmIResponse_descriptor;
+    internal_static_hbase_pb_WhoAmIResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WhoAmIResponse_fieldAccessorTable;
+      internal_static_hbase_pb_WhoAmIResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -4577,72 +4577,74 @@ public final class AuthenticationProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024Authentication.proto\"E\n\021Authentication" +
-      "Key\022\n\n\002id\030\001 \002(\005\022\027\n\017expiration_date\030\002 \002(\003" +
-      "\022\013\n\003key\030\003 \002(\014\"\274\001\n\017TokenIdentifier\022#\n\004kin" +
-      "d\030\001 \002(\0162\025.TokenIdentifier.Kind\022\020\n\010userna" +
-      "me\030\002 \002(\014\022\016\n\006key_id\030\003 \002(\005\022\022\n\nissue_date\030\004" +
-      " \001(\003\022\027\n\017expiration_date\030\005 \001(\003\022\027\n\017sequenc" +
-      "e_number\030\006 \001(\003\"\034\n\004Kind\022\024\n\020HBASE_AUTH_TOK" +
-      "EN\020\000\">\n\005Token\022\022\n\nidentifier\030\001 \001(\014\022\020\n\010pas" +
-      "sword\030\002 \001(\014\022\017\n\007service\030\003 \001(\014\"\037\n\035GetAuthe" +
-      "nticationTokenRequest\"7\n\036GetAuthenticati",
-      "onTokenResponse\022\025\n\005token\030\001 \001(\0132\006.Token\"\017" +
-      "\n\rWhoAmIRequest\"7\n\016WhoAmIResponse\022\020\n\010use" +
-      "rname\030\001 \001(\t\022\023\n\013auth_method\030\002 \001(\t2\235\001\n\025Aut" +
-      "henticationService\022Y\n\026GetAuthenticationT" +
-      "oken\022\036.GetAuthenticationTokenRequest\032\037.G" +
-      "etAuthenticationTokenResponse\022)\n\006WhoAmI\022" +
-      "\016.WhoAmIRequest\032\017.WhoAmIResponseBJ\n*org." +
-      "apache.hadoop.hbase.protobuf.generatedB\024" +
-      "AuthenticationProtosH\001\210\001\001\240\001\001"
+      "\n\024Authentication.proto\022\010hbase.pb\"E\n\021Auth" +
+      "enticationKey\022\n\n\002id\030\001 \002(\005\022\027\n\017expiration_" +
+      "date\030\002 \002(\003\022\013\n\003key\030\003 \002(\014\"\305\001\n\017TokenIdentif" +
+      "ier\022,\n\004kind\030\001 \002(\0162\036.hbase.pb.TokenIdenti" +
+      "fier.Kind\022\020\n\010username\030\002 \002(\014\022\016\n\006key_id\030\003 " +
+      "\002(\005\022\022\n\nissue_date\030\004 \001(\003\022\027\n\017expiration_da" +
+      "te\030\005 \001(\003\022\027\n\017sequence_number\030\006 \001(\003\"\034\n\004Kin" +
+      "d\022\024\n\020HBASE_AUTH_TOKEN\020\000\">\n\005Token\022\022\n\niden" +
+      "tifier\030\001 \001(\014\022\020\n\010password\030\002 \001(\014\022\017\n\007servic" +
+      "e\030\003 \001(\014\"\037\n\035GetAuthenticationTokenRequest",
+      "\"@\n\036GetAuthenticationTokenResponse\022\036\n\005to" +
+      "ken\030\001 \001(\0132\017.hbase.pb.Token\"\017\n\rWhoAmIRequ" +
+      "est\"7\n\016WhoAmIResponse\022\020\n\010username\030\001 \001(\t\022" +
+      "\023\n\013auth_method\030\002 \001(\t2\301\001\n\025AuthenticationS" +
+      "ervice\022k\n\026GetAuthenticationToken\022\'.hbase" +
+      ".pb.GetAuthenticationTokenRequest\032(.hbas" +
+      "e.pb.GetAuthenticationTokenResponse\022;\n\006W" +
+      "hoAmI\022\027.hbase.pb.WhoAmIRequest\032\030.hbase.p" +
+      "b.WhoAmIResponseBJ\n*org.apache.hadoop.hb" +
+      "ase.protobuf.generatedB\024AuthenticationPr",
+      "otosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_AuthenticationKey_descriptor =
+          internal_static_hbase_pb_AuthenticationKey_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_AuthenticationKey_fieldAccessorTable = new
+          internal_static_hbase_pb_AuthenticationKey_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AuthenticationKey_descriptor,
+              internal_static_hbase_pb_AuthenticationKey_descriptor,
               new java.lang.String[] { "Id", "ExpirationDate", "Key", });
-          internal_static_TokenIdentifier_descriptor =
+          internal_static_hbase_pb_TokenIdentifier_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_TokenIdentifier_fieldAccessorTable = new
+          internal_static_hbase_pb_TokenIdentifier_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TokenIdentifier_descriptor,
+              internal_static_hbase_pb_TokenIdentifier_descriptor,
               new java.lang.String[] { "Kind", "Username", "KeyId", "IssueDate", "ExpirationDate", "SequenceNumber", });
-          internal_static_Token_descriptor =
+          internal_static_hbase_pb_Token_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_Token_fieldAccessorTable = new
+          internal_static_hbase_pb_Token_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Token_descriptor,
+              internal_static_hbase_pb_Token_descriptor,
               new java.lang.String[] { "Identifier", "Password", "Service", });
-          internal_static_GetAuthenticationTokenRequest_descriptor =
+          internal_static_hbase_pb_GetAuthenticationTokenRequest_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_GetAuthenticationTokenRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetAuthenticationTokenRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetAuthenticationTokenRequest_descriptor,
+              internal_static_hbase_pb_GetAuthenticationTokenRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_GetAuthenticationTokenResponse_descriptor =
+          internal_static_hbase_pb_GetAuthenticationTokenResponse_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_GetAuthenticationTokenResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetAuthenticationTokenResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetAuthenticationTokenResponse_descriptor,
+              internal_static_hbase_pb_GetAuthenticationTokenResponse_descriptor,
               new java.lang.String[] { "Token", });
-          internal_static_WhoAmIRequest_descriptor =
+          internal_static_hbase_pb_WhoAmIRequest_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_WhoAmIRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_WhoAmIRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WhoAmIRequest_descriptor,
+              internal_static_hbase_pb_WhoAmIRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_WhoAmIResponse_descriptor =
+          internal_static_hbase_pb_WhoAmIResponse_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_WhoAmIResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_WhoAmIResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WhoAmIResponse_descriptor,
+              internal_static_hbase_pb_WhoAmIResponse_descriptor,
               new java.lang.String[] { "Username", "AuthMethod", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/CellProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/CellProtos.java
index f5177dec7e2..7fc4706f796 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/CellProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/CellProtos.java
@@ -9,7 +9,7 @@ public final class CellProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code CellType}
+   * Protobuf enum {@code hbase.pb.CellType}
    *
    * 
    **
@@ -136,7 +136,7 @@ public final class CellProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:CellType)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.CellType)
   }
 
   public interface CellOrBuilder
@@ -182,13 +182,13 @@ public final class CellProtos {
      */
     long getTimestamp();
 
-    // optional .CellType cell_type = 5;
+    // optional .hbase.pb.CellType cell_type = 5;
     /**
-     * optional .CellType cell_type = 5;
+     * optional .hbase.pb.CellType cell_type = 5;
      */
     boolean hasCellType();
     /**
-     * optional .CellType cell_type = 5;
+     * optional .hbase.pb.CellType cell_type = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType getCellType();
 
@@ -213,7 +213,7 @@ public final class CellProtos {
     com.google.protobuf.ByteString getTags();
   }
   /**
-   * Protobuf type {@code Cell}
+   * Protobuf type {@code hbase.pb.Cell}
    *
    * 
    **
@@ -323,12 +323,12 @@ public final class CellProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_Cell_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_Cell_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.class, org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.Builder.class);
     }
@@ -413,17 +413,17 @@ public final class CellProtos {
       return timestamp_;
     }
 
-    // optional .CellType cell_type = 5;
+    // optional .hbase.pb.CellType cell_type = 5;
     public static final int CELL_TYPE_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType cellType_;
     /**
-     * optional .CellType cell_type = 5;
+     * optional .hbase.pb.CellType cell_type = 5;
      */
     public boolean hasCellType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .CellType cell_type = 5;
+     * optional .hbase.pb.CellType cell_type = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType getCellType() {
       return cellType_;
@@ -711,7 +711,7 @@ public final class CellProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Cell}
+     * Protobuf type {@code hbase.pb.Cell}
      *
      * 
      **
@@ -723,12 +723,12 @@ public final class CellProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_Cell_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_Cell_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.class, org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.Builder.class);
       }
@@ -776,7 +776,7 @@ public final class CellProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_Cell_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell getDefaultInstanceForType() {
@@ -1028,22 +1028,22 @@ public final class CellProtos {
         return this;
       }
 
-      // optional .CellType cell_type = 5;
+      // optional .hbase.pb.CellType cell_type = 5;
       private org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType cellType_ = org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType.MINIMUM;
       /**
-       * optional .CellType cell_type = 5;
+       * optional .hbase.pb.CellType cell_type = 5;
        */
       public boolean hasCellType() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .CellType cell_type = 5;
+       * optional .hbase.pb.CellType cell_type = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType getCellType() {
         return cellType_;
       }
       /**
-       * optional .CellType cell_type = 5;
+       * optional .hbase.pb.CellType cell_type = 5;
        */
       public Builder setCellType(org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType value) {
         if (value == null) {
@@ -1055,7 +1055,7 @@ public final class CellProtos {
         return this;
       }
       /**
-       * optional .CellType cell_type = 5;
+       * optional .hbase.pb.CellType cell_type = 5;
        */
       public Builder clearCellType() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -1136,7 +1136,7 @@ public final class CellProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Cell)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Cell)
     }
 
     static {
@@ -1144,7 +1144,7 @@ public final class CellProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Cell)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Cell)
   }
 
   public interface KeyValueOrBuilder
@@ -1190,13 +1190,13 @@ public final class CellProtos {
      */
     long getTimestamp();
 
-    // optional .CellType key_type = 5;
+    // optional .hbase.pb.CellType key_type = 5;
     /**
-     * optional .CellType key_type = 5;
+     * optional .hbase.pb.CellType key_type = 5;
      */
     boolean hasKeyType();
     /**
-     * optional .CellType key_type = 5;
+     * optional .hbase.pb.CellType key_type = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType getKeyType();
 
@@ -1221,7 +1221,7 @@ public final class CellProtos {
     com.google.protobuf.ByteString getTags();
   }
   /**
-   * Protobuf type {@code KeyValue}
+   * Protobuf type {@code hbase.pb.KeyValue}
    *
    * 
    **
@@ -1332,12 +1332,12 @@ public final class CellProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_KeyValue_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_KeyValue_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.CellProtos.KeyValue.class, org.apache.hadoop.hbase.protobuf.generated.CellProtos.KeyValue.Builder.class);
     }
@@ -1422,17 +1422,17 @@ public final class CellProtos {
       return timestamp_;
     }
 
-    // optional .CellType key_type = 5;
+    // optional .hbase.pb.CellType key_type = 5;
     public static final int KEY_TYPE_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType keyType_;
     /**
-     * optional .CellType key_type = 5;
+     * optional .hbase.pb.CellType key_type = 5;
      */
     public boolean hasKeyType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .CellType key_type = 5;
+     * optional .hbase.pb.CellType key_type = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType getKeyType() {
       return keyType_;
@@ -1732,7 +1732,7 @@ public final class CellProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code KeyValue}
+     * Protobuf type {@code hbase.pb.KeyValue}
      *
      * 
      **
@@ -1745,12 +1745,12 @@ public final class CellProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.CellProtos.KeyValueOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_KeyValue_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_KeyValue_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.CellProtos.KeyValue.class, org.apache.hadoop.hbase.protobuf.generated.CellProtos.KeyValue.Builder.class);
       }
@@ -1798,7 +1798,7 @@ public final class CellProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_KeyValue_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.CellProtos.KeyValue getDefaultInstanceForType() {
@@ -2062,22 +2062,22 @@ public final class CellProtos {
         return this;
       }
 
-      // optional .CellType key_type = 5;
+      // optional .hbase.pb.CellType key_type = 5;
       private org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType keyType_ = org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType.MINIMUM;
       /**
-       * optional .CellType key_type = 5;
+       * optional .hbase.pb.CellType key_type = 5;
        */
       public boolean hasKeyType() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .CellType key_type = 5;
+       * optional .hbase.pb.CellType key_type = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType getKeyType() {
         return keyType_;
       }
       /**
-       * optional .CellType key_type = 5;
+       * optional .hbase.pb.CellType key_type = 5;
        */
       public Builder setKeyType(org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellType value) {
         if (value == null) {
@@ -2089,7 +2089,7 @@ public final class CellProtos {
         return this;
       }
       /**
-       * optional .CellType key_type = 5;
+       * optional .hbase.pb.CellType key_type = 5;
        */
       public Builder clearKeyType() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -2170,7 +2170,7 @@ public final class CellProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:KeyValue)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.KeyValue)
     }
 
     static {
@@ -2178,19 +2178,19 @@ public final class CellProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:KeyValue)
+    // @@protoc_insertion_point(class_scope:hbase.pb.KeyValue)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Cell_descriptor;
+    internal_static_hbase_pb_Cell_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Cell_fieldAccessorTable;
+      internal_static_hbase_pb_Cell_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_KeyValue_descriptor;
+    internal_static_hbase_pb_KeyValue_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_KeyValue_fieldAccessorTable;
+      internal_static_hbase_pb_KeyValue_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2200,35 +2200,35 @@ public final class CellProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\nCell.proto\"\204\001\n\004Cell\022\013\n\003row\030\001 \001(\014\022\016\n\006fa" +
-      "mily\030\002 \001(\014\022\021\n\tqualifier\030\003 \001(\014\022\021\n\ttimesta" +
-      "mp\030\004 \001(\004\022\034\n\tcell_type\030\005 \001(\0162\t.CellType\022\r" +
-      "\n\005value\030\006 \001(\014\022\014\n\004tags\030\007 \001(\014\"\207\001\n\010KeyValue" +
-      "\022\013\n\003row\030\001 \002(\014\022\016\n\006family\030\002 \002(\014\022\021\n\tqualifi" +
-      "er\030\003 \002(\014\022\021\n\ttimestamp\030\004 \001(\004\022\033\n\010key_type\030" +
-      "\005 \001(\0162\t.CellType\022\r\n\005value\030\006 \001(\014\022\014\n\004tags\030" +
-      "\007 \001(\014*`\n\010CellType\022\013\n\007MINIMUM\020\000\022\007\n\003PUT\020\004\022" +
-      "\n\n\006DELETE\020\010\022\021\n\rDELETE_COLUMN\020\014\022\021\n\rDELETE" +
-      "_FAMILY\020\016\022\014\n\007MAXIMUM\020\377\001B=\n*org.apache.ha",
-      "doop.hbase.protobuf.generatedB\nCellProto" +
-      "sH\001\240\001\001"
+      "\n\nCell.proto\022\010hbase.pb\"\215\001\n\004Cell\022\013\n\003row\030\001" +
+      " \001(\014\022\016\n\006family\030\002 \001(\014\022\021\n\tqualifier\030\003 \001(\014\022" +
+      "\021\n\ttimestamp\030\004 \001(\004\022%\n\tcell_type\030\005 \001(\0162\022." +
+      "hbase.pb.CellType\022\r\n\005value\030\006 \001(\014\022\014\n\004tags" +
+      "\030\007 \001(\014\"\220\001\n\010KeyValue\022\013\n\003row\030\001 \002(\014\022\016\n\006fami" +
+      "ly\030\002 \002(\014\022\021\n\tqualifier\030\003 \002(\014\022\021\n\ttimestamp" +
+      "\030\004 \001(\004\022$\n\010key_type\030\005 \001(\0162\022.hbase.pb.Cell" +
+      "Type\022\r\n\005value\030\006 \001(\014\022\014\n\004tags\030\007 \001(\014*`\n\010Cel" +
+      "lType\022\013\n\007MINIMUM\020\000\022\007\n\003PUT\020\004\022\n\n\006DELETE\020\010\022" +
+      "\021\n\rDELETE_COLUMN\020\014\022\021\n\rDELETE_FAMILY\020\016\022\014\n",
+      "\007MAXIMUM\020\377\001B=\n*org.apache.hadoop.hbase.p" +
+      "rotobuf.generatedB\nCellProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_Cell_descriptor =
+          internal_static_hbase_pb_Cell_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_Cell_fieldAccessorTable = new
+          internal_static_hbase_pb_Cell_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Cell_descriptor,
+              internal_static_hbase_pb_Cell_descriptor,
               new java.lang.String[] { "Row", "Family", "Qualifier", "Timestamp", "CellType", "Value", "Tags", });
-          internal_static_KeyValue_descriptor =
+          internal_static_hbase_pb_KeyValue_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_KeyValue_fieldAccessorTable = new
+          internal_static_hbase_pb_KeyValue_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_KeyValue_descriptor,
+              internal_static_hbase_pb_KeyValue_descriptor,
               new java.lang.String[] { "Row", "Family", "Qualifier", "Timestamp", "KeyType", "Value", "Tags", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java
index 55767c773c7..c90a6252fef 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java
@@ -9,7 +9,7 @@ public final class ClientProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code Consistency}
+   * Protobuf enum {@code hbase.pb.Consistency}
    *
    * 
    **
@@ -92,7 +92,7 @@ public final class ClientProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:Consistency)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.Consistency)
   }
 
   public interface AuthorizationsOrBuilder
@@ -119,7 +119,7 @@ public final class ClientProtos {
         getLabelBytes(int index);
   }
   /**
-   * Protobuf type {@code Authorizations}
+   * Protobuf type {@code hbase.pb.Authorizations}
    *
    * 
    **
@@ -199,12 +199,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Authorizations_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Authorizations_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Authorizations_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Authorizations_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Authorizations.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Authorizations.Builder.class);
     }
@@ -404,7 +404,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Authorizations}
+     * Protobuf type {@code hbase.pb.Authorizations}
      *
      * 
      **
@@ -416,12 +416,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.AuthorizationsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Authorizations_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Authorizations_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Authorizations_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Authorizations_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Authorizations.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Authorizations.Builder.class);
       }
@@ -457,7 +457,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Authorizations_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Authorizations_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Authorizations getDefaultInstanceForType() {
@@ -626,7 +626,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Authorizations)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Authorizations)
     }
 
     static {
@@ -634,7 +634,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Authorizations)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Authorizations)
   }
 
   public interface CellVisibilityOrBuilder
@@ -656,7 +656,7 @@ public final class ClientProtos {
         getExpressionBytes();
   }
   /**
-   * Protobuf type {@code CellVisibility}
+   * Protobuf type {@code hbase.pb.CellVisibility}
    *
    * 
    **
@@ -730,12 +730,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CellVisibility_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CellVisibility_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CellVisibility_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CellVisibility_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CellVisibility.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CellVisibility.Builder.class);
     }
@@ -951,7 +951,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CellVisibility}
+     * Protobuf type {@code hbase.pb.CellVisibility}
      *
      * 
      **
@@ -963,12 +963,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CellVisibilityOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CellVisibility_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CellVisibility_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CellVisibility_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CellVisibility_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CellVisibility.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CellVisibility.Builder.class);
       }
@@ -1004,7 +1004,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CellVisibility_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CellVisibility_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CellVisibility getDefaultInstanceForType() {
@@ -1153,7 +1153,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CellVisibility)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CellVisibility)
     }
 
     static {
@@ -1161,7 +1161,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CellVisibility)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CellVisibility)
   }
 
   public interface ColumnOrBuilder
@@ -1192,7 +1192,7 @@ public final class ClientProtos {
     com.google.protobuf.ByteString getQualifier(int index);
   }
   /**
-   * Protobuf type {@code Column}
+   * Protobuf type {@code hbase.pb.Column}
    *
    * 
    **
@@ -1277,12 +1277,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Column_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Column_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Column_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Column_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder.class);
     }
@@ -1513,7 +1513,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Column}
+     * Protobuf type {@code hbase.pb.Column}
      *
      * 
      **
@@ -1525,12 +1525,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Column_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Column_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Column_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Column_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder.class);
       }
@@ -1568,7 +1568,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Column_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Column_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getDefaultInstanceForType() {
@@ -1764,7 +1764,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Column)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Column)
     }
 
     static {
@@ -1772,7 +1772,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Column)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Column)
   }
 
   public interface GetOrBuilder
@@ -1788,81 +1788,81 @@ public final class ClientProtos {
      */
     com.google.protobuf.ByteString getRow();
 
-    // repeated .Column column = 2;
+    // repeated .hbase.pb.Column column = 2;
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     java.util.List 
         getColumnList();
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getColumn(int index);
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     int getColumnCount();
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     java.util.List 
         getColumnOrBuilderList();
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder getColumnOrBuilder(
         int index);
 
-    // repeated .NameBytesPair attribute = 3;
+    // repeated .hbase.pb.NameBytesPair attribute = 3;
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     java.util.List 
         getAttributeList();
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index);
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     int getAttributeCount();
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     java.util.List 
         getAttributeOrBuilderList();
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index);
 
-    // optional .Filter filter = 4;
+    // optional .hbase.pb.Filter filter = 4;
     /**
-     * optional .Filter filter = 4;
+     * optional .hbase.pb.Filter filter = 4;
      */
     boolean hasFilter();
     /**
-     * optional .Filter filter = 4;
+     * optional .hbase.pb.Filter filter = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter();
     /**
-     * optional .Filter filter = 4;
+     * optional .hbase.pb.Filter filter = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder();
 
-    // optional .TimeRange time_range = 5;
+    // optional .hbase.pb.TimeRange time_range = 5;
     /**
-     * optional .TimeRange time_range = 5;
+     * optional .hbase.pb.TimeRange time_range = 5;
      */
     boolean hasTimeRange();
     /**
-     * optional .TimeRange time_range = 5;
+     * optional .hbase.pb.TimeRange time_range = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange();
     /**
-     * optional .TimeRange time_range = 5;
+     * optional .hbase.pb.TimeRange time_range = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder();
 
@@ -1946,18 +1946,18 @@ public final class ClientProtos {
      */
     boolean getClosestRowBefore();
 
-    // optional .Consistency consistency = 12 [default = STRONG];
+    // optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
     /**
-     * optional .Consistency consistency = 12 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
      */
     boolean hasConsistency();
     /**
-     * optional .Consistency consistency = 12 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency getConsistency();
   }
   /**
-   * Protobuf type {@code Get}
+   * Protobuf type {@code hbase.pb.Get}
    *
    * 
    **
@@ -2123,12 +2123,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Get_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Get_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Get_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Get_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder.class);
     }
@@ -2165,117 +2165,117 @@ public final class ClientProtos {
       return row_;
     }
 
-    // repeated .Column column = 2;
+    // repeated .hbase.pb.Column column = 2;
     public static final int COLUMN_FIELD_NUMBER = 2;
     private java.util.List column_;
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     public java.util.List getColumnList() {
       return column_;
     }
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     public java.util.List 
         getColumnOrBuilderList() {
       return column_;
     }
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     public int getColumnCount() {
       return column_.size();
     }
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getColumn(int index) {
       return column_.get(index);
     }
     /**
-     * repeated .Column column = 2;
+     * repeated .hbase.pb.Column column = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder getColumnOrBuilder(
         int index) {
       return column_.get(index);
     }
 
-    // repeated .NameBytesPair attribute = 3;
+    // repeated .hbase.pb.NameBytesPair attribute = 3;
     public static final int ATTRIBUTE_FIELD_NUMBER = 3;
     private java.util.List attribute_;
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     public java.util.List getAttributeList() {
       return attribute_;
     }
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     public java.util.List 
         getAttributeOrBuilderList() {
       return attribute_;
     }
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     public int getAttributeCount() {
       return attribute_.size();
     }
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index) {
       return attribute_.get(index);
     }
     /**
-     * repeated .NameBytesPair attribute = 3;
+     * repeated .hbase.pb.NameBytesPair attribute = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index) {
       return attribute_.get(index);
     }
 
-    // optional .Filter filter = 4;
+    // optional .hbase.pb.Filter filter = 4;
     public static final int FILTER_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_;
     /**
-     * optional .Filter filter = 4;
+     * optional .hbase.pb.Filter filter = 4;
      */
     public boolean hasFilter() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .Filter filter = 4;
+     * optional .hbase.pb.Filter filter = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
       return filter_;
     }
     /**
-     * optional .Filter filter = 4;
+     * optional .hbase.pb.Filter filter = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
       return filter_;
     }
 
-    // optional .TimeRange time_range = 5;
+    // optional .hbase.pb.TimeRange time_range = 5;
     public static final int TIME_RANGE_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange timeRange_;
     /**
-     * optional .TimeRange time_range = 5;
+     * optional .hbase.pb.TimeRange time_range = 5;
      */
     public boolean hasTimeRange() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .TimeRange time_range = 5;
+     * optional .hbase.pb.TimeRange time_range = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange() {
       return timeRange_;
     }
     /**
-     * optional .TimeRange time_range = 5;
+     * optional .hbase.pb.TimeRange time_range = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder() {
       return timeRange_;
@@ -2397,17 +2397,17 @@ public final class ClientProtos {
       return closestRowBefore_;
     }
 
-    // optional .Consistency consistency = 12 [default = STRONG];
+    // optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
     public static final int CONSISTENCY_FIELD_NUMBER = 12;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency consistency_;
     /**
-     * optional .Consistency consistency = 12 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
      */
     public boolean hasConsistency() {
       return ((bitField0_ & 0x00000200) == 0x00000200);
     }
     /**
-     * optional .Consistency consistency = 12 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency getConsistency() {
       return consistency_;
@@ -2764,7 +2764,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Get}
+     * Protobuf type {@code hbase.pb.Get}
      *
      * 
      **
@@ -2779,12 +2779,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Get_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Get_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Get_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Get_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder.class);
       }
@@ -2862,7 +2862,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Get_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Get_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getDefaultInstanceForType() {
@@ -3130,7 +3130,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // repeated .Column column = 2;
+      // repeated .hbase.pb.Column column = 2;
       private java.util.List column_ =
         java.util.Collections.emptyList();
       private void ensureColumnIsMutable() {
@@ -3144,7 +3144,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder> columnBuilder_;
 
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public java.util.List getColumnList() {
         if (columnBuilder_ == null) {
@@ -3154,7 +3154,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public int getColumnCount() {
         if (columnBuilder_ == null) {
@@ -3164,7 +3164,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getColumn(int index) {
         if (columnBuilder_ == null) {
@@ -3174,7 +3174,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder setColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column value) {
@@ -3191,7 +3191,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder setColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder builderForValue) {
@@ -3205,7 +3205,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder addColumn(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column value) {
         if (columnBuilder_ == null) {
@@ -3221,7 +3221,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder addColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column value) {
@@ -3238,7 +3238,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder addColumn(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder builderForValue) {
@@ -3252,7 +3252,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder addColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder builderForValue) {
@@ -3266,7 +3266,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder addAllColumn(
           java.lang.Iterable values) {
@@ -3280,7 +3280,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder clearColumn() {
         if (columnBuilder_ == null) {
@@ -3293,7 +3293,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public Builder removeColumn(int index) {
         if (columnBuilder_ == null) {
@@ -3306,14 +3306,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder getColumnBuilder(
           int index) {
         return getColumnFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder getColumnOrBuilder(
           int index) {
@@ -3323,7 +3323,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public java.util.List 
            getColumnOrBuilderList() {
@@ -3334,14 +3334,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder addColumnBuilder() {
         return getColumnFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.getDefaultInstance());
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder addColumnBuilder(
           int index) {
@@ -3349,7 +3349,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.getDefaultInstance());
       }
       /**
-       * repeated .Column column = 2;
+       * repeated .hbase.pb.Column column = 2;
        */
       public java.util.List 
            getColumnBuilderList() {
@@ -3370,7 +3370,7 @@ public final class ClientProtos {
         return columnBuilder_;
       }
 
-      // repeated .NameBytesPair attribute = 3;
+      // repeated .hbase.pb.NameBytesPair attribute = 3;
       private java.util.List attribute_ =
         java.util.Collections.emptyList();
       private void ensureAttributeIsMutable() {
@@ -3384,7 +3384,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> attributeBuilder_;
 
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public java.util.List getAttributeList() {
         if (attributeBuilder_ == null) {
@@ -3394,7 +3394,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public int getAttributeCount() {
         if (attributeBuilder_ == null) {
@@ -3404,7 +3404,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index) {
         if (attributeBuilder_ == null) {
@@ -3414,7 +3414,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder setAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
@@ -3431,7 +3431,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder setAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -3445,7 +3445,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder addAttribute(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (attributeBuilder_ == null) {
@@ -3461,7 +3461,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder addAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
@@ -3478,7 +3478,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder addAttribute(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -3492,7 +3492,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder addAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -3506,7 +3506,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder addAllAttribute(
           java.lang.Iterable values) {
@@ -3520,7 +3520,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder clearAttribute() {
         if (attributeBuilder_ == null) {
@@ -3533,7 +3533,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public Builder removeAttribute(int index) {
         if (attributeBuilder_ == null) {
@@ -3546,14 +3546,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder getAttributeBuilder(
           int index) {
         return getAttributeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
           int index) {
@@ -3563,7 +3563,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public java.util.List 
            getAttributeOrBuilderList() {
@@ -3574,14 +3574,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder addAttributeBuilder() {
         return getAttributeFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder addAttributeBuilder(
           int index) {
@@ -3589,7 +3589,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .NameBytesPair attribute = 3;
+       * repeated .hbase.pb.NameBytesPair attribute = 3;
        */
       public java.util.List 
            getAttributeBuilderList() {
@@ -3610,18 +3610,18 @@ public final class ClientProtos {
         return attributeBuilder_;
       }
 
-      // optional .Filter filter = 4;
+      // optional .hbase.pb.Filter filter = 4;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> filterBuilder_;
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public boolean hasFilter() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
         if (filterBuilder_ == null) {
@@ -3631,7 +3631,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public Builder setFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -3647,7 +3647,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public Builder setFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -3661,7 +3661,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public Builder mergeFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -3680,7 +3680,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public Builder clearFilter() {
         if (filterBuilder_ == null) {
@@ -3693,7 +3693,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder getFilterBuilder() {
         bitField0_ |= 0x00000008;
@@ -3701,7 +3701,7 @@ public final class ClientProtos {
         return getFilterFieldBuilder().getBuilder();
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
         if (filterBuilder_ != null) {
@@ -3711,7 +3711,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Filter filter = 4;
+       * optional .hbase.pb.Filter filter = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> 
@@ -3727,18 +3727,18 @@ public final class ClientProtos {
         return filterBuilder_;
       }
 
-      // optional .TimeRange time_range = 5;
+      // optional .hbase.pb.TimeRange time_range = 5;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange timeRange_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder> timeRangeBuilder_;
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public boolean hasTimeRange() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange() {
         if (timeRangeBuilder_ == null) {
@@ -3748,7 +3748,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public Builder setTimeRange(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange value) {
         if (timeRangeBuilder_ == null) {
@@ -3764,7 +3764,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public Builder setTimeRange(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder builderForValue) {
@@ -3778,7 +3778,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public Builder mergeTimeRange(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange value) {
         if (timeRangeBuilder_ == null) {
@@ -3797,7 +3797,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public Builder clearTimeRange() {
         if (timeRangeBuilder_ == null) {
@@ -3810,7 +3810,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder getTimeRangeBuilder() {
         bitField0_ |= 0x00000010;
@@ -3818,7 +3818,7 @@ public final class ClientProtos {
         return getTimeRangeFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder() {
         if (timeRangeBuilder_ != null) {
@@ -3828,7 +3828,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .TimeRange time_range = 5;
+       * optional .hbase.pb.TimeRange time_range = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder> 
@@ -4082,22 +4082,22 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .Consistency consistency = 12 [default = STRONG];
+      // optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency consistency_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency.STRONG;
       /**
-       * optional .Consistency consistency = 12 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
        */
       public boolean hasConsistency() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
       /**
-       * optional .Consistency consistency = 12 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency getConsistency() {
         return consistency_;
       }
       /**
-       * optional .Consistency consistency = 12 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
        */
       public Builder setConsistency(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency value) {
         if (value == null) {
@@ -4109,7 +4109,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Consistency consistency = 12 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 12 [default = STRONG];
        */
       public Builder clearConsistency() {
         bitField0_ = (bitField0_ & ~0x00000800);
@@ -4118,7 +4118,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Get)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Get)
     }
 
     static {
@@ -4126,15 +4126,15 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Get)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Get)
   }
 
   public interface ResultOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .Cell cell = 1;
+    // repeated .hbase.pb.Cell cell = 1;
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4144,7 +4144,7 @@ public final class ClientProtos {
     java.util.List 
         getCellList();
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4153,7 +4153,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell getCell(int index);
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4162,7 +4162,7 @@ public final class ClientProtos {
      */
     int getCellCount();
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4172,7 +4172,7 @@ public final class ClientProtos {
     java.util.List 
         getCellOrBuilderList();
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4273,7 +4273,7 @@ public final class ClientProtos {
     boolean getPartial();
   }
   /**
-   * Protobuf type {@code Result}
+   * Protobuf type {@code hbase.pb.Result}
    */
   public static final class Result extends
       com.google.protobuf.GeneratedMessage
@@ -4368,12 +4368,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Result_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Result_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Result_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Result_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder.class);
     }
@@ -4394,11 +4394,11 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // repeated .Cell cell = 1;
+    // repeated .hbase.pb.Cell cell = 1;
     public static final int CELL_FIELD_NUMBER = 1;
     private java.util.List cell_;
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4409,7 +4409,7 @@ public final class ClientProtos {
       return cell_;
     }
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4421,7 +4421,7 @@ public final class ClientProtos {
       return cell_;
     }
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4432,7 +4432,7 @@ public final class ClientProtos {
       return cell_.size();
     }
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4443,7 +4443,7 @@ public final class ClientProtos {
       return cell_.get(index);
     }
     /**
-     * repeated .Cell cell = 1;
+     * repeated .hbase.pb.Cell cell = 1;
      *
      * 
      * Result includes the Cells or else it just has a count of Cells
@@ -4782,19 +4782,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Result}
+     * Protobuf type {@code hbase.pb.Result}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Result_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Result_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Result_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Result_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder.class);
       }
@@ -4843,7 +4843,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Result_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Result_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getDefaultInstanceForType() {
@@ -4968,7 +4968,7 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // repeated .Cell cell = 1;
+      // repeated .hbase.pb.Cell cell = 1;
       private java.util.List cell_ =
         java.util.Collections.emptyList();
       private void ensureCellIsMutable() {
@@ -4982,7 +4982,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell, org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.Builder, org.apache.hadoop.hbase.protobuf.generated.CellProtos.CellOrBuilder> cellBuilder_;
 
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -4997,7 +4997,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5012,7 +5012,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5027,7 +5027,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5049,7 +5049,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5068,7 +5068,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5089,7 +5089,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5111,7 +5111,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5130,7 +5130,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5149,7 +5149,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5168,7 +5168,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5186,7 +5186,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5204,7 +5204,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5216,7 +5216,7 @@ public final class ClientProtos {
         return getCellFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5231,7 +5231,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5247,7 +5247,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5259,7 +5259,7 @@ public final class ClientProtos {
             org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.getDefaultInstance());
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5272,7 +5272,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.CellProtos.Cell.getDefaultInstance());
       }
       /**
-       * repeated .Cell cell = 1;
+       * repeated .hbase.pb.Cell cell = 1;
        *
        * 
        * Result includes the Cells or else it just has a count of Cells
@@ -5530,7 +5530,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Result)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Result)
     }
 
     static {
@@ -5538,42 +5538,42 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Result)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Result)
   }
 
   public interface GetRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // required .Get get = 2;
+    // required .hbase.pb.Get get = 2;
     /**
-     * required .Get get = 2;
+     * required .hbase.pb.Get get = 2;
      */
     boolean hasGet();
     /**
-     * required .Get get = 2;
+     * required .hbase.pb.Get get = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getGet();
     /**
-     * required .Get get = 2;
+     * required .hbase.pb.Get get = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder getGetOrBuilder();
   }
   /**
-   * Protobuf type {@code GetRequest}
+   * Protobuf type {@code hbase.pb.GetRequest}
    *
    * 
    **
@@ -5668,12 +5668,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest.Builder.class);
     }
@@ -5694,45 +5694,45 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // required .Get get = 2;
+    // required .hbase.pb.Get get = 2;
     public static final int GET_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get get_;
     /**
-     * required .Get get = 2;
+     * required .hbase.pb.Get get = 2;
      */
     public boolean hasGet() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .Get get = 2;
+     * required .hbase.pb.Get get = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getGet() {
       return get_;
     }
     /**
-     * required .Get get = 2;
+     * required .hbase.pb.Get get = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder getGetOrBuilder() {
       return get_;
@@ -5919,7 +5919,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetRequest}
+     * Protobuf type {@code hbase.pb.GetRequest}
      *
      * 
      **
@@ -5931,12 +5931,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest.Builder.class);
       }
@@ -5984,7 +5984,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest getDefaultInstanceForType() {
@@ -6084,18 +6084,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -6105,7 +6105,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -6121,7 +6121,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -6135,7 +6135,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -6154,7 +6154,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -6167,7 +6167,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -6175,7 +6175,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -6185,7 +6185,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -6201,18 +6201,18 @@ public final class ClientProtos {
         return regionBuilder_;
       }
 
-      // required .Get get = 2;
+      // required .hbase.pb.Get get = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get get_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder> getBuilder_;
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public boolean hasGet() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getGet() {
         if (getBuilder_ == null) {
@@ -6222,7 +6222,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public Builder setGet(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get value) {
         if (getBuilder_ == null) {
@@ -6238,7 +6238,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public Builder setGet(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder builderForValue) {
@@ -6252,7 +6252,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public Builder mergeGet(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get value) {
         if (getBuilder_ == null) {
@@ -6271,7 +6271,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public Builder clearGet() {
         if (getBuilder_ == null) {
@@ -6284,7 +6284,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder getGetBuilder() {
         bitField0_ |= 0x00000002;
@@ -6292,7 +6292,7 @@ public final class ClientProtos {
         return getGetFieldBuilder().getBuilder();
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder getGetOrBuilder() {
         if (getBuilder_ != null) {
@@ -6302,7 +6302,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .Get get = 2;
+       * required .hbase.pb.Get get = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder> 
@@ -6318,7 +6318,7 @@ public final class ClientProtos {
         return getBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetRequest)
     }
 
     static {
@@ -6326,28 +6326,28 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetRequest)
   }
 
   public interface GetResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .Result result = 1;
+    // optional .hbase.pb.Result result = 1;
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     boolean hasResult();
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult();
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder();
   }
   /**
-   * Protobuf type {@code GetResponse}
+   * Protobuf type {@code hbase.pb.GetResponse}
    */
   public static final class GetResponse extends
       com.google.protobuf.GeneratedMessage
@@ -6424,12 +6424,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse.Builder.class);
     }
@@ -6450,23 +6450,23 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // optional .Result result = 1;
+    // optional .hbase.pb.Result result = 1;
     public static final int RESULT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result_;
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     public boolean hasResult() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult() {
       return result_;
     }
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder() {
       return result_;
@@ -6620,19 +6620,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetResponse}
+     * Protobuf type {@code hbase.pb.GetResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse.Builder.class);
       }
@@ -6673,7 +6673,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_GetResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_GetResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse getDefaultInstanceForType() {
@@ -6746,18 +6746,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // optional .Result result = 1;
+      // optional .hbase.pb.Result result = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> resultBuilder_;
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public boolean hasResult() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult() {
         if (resultBuilder_ == null) {
@@ -6767,7 +6767,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder setResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result value) {
         if (resultBuilder_ == null) {
@@ -6783,7 +6783,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder setResult(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder builderForValue) {
@@ -6797,7 +6797,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder mergeResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result value) {
         if (resultBuilder_ == null) {
@@ -6816,7 +6816,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder clearResult() {
         if (resultBuilder_ == null) {
@@ -6829,7 +6829,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder getResultBuilder() {
         bitField0_ |= 0x00000001;
@@ -6837,7 +6837,7 @@ public final class ClientProtos {
         return getResultFieldBuilder().getBuilder();
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder() {
         if (resultBuilder_ != null) {
@@ -6847,7 +6847,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> 
@@ -6863,7 +6863,7 @@ public final class ClientProtos {
         return resultBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetResponse)
     }
 
     static {
@@ -6871,7 +6871,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetResponse)
   }
 
   public interface ConditionOrBuilder
@@ -6907,32 +6907,32 @@ public final class ClientProtos {
      */
     com.google.protobuf.ByteString getQualifier();
 
-    // required .CompareType compare_type = 4;
+    // required .hbase.pb.CompareType compare_type = 4;
     /**
-     * required .CompareType compare_type = 4;
+     * required .hbase.pb.CompareType compare_type = 4;
      */
     boolean hasCompareType();
     /**
-     * required .CompareType compare_type = 4;
+     * required .hbase.pb.CompareType compare_type = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareType();
 
-    // required .Comparator comparator = 5;
+    // required .hbase.pb.Comparator comparator = 5;
     /**
-     * required .Comparator comparator = 5;
+     * required .hbase.pb.Comparator comparator = 5;
      */
     boolean hasComparator();
     /**
-     * required .Comparator comparator = 5;
+     * required .hbase.pb.Comparator comparator = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator();
     /**
-     * required .Comparator comparator = 5;
+     * required .hbase.pb.Comparator comparator = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder();
   }
   /**
-   * Protobuf type {@code Condition}
+   * Protobuf type {@code hbase.pb.Condition}
    *
    * 
    **
@@ -7043,12 +7043,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Condition_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Condition_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Condition_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Condition_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder.class);
     }
@@ -7117,39 +7117,39 @@ public final class ClientProtos {
       return qualifier_;
     }
 
-    // required .CompareType compare_type = 4;
+    // required .hbase.pb.CompareType compare_type = 4;
     public static final int COMPARE_TYPE_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType compareType_;
     /**
-     * required .CompareType compare_type = 4;
+     * required .hbase.pb.CompareType compare_type = 4;
      */
     public boolean hasCompareType() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * required .CompareType compare_type = 4;
+     * required .hbase.pb.CompareType compare_type = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareType() {
       return compareType_;
     }
 
-    // required .Comparator comparator = 5;
+    // required .hbase.pb.Comparator comparator = 5;
     public static final int COMPARATOR_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator comparator_;
     /**
-     * required .Comparator comparator = 5;
+     * required .hbase.pb.Comparator comparator = 5;
      */
     public boolean hasComparator() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * required .Comparator comparator = 5;
+     * required .hbase.pb.Comparator comparator = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator() {
       return comparator_;
     }
     /**
-     * required .Comparator comparator = 5;
+     * required .hbase.pb.Comparator comparator = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder() {
       return comparator_;
@@ -7395,7 +7395,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Condition}
+     * Protobuf type {@code hbase.pb.Condition}
      *
      * 
      **
@@ -7410,12 +7410,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Condition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Condition_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Condition_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Condition_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder.class);
       }
@@ -7464,7 +7464,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Condition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Condition_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getDefaultInstanceForType() {
@@ -7697,22 +7697,22 @@ public final class ClientProtos {
         return this;
       }
 
-      // required .CompareType compare_type = 4;
+      // required .hbase.pb.CompareType compare_type = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType compareType_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType.LESS;
       /**
-       * required .CompareType compare_type = 4;
+       * required .hbase.pb.CompareType compare_type = 4;
        */
       public boolean hasCompareType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * required .CompareType compare_type = 4;
+       * required .hbase.pb.CompareType compare_type = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareType() {
         return compareType_;
       }
       /**
-       * required .CompareType compare_type = 4;
+       * required .hbase.pb.CompareType compare_type = 4;
        */
       public Builder setCompareType(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType value) {
         if (value == null) {
@@ -7724,7 +7724,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .CompareType compare_type = 4;
+       * required .hbase.pb.CompareType compare_type = 4;
        */
       public Builder clearCompareType() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -7733,18 +7733,18 @@ public final class ClientProtos {
         return this;
       }
 
-      // required .Comparator comparator = 5;
+      // required .hbase.pb.Comparator comparator = 5;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator comparator_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder> comparatorBuilder_;
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public boolean hasComparator() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator() {
         if (comparatorBuilder_ == null) {
@@ -7754,7 +7754,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public Builder setComparator(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator value) {
         if (comparatorBuilder_ == null) {
@@ -7770,7 +7770,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public Builder setComparator(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder builderForValue) {
@@ -7784,7 +7784,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public Builder mergeComparator(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator value) {
         if (comparatorBuilder_ == null) {
@@ -7803,7 +7803,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public Builder clearComparator() {
         if (comparatorBuilder_ == null) {
@@ -7816,7 +7816,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder getComparatorBuilder() {
         bitField0_ |= 0x00000010;
@@ -7824,7 +7824,7 @@ public final class ClientProtos {
         return getComparatorFieldBuilder().getBuilder();
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder() {
         if (comparatorBuilder_ != null) {
@@ -7834,7 +7834,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .Comparator comparator = 5;
+       * required .hbase.pb.Comparator comparator = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder> 
@@ -7850,7 +7850,7 @@ public final class ClientProtos {
         return comparatorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:Condition)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Condition)
     }
 
     static {
@@ -7858,7 +7858,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Condition)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Condition)
   }
 
   public interface MutationProtoOrBuilder
@@ -7874,37 +7874,37 @@ public final class ClientProtos {
      */
     com.google.protobuf.ByteString getRow();
 
-    // optional .MutationProto.MutationType mutate_type = 2;
+    // optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
     /**
-     * optional .MutationProto.MutationType mutate_type = 2;
+     * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
      */
     boolean hasMutateType();
     /**
-     * optional .MutationProto.MutationType mutate_type = 2;
+     * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType getMutateType();
 
-    // repeated .MutationProto.ColumnValue column_value = 3;
+    // repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     java.util.List 
         getColumnValueList();
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getColumnValue(int index);
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     int getColumnValueCount();
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     java.util.List 
         getColumnValueOrBuilderList();
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder getColumnValueOrBuilder(
         int index);
@@ -7919,44 +7919,44 @@ public final class ClientProtos {
      */
     long getTimestamp();
 
-    // repeated .NameBytesPair attribute = 5;
+    // repeated .hbase.pb.NameBytesPair attribute = 5;
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     java.util.List 
         getAttributeList();
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index);
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     int getAttributeCount();
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     java.util.List 
         getAttributeOrBuilderList();
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index);
 
-    // optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+    // optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
     /**
-     * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+     * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
      */
     boolean hasDurability();
     /**
-     * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+     * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability getDurability();
 
-    // optional .TimeRange time_range = 7;
+    // optional .hbase.pb.TimeRange time_range = 7;
     /**
-     * optional .TimeRange time_range = 7;
+     * optional .hbase.pb.TimeRange time_range = 7;
      *
      * 
      * For some mutations, a result may be returned, in which case,
@@ -7965,7 +7965,7 @@ public final class ClientProtos {
      */
     boolean hasTimeRange();
     /**
-     * optional .TimeRange time_range = 7;
+     * optional .hbase.pb.TimeRange time_range = 7;
      *
      * 
      * For some mutations, a result may be returned, in which case,
@@ -7974,7 +7974,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange();
     /**
-     * optional .TimeRange time_range = 7;
+     * optional .hbase.pb.TimeRange time_range = 7;
      *
      * 
      * For some mutations, a result may be returned, in which case,
@@ -8022,7 +8022,7 @@ public final class ClientProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code MutationProto}
+   * Protobuf type {@code hbase.pb.MutationProto}
    *
    * 
    **
@@ -8172,12 +8172,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder.class);
     }
@@ -8198,7 +8198,7 @@ public final class ClientProtos {
     }
 
     /**
-     * Protobuf enum {@code MutationProto.Durability}
+     * Protobuf enum {@code hbase.pb.MutationProto.Durability}
      */
     public enum Durability
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -8303,11 +8303,11 @@ public final class ClientProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:MutationProto.Durability)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.MutationProto.Durability)
     }
 
     /**
-     * Protobuf enum {@code MutationProto.MutationType}
+     * Protobuf enum {@code hbase.pb.MutationProto.MutationType}
      */
     public enum MutationType
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -8403,11 +8403,11 @@ public final class ClientProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:MutationProto.MutationType)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.MutationProto.MutationType)
     }
 
     /**
-     * Protobuf enum {@code MutationProto.DeleteType}
+     * Protobuf enum {@code hbase.pb.MutationProto.DeleteType}
      */
     public enum DeleteType
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -8503,7 +8503,7 @@ public final class ClientProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:MutationProto.DeleteType)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.MutationProto.DeleteType)
     }
 
     public interface ColumnValueOrBuilder
@@ -8519,33 +8519,33 @@ public final class ClientProtos {
        */
       com.google.protobuf.ByteString getFamily();
 
-      // repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+      // repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       java.util.List 
           getQualifierValueList();
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getQualifierValue(int index);
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       int getQualifierValueCount();
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       java.util.List 
           getQualifierValueOrBuilderList();
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
           int index);
     }
     /**
-     * Protobuf type {@code MutationProto.ColumnValue}
+     * Protobuf type {@code hbase.pb.MutationProto.ColumnValue}
      */
     public static final class ColumnValue extends
         com.google.protobuf.GeneratedMessage
@@ -8625,12 +8625,12 @@ public final class ClientProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder.class);
       }
@@ -8683,13 +8683,13 @@ public final class ClientProtos {
          */
         long getTimestamp();
 
-        // optional .MutationProto.DeleteType delete_type = 4;
+        // optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
         /**
-         * optional .MutationProto.DeleteType delete_type = 4;
+         * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
          */
         boolean hasDeleteType();
         /**
-         * optional .MutationProto.DeleteType delete_type = 4;
+         * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
          */
         org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType getDeleteType();
 
@@ -8704,7 +8704,7 @@ public final class ClientProtos {
         com.google.protobuf.ByteString getTags();
       }
       /**
-       * Protobuf type {@code MutationProto.ColumnValue.QualifierValue}
+       * Protobuf type {@code hbase.pb.MutationProto.ColumnValue.QualifierValue}
        */
       public static final class QualifierValue extends
           com.google.protobuf.GeneratedMessage
@@ -8799,12 +8799,12 @@ public final class ClientProtos {
         }
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder.class);
         }
@@ -8873,17 +8873,17 @@ public final class ClientProtos {
           return timestamp_;
         }
 
-        // optional .MutationProto.DeleteType delete_type = 4;
+        // optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
         public static final int DELETE_TYPE_FIELD_NUMBER = 4;
         private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType deleteType_;
         /**
-         * optional .MutationProto.DeleteType delete_type = 4;
+         * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
          */
         public boolean hasDeleteType() {
           return ((bitField0_ & 0x00000008) == 0x00000008);
         }
         /**
-         * optional .MutationProto.DeleteType delete_type = 4;
+         * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
          */
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType getDeleteType() {
           return deleteType_;
@@ -9121,19 +9121,19 @@ public final class ClientProtos {
           return builder;
         }
         /**
-         * Protobuf type {@code MutationProto.ColumnValue.QualifierValue}
+         * Protobuf type {@code hbase.pb.MutationProto.ColumnValue.QualifierValue}
          */
         public static final class Builder extends
             com.google.protobuf.GeneratedMessage.Builder
            implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder {
           public static final com.google.protobuf.Descriptors.Descriptor
               getDescriptor() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_descriptor;
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_descriptor;
           }
 
           protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
               internalGetFieldAccessorTable() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable
                 .ensureFieldAccessorsInitialized(
                     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder.class);
           }
@@ -9177,7 +9177,7 @@ public final class ClientProtos {
 
           public com.google.protobuf.Descriptors.Descriptor
               getDescriptorForType() {
-            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_QualifierValue_descriptor;
+            return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_descriptor;
           }
 
           public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getDefaultInstanceForType() {
@@ -9379,22 +9379,22 @@ public final class ClientProtos {
             return this;
           }
 
-          // optional .MutationProto.DeleteType delete_type = 4;
+          // optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
           private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType deleteType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType.DELETE_ONE_VERSION;
           /**
-           * optional .MutationProto.DeleteType delete_type = 4;
+           * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
            */
           public boolean hasDeleteType() {
             return ((bitField0_ & 0x00000008) == 0x00000008);
           }
           /**
-           * optional .MutationProto.DeleteType delete_type = 4;
+           * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
            */
           public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType getDeleteType() {
             return deleteType_;
           }
           /**
-           * optional .MutationProto.DeleteType delete_type = 4;
+           * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
            */
           public Builder setDeleteType(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType value) {
             if (value == null) {
@@ -9406,7 +9406,7 @@ public final class ClientProtos {
             return this;
           }
           /**
-           * optional .MutationProto.DeleteType delete_type = 4;
+           * optional .hbase.pb.MutationProto.DeleteType delete_type = 4;
            */
           public Builder clearDeleteType() {
             bitField0_ = (bitField0_ & ~0x00000008);
@@ -9451,7 +9451,7 @@ public final class ClientProtos {
             return this;
           }
 
-          // @@protoc_insertion_point(builder_scope:MutationProto.ColumnValue.QualifierValue)
+          // @@protoc_insertion_point(builder_scope:hbase.pb.MutationProto.ColumnValue.QualifierValue)
         }
 
         static {
@@ -9459,7 +9459,7 @@ public final class ClientProtos {
           defaultInstance.initFields();
         }
 
-        // @@protoc_insertion_point(class_scope:MutationProto.ColumnValue.QualifierValue)
+        // @@protoc_insertion_point(class_scope:hbase.pb.MutationProto.ColumnValue.QualifierValue)
       }
 
       private int bitField0_;
@@ -9479,36 +9479,36 @@ public final class ClientProtos {
         return family_;
       }
 
-      // repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+      // repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
       public static final int QUALIFIER_VALUE_FIELD_NUMBER = 2;
       private java.util.List qualifierValue_;
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       public java.util.List getQualifierValueList() {
         return qualifierValue_;
       }
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       public java.util.List 
           getQualifierValueOrBuilderList() {
         return qualifierValue_;
       }
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       public int getQualifierValueCount() {
         return qualifierValue_.size();
       }
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getQualifierValue(int index) {
         return qualifierValue_.get(index);
       }
       /**
-       * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+       * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
           int index) {
@@ -9681,19 +9681,19 @@ public final class ClientProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code MutationProto.ColumnValue}
+       * Protobuf type {@code hbase.pb.MutationProto.ColumnValue}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder.class);
         }
@@ -9736,7 +9736,7 @@ public final class ClientProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_ColumnValue_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_ColumnValue_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getDefaultInstanceForType() {
@@ -9880,7 +9880,7 @@ public final class ClientProtos {
           return this;
         }
 
-        // repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+        // repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
         private java.util.List qualifierValue_ =
           java.util.Collections.emptyList();
         private void ensureQualifierValueIsMutable() {
@@ -9894,7 +9894,7 @@ public final class ClientProtos {
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder> qualifierValueBuilder_;
 
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public java.util.List getQualifierValueList() {
           if (qualifierValueBuilder_ == null) {
@@ -9904,7 +9904,7 @@ public final class ClientProtos {
           }
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public int getQualifierValueCount() {
           if (qualifierValueBuilder_ == null) {
@@ -9914,7 +9914,7 @@ public final class ClientProtos {
           }
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue getQualifierValue(int index) {
           if (qualifierValueBuilder_ == null) {
@@ -9924,7 +9924,7 @@ public final class ClientProtos {
           }
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder setQualifierValue(
             int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue value) {
@@ -9941,7 +9941,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder setQualifierValue(
             int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder builderForValue) {
@@ -9955,7 +9955,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder addQualifierValue(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue value) {
           if (qualifierValueBuilder_ == null) {
@@ -9971,7 +9971,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder addQualifierValue(
             int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue value) {
@@ -9988,7 +9988,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder addQualifierValue(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder builderForValue) {
@@ -10002,7 +10002,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder addQualifierValue(
             int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder builderForValue) {
@@ -10016,7 +10016,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder addAllQualifierValue(
             java.lang.Iterable values) {
@@ -10030,7 +10030,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder clearQualifierValue() {
           if (qualifierValueBuilder_ == null) {
@@ -10043,7 +10043,7 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public Builder removeQualifierValue(int index) {
           if (qualifierValueBuilder_ == null) {
@@ -10056,14 +10056,14 @@ public final class ClientProtos {
           return this;
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder getQualifierValueBuilder(
             int index) {
           return getQualifierValueFieldBuilder().getBuilder(index);
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValueOrBuilder getQualifierValueOrBuilder(
             int index) {
@@ -10073,7 +10073,7 @@ public final class ClientProtos {
           }
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public java.util.List 
              getQualifierValueOrBuilderList() {
@@ -10084,14 +10084,14 @@ public final class ClientProtos {
           }
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder addQualifierValueBuilder() {
           return getQualifierValueFieldBuilder().addBuilder(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDefaultInstance());
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.Builder addQualifierValueBuilder(
             int index) {
@@ -10099,7 +10099,7 @@ public final class ClientProtos {
               index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue.getDefaultInstance());
         }
         /**
-         * repeated .MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
+         * repeated .hbase.pb.MutationProto.ColumnValue.QualifierValue qualifier_value = 2;
          */
         public java.util.List 
              getQualifierValueBuilderList() {
@@ -10120,7 +10120,7 @@ public final class ClientProtos {
           return qualifierValueBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:MutationProto.ColumnValue)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.MutationProto.ColumnValue)
       }
 
       static {
@@ -10128,7 +10128,7 @@ public final class ClientProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:MutationProto.ColumnValue)
+      // @@protoc_insertion_point(class_scope:hbase.pb.MutationProto.ColumnValue)
     }
 
     private int bitField0_;
@@ -10148,52 +10148,52 @@ public final class ClientProtos {
       return row_;
     }
 
-    // optional .MutationProto.MutationType mutate_type = 2;
+    // optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
     public static final int MUTATE_TYPE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType mutateType_;
     /**
-     * optional .MutationProto.MutationType mutate_type = 2;
+     * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
      */
     public boolean hasMutateType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .MutationProto.MutationType mutate_type = 2;
+     * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType getMutateType() {
       return mutateType_;
     }
 
-    // repeated .MutationProto.ColumnValue column_value = 3;
+    // repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
     public static final int COLUMN_VALUE_FIELD_NUMBER = 3;
     private java.util.List columnValue_;
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     public java.util.List getColumnValueList() {
       return columnValue_;
     }
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     public java.util.List 
         getColumnValueOrBuilderList() {
       return columnValue_;
     }
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     public int getColumnValueCount() {
       return columnValue_.size();
     }
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getColumnValue(int index) {
       return columnValue_.get(index);
     }
     /**
-     * repeated .MutationProto.ColumnValue column_value = 3;
+     * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder getColumnValueOrBuilder(
         int index) {
@@ -10216,63 +10216,63 @@ public final class ClientProtos {
       return timestamp_;
     }
 
-    // repeated .NameBytesPair attribute = 5;
+    // repeated .hbase.pb.NameBytesPair attribute = 5;
     public static final int ATTRIBUTE_FIELD_NUMBER = 5;
     private java.util.List attribute_;
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     public java.util.List getAttributeList() {
       return attribute_;
     }
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     public java.util.List 
         getAttributeOrBuilderList() {
       return attribute_;
     }
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     public int getAttributeCount() {
       return attribute_.size();
     }
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index) {
       return attribute_.get(index);
     }
     /**
-     * repeated .NameBytesPair attribute = 5;
+     * repeated .hbase.pb.NameBytesPair attribute = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index) {
       return attribute_.get(index);
     }
 
-    // optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+    // optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
     public static final int DURABILITY_FIELD_NUMBER = 6;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability durability_;
     /**
-     * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+     * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
      */
     public boolean hasDurability() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+     * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability getDurability() {
       return durability_;
     }
 
-    // optional .TimeRange time_range = 7;
+    // optional .hbase.pb.TimeRange time_range = 7;
     public static final int TIME_RANGE_FIELD_NUMBER = 7;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange timeRange_;
     /**
-     * optional .TimeRange time_range = 7;
+     * optional .hbase.pb.TimeRange time_range = 7;
      *
      * 
      * For some mutations, a result may be returned, in which case,
@@ -10283,7 +10283,7 @@ public final class ClientProtos {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .TimeRange time_range = 7;
+     * optional .hbase.pb.TimeRange time_range = 7;
      *
      * 
      * For some mutations, a result may be returned, in which case,
@@ -10294,7 +10294,7 @@ public final class ClientProtos {
       return timeRange_;
     }
     /**
-     * optional .TimeRange time_range = 7;
+     * optional .hbase.pb.TimeRange time_range = 7;
      *
      * 
      * For some mutations, a result may be returned, in which case,
@@ -10645,7 +10645,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MutationProto}
+     * Protobuf type {@code hbase.pb.MutationProto}
      *
      * 
      **
@@ -10661,12 +10661,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder.class);
       }
@@ -10733,7 +10733,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutationProto_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutationProto_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getDefaultInstanceForType() {
@@ -10966,22 +10966,22 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .MutationProto.MutationType mutate_type = 2;
+      // optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType mutateType_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType.APPEND;
       /**
-       * optional .MutationProto.MutationType mutate_type = 2;
+       * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
        */
       public boolean hasMutateType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .MutationProto.MutationType mutate_type = 2;
+       * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType getMutateType() {
         return mutateType_;
       }
       /**
-       * optional .MutationProto.MutationType mutate_type = 2;
+       * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
        */
       public Builder setMutateType(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType value) {
         if (value == null) {
@@ -10993,7 +10993,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .MutationProto.MutationType mutate_type = 2;
+       * optional .hbase.pb.MutationProto.MutationType mutate_type = 2;
        */
       public Builder clearMutateType() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -11002,7 +11002,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // repeated .MutationProto.ColumnValue column_value = 3;
+      // repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
       private java.util.List columnValue_ =
         java.util.Collections.emptyList();
       private void ensureColumnValueIsMutable() {
@@ -11016,7 +11016,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder> columnValueBuilder_;
 
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public java.util.List getColumnValueList() {
         if (columnValueBuilder_ == null) {
@@ -11026,7 +11026,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public int getColumnValueCount() {
         if (columnValueBuilder_ == null) {
@@ -11036,7 +11036,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue getColumnValue(int index) {
         if (columnValueBuilder_ == null) {
@@ -11046,7 +11046,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder setColumnValue(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue value) {
@@ -11063,7 +11063,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder setColumnValue(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder builderForValue) {
@@ -11077,7 +11077,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder addColumnValue(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue value) {
         if (columnValueBuilder_ == null) {
@@ -11093,7 +11093,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder addColumnValue(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue value) {
@@ -11110,7 +11110,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder addColumnValue(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder builderForValue) {
@@ -11124,7 +11124,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder addColumnValue(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder builderForValue) {
@@ -11138,7 +11138,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder addAllColumnValue(
           java.lang.Iterable values) {
@@ -11152,7 +11152,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder clearColumnValue() {
         if (columnValueBuilder_ == null) {
@@ -11165,7 +11165,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public Builder removeColumnValue(int index) {
         if (columnValueBuilder_ == null) {
@@ -11178,14 +11178,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder getColumnValueBuilder(
           int index) {
         return getColumnValueFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValueOrBuilder getColumnValueOrBuilder(
           int index) {
@@ -11195,7 +11195,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public java.util.List 
            getColumnValueOrBuilderList() {
@@ -11206,14 +11206,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder addColumnValueBuilder() {
         return getColumnValueFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.getDefaultInstance());
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.Builder addColumnValueBuilder(
           int index) {
@@ -11221,7 +11221,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.getDefaultInstance());
       }
       /**
-       * repeated .MutationProto.ColumnValue column_value = 3;
+       * repeated .hbase.pb.MutationProto.ColumnValue column_value = 3;
        */
       public java.util.List 
            getColumnValueBuilderList() {
@@ -11275,7 +11275,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // repeated .NameBytesPair attribute = 5;
+      // repeated .hbase.pb.NameBytesPair attribute = 5;
       private java.util.List attribute_ =
         java.util.Collections.emptyList();
       private void ensureAttributeIsMutable() {
@@ -11289,7 +11289,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> attributeBuilder_;
 
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public java.util.List getAttributeList() {
         if (attributeBuilder_ == null) {
@@ -11299,7 +11299,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public int getAttributeCount() {
         if (attributeBuilder_ == null) {
@@ -11309,7 +11309,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index) {
         if (attributeBuilder_ == null) {
@@ -11319,7 +11319,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder setAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
@@ -11336,7 +11336,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder setAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -11350,7 +11350,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder addAttribute(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (attributeBuilder_ == null) {
@@ -11366,7 +11366,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder addAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
@@ -11383,7 +11383,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder addAttribute(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -11397,7 +11397,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder addAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -11411,7 +11411,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder addAllAttribute(
           java.lang.Iterable values) {
@@ -11425,7 +11425,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder clearAttribute() {
         if (attributeBuilder_ == null) {
@@ -11438,7 +11438,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public Builder removeAttribute(int index) {
         if (attributeBuilder_ == null) {
@@ -11451,14 +11451,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder getAttributeBuilder(
           int index) {
         return getAttributeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
           int index) {
@@ -11468,7 +11468,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public java.util.List 
            getAttributeOrBuilderList() {
@@ -11479,14 +11479,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder addAttributeBuilder() {
         return getAttributeFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder addAttributeBuilder(
           int index) {
@@ -11494,7 +11494,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .NameBytesPair attribute = 5;
+       * repeated .hbase.pb.NameBytesPair attribute = 5;
        */
       public java.util.List 
            getAttributeBuilderList() {
@@ -11515,22 +11515,22 @@ public final class ClientProtos {
         return attributeBuilder_;
       }
 
-      // optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+      // optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability durability_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability.USE_DEFAULT;
       /**
-       * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+       * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
        */
       public boolean hasDurability() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+       * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability getDurability() {
         return durability_;
       }
       /**
-       * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+       * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
        */
       public Builder setDurability(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Durability value) {
         if (value == null) {
@@ -11542,7 +11542,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .MutationProto.Durability durability = 6 [default = USE_DEFAULT];
+       * optional .hbase.pb.MutationProto.Durability durability = 6 [default = USE_DEFAULT];
        */
       public Builder clearDurability() {
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -11551,12 +11551,12 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .TimeRange time_range = 7;
+      // optional .hbase.pb.TimeRange time_range = 7;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange timeRange_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder> timeRangeBuilder_;
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11567,7 +11567,7 @@ public final class ClientProtos {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11582,7 +11582,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11603,7 +11603,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11622,7 +11622,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11646,7 +11646,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11664,7 +11664,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11677,7 +11677,7 @@ public final class ClientProtos {
         return getTimeRangeFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11692,7 +11692,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .TimeRange time_range = 7;
+       * optional .hbase.pb.TimeRange time_range = 7;
        *
        * 
        * For some mutations, a result may be returned, in which case,
@@ -11815,7 +11815,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MutationProto)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MutationProto)
     }
 
     static {
@@ -11823,51 +11823,51 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MutationProto)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MutationProto)
   }
 
   public interface MutateRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // required .MutationProto mutation = 2;
+    // required .hbase.pb.MutationProto mutation = 2;
     /**
-     * required .MutationProto mutation = 2;
+     * required .hbase.pb.MutationProto mutation = 2;
      */
     boolean hasMutation();
     /**
-     * required .MutationProto mutation = 2;
+     * required .hbase.pb.MutationProto mutation = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutation();
     /**
-     * required .MutationProto mutation = 2;
+     * required .hbase.pb.MutationProto mutation = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationOrBuilder();
 
-    // optional .Condition condition = 3;
+    // optional .hbase.pb.Condition condition = 3;
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     boolean hasCondition();
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getCondition();
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder getConditionOrBuilder();
 
@@ -11882,7 +11882,7 @@ public final class ClientProtos {
     long getNonceGroup();
   }
   /**
-   * Protobuf type {@code MutateRequest}
+   * Protobuf type {@code hbase.pb.MutateRequest}
    *
    * 
    **
@@ -12001,12 +12001,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest.Builder.class);
     }
@@ -12027,67 +12027,67 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // required .MutationProto mutation = 2;
+    // required .hbase.pb.MutationProto mutation = 2;
     public static final int MUTATION_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto mutation_;
     /**
-     * required .MutationProto mutation = 2;
+     * required .hbase.pb.MutationProto mutation = 2;
      */
     public boolean hasMutation() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .MutationProto mutation = 2;
+     * required .hbase.pb.MutationProto mutation = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutation() {
       return mutation_;
     }
     /**
-     * required .MutationProto mutation = 2;
+     * required .hbase.pb.MutationProto mutation = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationOrBuilder() {
       return mutation_;
     }
 
-    // optional .Condition condition = 3;
+    // optional .hbase.pb.Condition condition = 3;
     public static final int CONDITION_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition condition_;
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     public boolean hasCondition() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getCondition() {
       return condition_;
     }
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder getConditionOrBuilder() {
       return condition_;
@@ -12330,7 +12330,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MutateRequest}
+     * Protobuf type {@code hbase.pb.MutateRequest}
      *
      * 
      **
@@ -12348,12 +12348,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest.Builder.class);
       }
@@ -12410,7 +12410,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest getDefaultInstanceForType() {
@@ -12534,18 +12534,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -12555,7 +12555,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -12571,7 +12571,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -12585,7 +12585,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -12604,7 +12604,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -12617,7 +12617,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -12625,7 +12625,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -12635,7 +12635,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -12651,18 +12651,18 @@ public final class ClientProtos {
         return regionBuilder_;
       }
 
-      // required .MutationProto mutation = 2;
+      // required .hbase.pb.MutationProto mutation = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto mutation_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder> mutationBuilder_;
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public boolean hasMutation() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutation() {
         if (mutationBuilder_ == null) {
@@ -12672,7 +12672,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public Builder setMutation(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
         if (mutationBuilder_ == null) {
@@ -12688,7 +12688,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public Builder setMutation(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder builderForValue) {
@@ -12702,7 +12702,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public Builder mergeMutation(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
         if (mutationBuilder_ == null) {
@@ -12721,7 +12721,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public Builder clearMutation() {
         if (mutationBuilder_ == null) {
@@ -12734,7 +12734,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder getMutationBuilder() {
         bitField0_ |= 0x00000002;
@@ -12742,7 +12742,7 @@ public final class ClientProtos {
         return getMutationFieldBuilder().getBuilder();
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationOrBuilder() {
         if (mutationBuilder_ != null) {
@@ -12752,7 +12752,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .MutationProto mutation = 2;
+       * required .hbase.pb.MutationProto mutation = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder> 
@@ -12768,18 +12768,18 @@ public final class ClientProtos {
         return mutationBuilder_;
       }
 
-      // optional .Condition condition = 3;
+      // optional .hbase.pb.Condition condition = 3;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition condition_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder> conditionBuilder_;
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public boolean hasCondition() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getCondition() {
         if (conditionBuilder_ == null) {
@@ -12789,7 +12789,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder setCondition(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition value) {
         if (conditionBuilder_ == null) {
@@ -12805,7 +12805,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder setCondition(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder builderForValue) {
@@ -12819,7 +12819,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder mergeCondition(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition value) {
         if (conditionBuilder_ == null) {
@@ -12838,7 +12838,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder clearCondition() {
         if (conditionBuilder_ == null) {
@@ -12851,7 +12851,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder getConditionBuilder() {
         bitField0_ |= 0x00000004;
@@ -12859,7 +12859,7 @@ public final class ClientProtos {
         return getConditionFieldBuilder().getBuilder();
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder getConditionOrBuilder() {
         if (conditionBuilder_ != null) {
@@ -12869,7 +12869,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder> 
@@ -12918,7 +12918,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MutateRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MutateRequest)
     }
 
     static {
@@ -12926,23 +12926,23 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MutateRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MutateRequest)
   }
 
   public interface MutateResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .Result result = 1;
+    // optional .hbase.pb.Result result = 1;
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     boolean hasResult();
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult();
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder();
 
@@ -12965,7 +12965,7 @@ public final class ClientProtos {
     boolean getProcessed();
   }
   /**
-   * Protobuf type {@code MutateResponse}
+   * Protobuf type {@code hbase.pb.MutateResponse}
    */
   public static final class MutateResponse extends
       com.google.protobuf.GeneratedMessage
@@ -13047,12 +13047,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse.Builder.class);
     }
@@ -13073,23 +13073,23 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // optional .Result result = 1;
+    // optional .hbase.pb.Result result = 1;
     public static final int RESULT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result_;
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     public boolean hasResult() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult() {
       return result_;
     }
     /**
-     * optional .Result result = 1;
+     * optional .hbase.pb.Result result = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder() {
       return result_;
@@ -13284,19 +13284,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MutateResponse}
+     * Protobuf type {@code hbase.pb.MutateResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse.Builder.class);
       }
@@ -13339,7 +13339,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MutateResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MutateResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse getDefaultInstanceForType() {
@@ -13419,18 +13419,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // optional .Result result = 1;
+      // optional .hbase.pb.Result result = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> resultBuilder_;
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public boolean hasResult() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult() {
         if (resultBuilder_ == null) {
@@ -13440,7 +13440,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder setResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result value) {
         if (resultBuilder_ == null) {
@@ -13456,7 +13456,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder setResult(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder builderForValue) {
@@ -13470,7 +13470,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder mergeResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result value) {
         if (resultBuilder_ == null) {
@@ -13489,7 +13489,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public Builder clearResult() {
         if (resultBuilder_ == null) {
@@ -13502,7 +13502,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder getResultBuilder() {
         bitField0_ |= 0x00000001;
@@ -13510,7 +13510,7 @@ public final class ClientProtos {
         return getResultFieldBuilder().getBuilder();
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder() {
         if (resultBuilder_ != null) {
@@ -13520,7 +13520,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Result result = 1;
+       * optional .hbase.pb.Result result = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> 
@@ -13585,7 +13585,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MutateResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MutateResponse)
     }
 
     static {
@@ -13593,58 +13593,58 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MutateResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MutateResponse)
   }
 
   public interface ScanOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .Column column = 1;
+    // repeated .hbase.pb.Column column = 1;
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     java.util.List 
         getColumnList();
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getColumn(int index);
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     int getColumnCount();
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     java.util.List 
         getColumnOrBuilderList();
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder getColumnOrBuilder(
         int index);
 
-    // repeated .NameBytesPair attribute = 2;
+    // repeated .hbase.pb.NameBytesPair attribute = 2;
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     java.util.List 
         getAttributeList();
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index);
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     int getAttributeCount();
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     java.util.List 
         getAttributeOrBuilderList();
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index);
@@ -13669,31 +13669,31 @@ public final class ClientProtos {
      */
     com.google.protobuf.ByteString getStopRow();
 
-    // optional .Filter filter = 5;
+    // optional .hbase.pb.Filter filter = 5;
     /**
-     * optional .Filter filter = 5;
+     * optional .hbase.pb.Filter filter = 5;
      */
     boolean hasFilter();
     /**
-     * optional .Filter filter = 5;
+     * optional .hbase.pb.Filter filter = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter();
     /**
-     * optional .Filter filter = 5;
+     * optional .hbase.pb.Filter filter = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder();
 
-    // optional .TimeRange time_range = 6;
+    // optional .hbase.pb.TimeRange time_range = 6;
     /**
-     * optional .TimeRange time_range = 6;
+     * optional .hbase.pb.TimeRange time_range = 6;
      */
     boolean hasTimeRange();
     /**
-     * optional .TimeRange time_range = 6;
+     * optional .hbase.pb.TimeRange time_range = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange();
     /**
-     * optional .TimeRange time_range = 6;
+     * optional .hbase.pb.TimeRange time_range = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder();
 
@@ -13795,13 +13795,13 @@ public final class ClientProtos {
      */
     boolean getReversed();
 
-    // optional .Consistency consistency = 16 [default = STRONG];
+    // optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
     /**
-     * optional .Consistency consistency = 16 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
      */
     boolean hasConsistency();
     /**
-     * optional .Consistency consistency = 16 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency getConsistency();
 
@@ -13816,7 +13816,7 @@ public final class ClientProtos {
     int getCaching();
   }
   /**
-   * Protobuf type {@code Scan}
+   * Protobuf type {@code hbase.pb.Scan}
    *
    * 
    **
@@ -14010,12 +14010,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Scan_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Scan_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Scan_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Scan_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder.class);
     }
@@ -14036,72 +14036,72 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // repeated .Column column = 1;
+    // repeated .hbase.pb.Column column = 1;
     public static final int COLUMN_FIELD_NUMBER = 1;
     private java.util.List column_;
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     public java.util.List getColumnList() {
       return column_;
     }
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     public java.util.List 
         getColumnOrBuilderList() {
       return column_;
     }
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     public int getColumnCount() {
       return column_.size();
     }
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getColumn(int index) {
       return column_.get(index);
     }
     /**
-     * repeated .Column column = 1;
+     * repeated .hbase.pb.Column column = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder getColumnOrBuilder(
         int index) {
       return column_.get(index);
     }
 
-    // repeated .NameBytesPair attribute = 2;
+    // repeated .hbase.pb.NameBytesPair attribute = 2;
     public static final int ATTRIBUTE_FIELD_NUMBER = 2;
     private java.util.List attribute_;
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     public java.util.List getAttributeList() {
       return attribute_;
     }
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     public java.util.List 
         getAttributeOrBuilderList() {
       return attribute_;
     }
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     public int getAttributeCount() {
       return attribute_.size();
     }
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index) {
       return attribute_.get(index);
     }
     /**
-     * repeated .NameBytesPair attribute = 2;
+     * repeated .hbase.pb.NameBytesPair attribute = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
         int index) {
@@ -14140,45 +14140,45 @@ public final class ClientProtos {
       return stopRow_;
     }
 
-    // optional .Filter filter = 5;
+    // optional .hbase.pb.Filter filter = 5;
     public static final int FILTER_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_;
     /**
-     * optional .Filter filter = 5;
+     * optional .hbase.pb.Filter filter = 5;
      */
     public boolean hasFilter() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .Filter filter = 5;
+     * optional .hbase.pb.Filter filter = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
       return filter_;
     }
     /**
-     * optional .Filter filter = 5;
+     * optional .hbase.pb.Filter filter = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
       return filter_;
     }
 
-    // optional .TimeRange time_range = 6;
+    // optional .hbase.pb.TimeRange time_range = 6;
     public static final int TIME_RANGE_FIELD_NUMBER = 6;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange timeRange_;
     /**
-     * optional .TimeRange time_range = 6;
+     * optional .hbase.pb.TimeRange time_range = 6;
      */
     public boolean hasTimeRange() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TimeRange time_range = 6;
+     * optional .hbase.pb.TimeRange time_range = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange() {
       return timeRange_;
     }
     /**
-     * optional .TimeRange time_range = 6;
+     * optional .hbase.pb.TimeRange time_range = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder() {
       return timeRange_;
@@ -14336,17 +14336,17 @@ public final class ClientProtos {
       return reversed_;
     }
 
-    // optional .Consistency consistency = 16 [default = STRONG];
+    // optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
     public static final int CONSISTENCY_FIELD_NUMBER = 16;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency consistency_;
     /**
-     * optional .Consistency consistency = 16 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
      */
     public boolean hasConsistency() {
       return ((bitField0_ & 0x00002000) == 0x00002000);
     }
     /**
-     * optional .Consistency consistency = 16 [default = STRONG];
+     * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency getConsistency() {
       return consistency_;
@@ -14800,7 +14800,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Scan}
+     * Protobuf type {@code hbase.pb.Scan}
      *
      * 
      **
@@ -14818,12 +14818,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Scan_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Scan_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Scan_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Scan_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder.class);
       }
@@ -14911,7 +14911,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Scan_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Scan_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getDefaultInstanceForType() {
@@ -15174,7 +15174,7 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // repeated .Column column = 1;
+      // repeated .hbase.pb.Column column = 1;
       private java.util.List column_ =
         java.util.Collections.emptyList();
       private void ensureColumnIsMutable() {
@@ -15188,7 +15188,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder> columnBuilder_;
 
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public java.util.List getColumnList() {
         if (columnBuilder_ == null) {
@@ -15198,7 +15198,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public int getColumnCount() {
         if (columnBuilder_ == null) {
@@ -15208,7 +15208,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column getColumn(int index) {
         if (columnBuilder_ == null) {
@@ -15218,7 +15218,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder setColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column value) {
@@ -15235,7 +15235,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder setColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder builderForValue) {
@@ -15249,7 +15249,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder addColumn(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column value) {
         if (columnBuilder_ == null) {
@@ -15265,7 +15265,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder addColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column value) {
@@ -15282,7 +15282,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder addColumn(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder builderForValue) {
@@ -15296,7 +15296,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder addColumn(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder builderForValue) {
@@ -15310,7 +15310,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder addAllColumn(
           java.lang.Iterable values) {
@@ -15324,7 +15324,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder clearColumn() {
         if (columnBuilder_ == null) {
@@ -15337,7 +15337,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public Builder removeColumn(int index) {
         if (columnBuilder_ == null) {
@@ -15350,14 +15350,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder getColumnBuilder(
           int index) {
         return getColumnFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ColumnOrBuilder getColumnOrBuilder(
           int index) {
@@ -15367,7 +15367,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public java.util.List 
            getColumnOrBuilderList() {
@@ -15378,14 +15378,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder addColumnBuilder() {
         return getColumnFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.getDefaultInstance());
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.Builder addColumnBuilder(
           int index) {
@@ -15393,7 +15393,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column.getDefaultInstance());
       }
       /**
-       * repeated .Column column = 1;
+       * repeated .hbase.pb.Column column = 1;
        */
       public java.util.List 
            getColumnBuilderList() {
@@ -15414,7 +15414,7 @@ public final class ClientProtos {
         return columnBuilder_;
       }
 
-      // repeated .NameBytesPair attribute = 2;
+      // repeated .hbase.pb.NameBytesPair attribute = 2;
       private java.util.List attribute_ =
         java.util.Collections.emptyList();
       private void ensureAttributeIsMutable() {
@@ -15428,7 +15428,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> attributeBuilder_;
 
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public java.util.List getAttributeList() {
         if (attributeBuilder_ == null) {
@@ -15438,7 +15438,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public int getAttributeCount() {
         if (attributeBuilder_ == null) {
@@ -15448,7 +15448,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getAttribute(int index) {
         if (attributeBuilder_ == null) {
@@ -15458,7 +15458,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder setAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
@@ -15475,7 +15475,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder setAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -15489,7 +15489,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder addAttribute(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (attributeBuilder_ == null) {
@@ -15505,7 +15505,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder addAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
@@ -15522,7 +15522,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder addAttribute(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -15536,7 +15536,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder addAttribute(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -15550,7 +15550,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder addAllAttribute(
           java.lang.Iterable values) {
@@ -15564,7 +15564,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder clearAttribute() {
         if (attributeBuilder_ == null) {
@@ -15577,7 +15577,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public Builder removeAttribute(int index) {
         if (attributeBuilder_ == null) {
@@ -15590,14 +15590,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder getAttributeBuilder(
           int index) {
         return getAttributeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getAttributeOrBuilder(
           int index) {
@@ -15607,7 +15607,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public java.util.List 
            getAttributeOrBuilderList() {
@@ -15618,14 +15618,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder addAttributeBuilder() {
         return getAttributeFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder addAttributeBuilder(
           int index) {
@@ -15633,7 +15633,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .NameBytesPair attribute = 2;
+       * repeated .hbase.pb.NameBytesPair attribute = 2;
        */
       public java.util.List 
            getAttributeBuilderList() {
@@ -15726,18 +15726,18 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .Filter filter = 5;
+      // optional .hbase.pb.Filter filter = 5;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> filterBuilder_;
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public boolean hasFilter() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
         if (filterBuilder_ == null) {
@@ -15747,7 +15747,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public Builder setFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -15763,7 +15763,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public Builder setFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -15777,7 +15777,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public Builder mergeFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -15796,7 +15796,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public Builder clearFilter() {
         if (filterBuilder_ == null) {
@@ -15809,7 +15809,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder getFilterBuilder() {
         bitField0_ |= 0x00000010;
@@ -15817,7 +15817,7 @@ public final class ClientProtos {
         return getFilterFieldBuilder().getBuilder();
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
         if (filterBuilder_ != null) {
@@ -15827,7 +15827,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Filter filter = 5;
+       * optional .hbase.pb.Filter filter = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> 
@@ -15843,18 +15843,18 @@ public final class ClientProtos {
         return filterBuilder_;
       }
 
-      // optional .TimeRange time_range = 6;
+      // optional .hbase.pb.TimeRange time_range = 6;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange timeRange_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder> timeRangeBuilder_;
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public boolean hasTimeRange() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getTimeRange() {
         if (timeRangeBuilder_ == null) {
@@ -15864,7 +15864,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public Builder setTimeRange(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange value) {
         if (timeRangeBuilder_ == null) {
@@ -15880,7 +15880,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public Builder setTimeRange(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder builderForValue) {
@@ -15894,7 +15894,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public Builder mergeTimeRange(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange value) {
         if (timeRangeBuilder_ == null) {
@@ -15913,7 +15913,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public Builder clearTimeRange() {
         if (timeRangeBuilder_ == null) {
@@ -15926,7 +15926,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder getTimeRangeBuilder() {
         bitField0_ |= 0x00000020;
@@ -15934,7 +15934,7 @@ public final class ClientProtos {
         return getTimeRangeFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder getTimeRangeOrBuilder() {
         if (timeRangeBuilder_ != null) {
@@ -15944,7 +15944,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .TimeRange time_range = 6;
+       * optional .hbase.pb.TimeRange time_range = 6;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder> 
@@ -16273,22 +16273,22 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .Consistency consistency = 16 [default = STRONG];
+      // optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency consistency_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency.STRONG;
       /**
-       * optional .Consistency consistency = 16 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
        */
       public boolean hasConsistency() {
         return ((bitField0_ & 0x00008000) == 0x00008000);
       }
       /**
-       * optional .Consistency consistency = 16 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency getConsistency() {
         return consistency_;
       }
       /**
-       * optional .Consistency consistency = 16 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
        */
       public Builder setConsistency(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Consistency value) {
         if (value == null) {
@@ -16300,7 +16300,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Consistency consistency = 16 [default = STRONG];
+       * optional .hbase.pb.Consistency consistency = 16 [default = STRONG];
        */
       public Builder clearConsistency() {
         bitField0_ = (bitField0_ & ~0x00008000);
@@ -16342,7 +16342,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Scan)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Scan)
     }
 
     static {
@@ -16350,37 +16350,37 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Scan)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Scan)
   }
 
   public interface ScanRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .RegionSpecifier region = 1;
+    // optional .hbase.pb.RegionSpecifier region = 1;
     /**
-     * optional .RegionSpecifier region = 1;
+     * optional .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * optional .RegionSpecifier region = 1;
+     * optional .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * optional .RegionSpecifier region = 1;
+     * optional .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // optional .Scan scan = 2;
+    // optional .hbase.pb.Scan scan = 2;
     /**
-     * optional .Scan scan = 2;
+     * optional .hbase.pb.Scan scan = 2;
      */
     boolean hasScan();
     /**
-     * optional .Scan scan = 2;
+     * optional .hbase.pb.Scan scan = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan();
     /**
-     * optional .Scan scan = 2;
+     * optional .hbase.pb.Scan scan = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder();
 
@@ -16455,7 +16455,7 @@ public final class ClientProtos {
     boolean getTrackScanMetrics();
   }
   /**
-   * Protobuf type {@code ScanRequest}
+   * Protobuf type {@code hbase.pb.ScanRequest}
    *
    * 
    **
@@ -16593,12 +16593,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest.Builder.class);
     }
@@ -16619,45 +16619,45 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // optional .RegionSpecifier region = 1;
+    // optional .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * optional .RegionSpecifier region = 1;
+     * optional .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .RegionSpecifier region = 1;
+     * optional .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * optional .RegionSpecifier region = 1;
+     * optional .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // optional .Scan scan = 2;
+    // optional .hbase.pb.Scan scan = 2;
     public static final int SCAN_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_;
     /**
-     * optional .Scan scan = 2;
+     * optional .hbase.pb.Scan scan = 2;
      */
     public boolean hasScan() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .Scan scan = 2;
+     * optional .hbase.pb.Scan scan = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() {
       return scan_;
     }
     /**
-     * optional .Scan scan = 2;
+     * optional .hbase.pb.Scan scan = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() {
       return scan_;
@@ -17071,7 +17071,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ScanRequest}
+     * Protobuf type {@code hbase.pb.ScanRequest}
      *
      * 
      **
@@ -17091,12 +17091,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest.Builder.class);
       }
@@ -17158,7 +17158,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest getDefaultInstanceForType() {
@@ -17303,18 +17303,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // optional .RegionSpecifier region = 1;
+      // optional .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -17324,7 +17324,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -17340,7 +17340,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -17354,7 +17354,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -17373,7 +17373,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -17386,7 +17386,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -17394,7 +17394,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -17404,7 +17404,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .RegionSpecifier region = 1;
+       * optional .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -17420,18 +17420,18 @@ public final class ClientProtos {
         return regionBuilder_;
       }
 
-      // optional .Scan scan = 2;
+      // optional .hbase.pb.Scan scan = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> scanBuilder_;
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public boolean hasScan() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() {
         if (scanBuilder_ == null) {
@@ -17441,7 +17441,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public Builder setScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) {
         if (scanBuilder_ == null) {
@@ -17457,7 +17457,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public Builder setScan(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder builderForValue) {
@@ -17471,7 +17471,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public Builder mergeScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) {
         if (scanBuilder_ == null) {
@@ -17490,7 +17490,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public Builder clearScan() {
         if (scanBuilder_ == null) {
@@ -17503,7 +17503,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder getScanBuilder() {
         bitField0_ |= 0x00000002;
@@ -17511,7 +17511,7 @@ public final class ClientProtos {
         return getScanFieldBuilder().getBuilder();
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() {
         if (scanBuilder_ != null) {
@@ -17521,7 +17521,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Scan scan = 2;
+       * optional .hbase.pb.Scan scan = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> 
@@ -17768,7 +17768,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ScanRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ScanRequest)
     }
 
     static {
@@ -17776,7 +17776,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ScanRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ScanRequest)
   }
 
   public interface ScanResponseOrBuilder
@@ -17856,9 +17856,9 @@ public final class ClientProtos {
      */
     int getTtl();
 
-    // repeated .Result results = 5;
+    // repeated .hbase.pb.Result results = 5;
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -17869,7 +17869,7 @@ public final class ClientProtos {
     java.util.List 
         getResultsList();
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -17879,7 +17879,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResults(int index);
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -17889,7 +17889,7 @@ public final class ClientProtos {
      */
     int getResultsCount();
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -17900,7 +17900,7 @@ public final class ClientProtos {
     java.util.List 
         getResultsOrBuilderList();
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -18011,9 +18011,9 @@ public final class ClientProtos {
      */
     boolean getHeartbeatMessage();
 
-    // optional .ScanMetrics scan_metrics = 10;
+    // optional .hbase.pb.ScanMetrics scan_metrics = 10;
     /**
-     * optional .ScanMetrics scan_metrics = 10;
+     * optional .hbase.pb.ScanMetrics scan_metrics = 10;
      *
      * 
      * This field is filled in if the client has requested that scan metrics be tracked.
@@ -18023,7 +18023,7 @@ public final class ClientProtos {
      */
     boolean hasScanMetrics();
     /**
-     * optional .ScanMetrics scan_metrics = 10;
+     * optional .hbase.pb.ScanMetrics scan_metrics = 10;
      *
      * 
      * This field is filled in if the client has requested that scan metrics be tracked.
@@ -18033,7 +18033,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics getScanMetrics();
     /**
-     * optional .ScanMetrics scan_metrics = 10;
+     * optional .hbase.pb.ScanMetrics scan_metrics = 10;
      *
      * 
      * This field is filled in if the client has requested that scan metrics be tracked.
@@ -18044,7 +18044,7 @@ public final class ClientProtos {
     org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetricsOrBuilder getScanMetricsOrBuilder();
   }
   /**
-   * Protobuf type {@code ScanResponse}
+   * Protobuf type {@code hbase.pb.ScanResponse}
    *
    * 
    **
@@ -18216,12 +18216,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse.Builder.class);
     }
@@ -18343,11 +18343,11 @@ public final class ClientProtos {
       return ttl_;
     }
 
-    // repeated .Result results = 5;
+    // repeated .hbase.pb.Result results = 5;
     public static final int RESULTS_FIELD_NUMBER = 5;
     private java.util.List results_;
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -18359,7 +18359,7 @@ public final class ClientProtos {
       return results_;
     }
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -18372,7 +18372,7 @@ public final class ClientProtos {
       return results_;
     }
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -18384,7 +18384,7 @@ public final class ClientProtos {
       return results_.size();
     }
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -18396,7 +18396,7 @@ public final class ClientProtos {
       return results_.get(index);
     }
     /**
-     * repeated .Result results = 5;
+     * repeated .hbase.pb.Result results = 5;
      *
      * 
      * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -18536,11 +18536,11 @@ public final class ClientProtos {
       return heartbeatMessage_;
     }
 
-    // optional .ScanMetrics scan_metrics = 10;
+    // optional .hbase.pb.ScanMetrics scan_metrics = 10;
     public static final int SCAN_METRICS_FIELD_NUMBER = 10;
     private org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics scanMetrics_;
     /**
-     * optional .ScanMetrics scan_metrics = 10;
+     * optional .hbase.pb.ScanMetrics scan_metrics = 10;
      *
      * 
      * This field is filled in if the client has requested that scan metrics be tracked.
@@ -18552,7 +18552,7 @@ public final class ClientProtos {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * optional .ScanMetrics scan_metrics = 10;
+     * optional .hbase.pb.ScanMetrics scan_metrics = 10;
      *
      * 
      * This field is filled in if the client has requested that scan metrics be tracked.
@@ -18564,7 +18564,7 @@ public final class ClientProtos {
       return scanMetrics_;
     }
     /**
-     * optional .ScanMetrics scan_metrics = 10;
+     * optional .hbase.pb.ScanMetrics scan_metrics = 10;
      *
      * 
      * This field is filled in if the client has requested that scan metrics be tracked.
@@ -18875,7 +18875,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ScanResponse}
+     * Protobuf type {@code hbase.pb.ScanResponse}
      *
      * 
      **
@@ -18888,12 +18888,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse.Builder.class);
       }
@@ -18957,7 +18957,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ScanResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ScanResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse getDefaultInstanceForType() {
@@ -19372,7 +19372,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // repeated .Result results = 5;
+      // repeated .hbase.pb.Result results = 5;
       private java.util.List results_ =
         java.util.Collections.emptyList();
       private void ensureResultsIsMutable() {
@@ -19386,7 +19386,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> resultsBuilder_;
 
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19402,7 +19402,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19418,7 +19418,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19434,7 +19434,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19457,7 +19457,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19477,7 +19477,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19499,7 +19499,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19522,7 +19522,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19542,7 +19542,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19562,7 +19562,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19582,7 +19582,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19601,7 +19601,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19620,7 +19620,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19633,7 +19633,7 @@ public final class ClientProtos {
         return getResultsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19649,7 +19649,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19666,7 +19666,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19679,7 +19679,7 @@ public final class ClientProtos {
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.getDefaultInstance());
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -19693,7 +19693,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.getDefaultInstance());
       }
       /**
-       * repeated .Result results = 5;
+       * repeated .hbase.pb.Result results = 5;
        *
        * 
        * If cells are not carried in an accompanying cellblock, then they are pb'd here.
@@ -20007,12 +20007,12 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .ScanMetrics scan_metrics = 10;
+      // optional .hbase.pb.ScanMetrics scan_metrics = 10;
       private org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics scanMetrics_ = org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics, org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics.Builder, org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetricsOrBuilder> scanMetricsBuilder_;
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20024,7 +20024,7 @@ public final class ClientProtos {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20040,7 +20040,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20062,7 +20062,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20082,7 +20082,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20107,7 +20107,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20126,7 +20126,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20140,7 +20140,7 @@ public final class ClientProtos {
         return getScanMetricsFieldBuilder().getBuilder();
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20156,7 +20156,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .ScanMetrics scan_metrics = 10;
+       * optional .hbase.pb.ScanMetrics scan_metrics = 10;
        *
        * 
        * This field is filled in if the client has requested that scan metrics be tracked.
@@ -20178,7 +20178,7 @@ public final class ClientProtos {
         return scanMetricsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ScanResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ScanResponse)
     }
 
     static {
@@ -20186,47 +20186,47 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ScanResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ScanResponse)
   }
 
   public interface BulkLoadHFileRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+    // repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     java.util.List 
         getFamilyPathList();
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getFamilyPath(int index);
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     int getFamilyPathCount();
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     java.util.List 
         getFamilyPathOrBuilderList();
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder getFamilyPathOrBuilder(
         int index);
@@ -20242,7 +20242,7 @@ public final class ClientProtos {
     boolean getAssignSeqNum();
   }
   /**
-   * Protobuf type {@code BulkLoadHFileRequest}
+   * Protobuf type {@code hbase.pb.BulkLoadHFileRequest}
    *
    * 
    **
@@ -20341,12 +20341,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.Builder.class);
     }
@@ -20395,7 +20395,7 @@ public final class ClientProtos {
           getPathBytes();
     }
     /**
-     * Protobuf type {@code BulkLoadHFileRequest.FamilyPath}
+     * Protobuf type {@code hbase.pb.BulkLoadHFileRequest.FamilyPath}
      */
     public static final class FamilyPath extends
         com.google.protobuf.GeneratedMessage
@@ -20469,12 +20469,12 @@ public final class ClientProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_FamilyPath_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder.class);
       }
@@ -20727,19 +20727,19 @@ public final class ClientProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code BulkLoadHFileRequest.FamilyPath}
+       * Protobuf type {@code hbase.pb.BulkLoadHFileRequest.FamilyPath}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_FamilyPath_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder.class);
         }
@@ -20777,7 +20777,7 @@ public final class ClientProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_FamilyPath_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getDefaultInstanceForType() {
@@ -20973,7 +20973,7 @@ public final class ClientProtos {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:BulkLoadHFileRequest.FamilyPath)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.BulkLoadHFileRequest.FamilyPath)
       }
 
       static {
@@ -20981,62 +20981,62 @@ public final class ClientProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:BulkLoadHFileRequest.FamilyPath)
+      // @@protoc_insertion_point(class_scope:hbase.pb.BulkLoadHFileRequest.FamilyPath)
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+    // repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
     public static final int FAMILY_PATH_FIELD_NUMBER = 2;
     private java.util.List familyPath_;
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     public java.util.List getFamilyPathList() {
       return familyPath_;
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     public java.util.List 
         getFamilyPathOrBuilderList() {
       return familyPath_;
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     public int getFamilyPathCount() {
       return familyPath_.size();
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getFamilyPath(int index) {
       return familyPath_.get(index);
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder getFamilyPathOrBuilder(
         int index) {
@@ -21252,7 +21252,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BulkLoadHFileRequest}
+     * Protobuf type {@code hbase.pb.BulkLoadHFileRequest}
      *
      * 
      **
@@ -21265,12 +21265,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.Builder.class);
       }
@@ -21320,7 +21320,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest getDefaultInstanceForType() {
@@ -21449,18 +21449,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -21470,7 +21470,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -21486,7 +21486,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -21500,7 +21500,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -21519,7 +21519,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -21532,7 +21532,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -21540,7 +21540,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -21550,7 +21550,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -21566,7 +21566,7 @@ public final class ClientProtos {
         return regionBuilder_;
       }
 
-      // repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+      // repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
       private java.util.List familyPath_ =
         java.util.Collections.emptyList();
       private void ensureFamilyPathIsMutable() {
@@ -21580,7 +21580,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder> familyPathBuilder_;
 
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public java.util.List getFamilyPathList() {
         if (familyPathBuilder_ == null) {
@@ -21590,7 +21590,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public int getFamilyPathCount() {
         if (familyPathBuilder_ == null) {
@@ -21600,7 +21600,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getFamilyPath(int index) {
         if (familyPathBuilder_ == null) {
@@ -21610,7 +21610,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder setFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath value) {
@@ -21627,7 +21627,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder setFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder builderForValue) {
@@ -21641,7 +21641,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder addFamilyPath(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath value) {
         if (familyPathBuilder_ == null) {
@@ -21657,7 +21657,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder addFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath value) {
@@ -21674,7 +21674,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder addFamilyPath(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder builderForValue) {
@@ -21688,7 +21688,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder addFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder builderForValue) {
@@ -21702,7 +21702,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder addAllFamilyPath(
           java.lang.Iterable values) {
@@ -21716,7 +21716,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder clearFamilyPath() {
         if (familyPathBuilder_ == null) {
@@ -21729,7 +21729,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public Builder removeFamilyPath(int index) {
         if (familyPathBuilder_ == null) {
@@ -21742,14 +21742,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder getFamilyPathBuilder(
           int index) {
         return getFamilyPathFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder getFamilyPathOrBuilder(
           int index) {
@@ -21759,7 +21759,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public java.util.List 
            getFamilyPathOrBuilderList() {
@@ -21770,14 +21770,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder addFamilyPathBuilder() {
         return getFamilyPathFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.getDefaultInstance());
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder addFamilyPathBuilder(
           int index) {
@@ -21785,7 +21785,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.getDefaultInstance());
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 2;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 2;
        */
       public java.util.List 
            getFamilyPathBuilderList() {
@@ -21839,7 +21839,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BulkLoadHFileRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BulkLoadHFileRequest)
     }
 
     static {
@@ -21847,7 +21847,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BulkLoadHFileRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BulkLoadHFileRequest)
   }
 
   public interface BulkLoadHFileResponseOrBuilder
@@ -21864,7 +21864,7 @@ public final class ClientProtos {
     boolean getLoaded();
   }
   /**
-   * Protobuf type {@code BulkLoadHFileResponse}
+   * Protobuf type {@code hbase.pb.BulkLoadHFileResponse}
    */
   public static final class BulkLoadHFileResponse extends
       com.google.protobuf.GeneratedMessage
@@ -21933,12 +21933,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponse.Builder.class);
     }
@@ -22127,19 +22127,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BulkLoadHFileResponse}
+     * Protobuf type {@code hbase.pb.BulkLoadHFileResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponse.Builder.class);
       }
@@ -22175,7 +22175,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_BulkLoadHFileResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_BulkLoadHFileResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponse getDefaultInstanceForType() {
@@ -22281,7 +22281,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BulkLoadHFileResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BulkLoadHFileResponse)
     }
 
     static {
@@ -22289,7 +22289,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BulkLoadHFileResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BulkLoadHFileResponse)
   }
 
   public interface CoprocessorServiceCallOrBuilder
@@ -22346,7 +22346,7 @@ public final class ClientProtos {
     com.google.protobuf.ByteString getRequest();
   }
   /**
-   * Protobuf type {@code CoprocessorServiceCall}
+   * Protobuf type {@code hbase.pb.CoprocessorServiceCall}
    */
   public static final class CoprocessorServiceCall extends
       com.google.protobuf.GeneratedMessage
@@ -22430,12 +22430,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceCall_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceCall_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceCall_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceCall_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder.class);
     }
@@ -22789,19 +22789,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CoprocessorServiceCall}
+     * Protobuf type {@code hbase.pb.CoprocessorServiceCall}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceCall_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceCall_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceCall_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceCall_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder.class);
       }
@@ -22843,7 +22843,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceCall_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceCall_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getDefaultInstanceForType() {
@@ -23173,7 +23173,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CoprocessorServiceCall)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CoprocessorServiceCall)
     }
 
     static {
@@ -23181,28 +23181,28 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CoprocessorServiceCall)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CoprocessorServiceCall)
   }
 
   public interface CoprocessorServiceResultOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .NameBytesPair value = 1;
+    // optional .hbase.pb.NameBytesPair value = 1;
     /**
-     * optional .NameBytesPair value = 1;
+     * optional .hbase.pb.NameBytesPair value = 1;
      */
     boolean hasValue();
     /**
-     * optional .NameBytesPair value = 1;
+     * optional .hbase.pb.NameBytesPair value = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getValue();
     /**
-     * optional .NameBytesPair value = 1;
+     * optional .hbase.pb.NameBytesPair value = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getValueOrBuilder();
   }
   /**
-   * Protobuf type {@code CoprocessorServiceResult}
+   * Protobuf type {@code hbase.pb.CoprocessorServiceResult}
    */
   public static final class CoprocessorServiceResult extends
       com.google.protobuf.GeneratedMessage
@@ -23279,12 +23279,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResult_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResult_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResult_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult.Builder.class);
     }
@@ -23305,23 +23305,23 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // optional .NameBytesPair value = 1;
+    // optional .hbase.pb.NameBytesPair value = 1;
     public static final int VALUE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value_;
     /**
-     * optional .NameBytesPair value = 1;
+     * optional .hbase.pb.NameBytesPair value = 1;
      */
     public boolean hasValue() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .NameBytesPair value = 1;
+     * optional .hbase.pb.NameBytesPair value = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getValue() {
       return value_;
     }
     /**
-     * optional .NameBytesPair value = 1;
+     * optional .hbase.pb.NameBytesPair value = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getValueOrBuilder() {
       return value_;
@@ -23481,19 +23481,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CoprocessorServiceResult}
+     * Protobuf type {@code hbase.pb.CoprocessorServiceResult}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResultOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResult_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResult_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResult_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResult_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult.Builder.class);
       }
@@ -23534,7 +23534,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResult_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResult_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult getDefaultInstanceForType() {
@@ -23613,18 +23613,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // optional .NameBytesPair value = 1;
+      // optional .hbase.pb.NameBytesPair value = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> valueBuilder_;
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getValue() {
         if (valueBuilder_ == null) {
@@ -23634,7 +23634,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public Builder setValue(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (valueBuilder_ == null) {
@@ -23650,7 +23650,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public Builder setValue(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -23664,7 +23664,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public Builder mergeValue(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (valueBuilder_ == null) {
@@ -23683,7 +23683,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public Builder clearValue() {
         if (valueBuilder_ == null) {
@@ -23696,7 +23696,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
@@ -23704,7 +23704,7 @@ public final class ClientProtos {
         return getValueFieldBuilder().getBuilder();
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getValueOrBuilder() {
         if (valueBuilder_ != null) {
@@ -23714,7 +23714,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .NameBytesPair value = 1;
+       * optional .hbase.pb.NameBytesPair value = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> 
@@ -23730,7 +23730,7 @@ public final class ClientProtos {
         return valueBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CoprocessorServiceResult)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CoprocessorServiceResult)
     }
 
     static {
@@ -23738,42 +23738,42 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CoprocessorServiceResult)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CoprocessorServiceResult)
   }
 
   public interface CoprocessorServiceRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // required .CoprocessorServiceCall call = 2;
+    // required .hbase.pb.CoprocessorServiceCall call = 2;
     /**
-     * required .CoprocessorServiceCall call = 2;
+     * required .hbase.pb.CoprocessorServiceCall call = 2;
      */
     boolean hasCall();
     /**
-     * required .CoprocessorServiceCall call = 2;
+     * required .hbase.pb.CoprocessorServiceCall call = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getCall();
     /**
-     * required .CoprocessorServiceCall call = 2;
+     * required .hbase.pb.CoprocessorServiceCall call = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder getCallOrBuilder();
   }
   /**
-   * Protobuf type {@code CoprocessorServiceRequest}
+   * Protobuf type {@code hbase.pb.CoprocessorServiceRequest}
    */
   public static final class CoprocessorServiceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -23863,12 +23863,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequest.Builder.class);
     }
@@ -23889,45 +23889,45 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // required .CoprocessorServiceCall call = 2;
+    // required .hbase.pb.CoprocessorServiceCall call = 2;
     public static final int CALL_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall call_;
     /**
-     * required .CoprocessorServiceCall call = 2;
+     * required .hbase.pb.CoprocessorServiceCall call = 2;
      */
     public boolean hasCall() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .CoprocessorServiceCall call = 2;
+     * required .hbase.pb.CoprocessorServiceCall call = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getCall() {
       return call_;
     }
     /**
-     * required .CoprocessorServiceCall call = 2;
+     * required .hbase.pb.CoprocessorServiceCall call = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder getCallOrBuilder() {
       return call_;
@@ -24114,19 +24114,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CoprocessorServiceRequest}
+     * Protobuf type {@code hbase.pb.CoprocessorServiceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequest.Builder.class);
       }
@@ -24174,7 +24174,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequest getDefaultInstanceForType() {
@@ -24274,18 +24274,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -24295,7 +24295,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -24311,7 +24311,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -24325,7 +24325,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -24344,7 +24344,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -24357,7 +24357,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -24365,7 +24365,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -24375,7 +24375,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -24391,18 +24391,18 @@ public final class ClientProtos {
         return regionBuilder_;
       }
 
-      // required .CoprocessorServiceCall call = 2;
+      // required .hbase.pb.CoprocessorServiceCall call = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall call_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder> callBuilder_;
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public boolean hasCall() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getCall() {
         if (callBuilder_ == null) {
@@ -24412,7 +24412,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public Builder setCall(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall value) {
         if (callBuilder_ == null) {
@@ -24428,7 +24428,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public Builder setCall(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder builderForValue) {
@@ -24442,7 +24442,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public Builder mergeCall(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall value) {
         if (callBuilder_ == null) {
@@ -24461,7 +24461,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public Builder clearCall() {
         if (callBuilder_ == null) {
@@ -24474,7 +24474,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder getCallBuilder() {
         bitField0_ |= 0x00000002;
@@ -24482,7 +24482,7 @@ public final class ClientProtos {
         return getCallFieldBuilder().getBuilder();
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder getCallOrBuilder() {
         if (callBuilder_ != null) {
@@ -24492,7 +24492,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .CoprocessorServiceCall call = 2;
+       * required .hbase.pb.CoprocessorServiceCall call = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder> 
@@ -24508,7 +24508,7 @@ public final class ClientProtos {
         return callBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CoprocessorServiceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CoprocessorServiceRequest)
     }
 
     static {
@@ -24516,42 +24516,42 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CoprocessorServiceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CoprocessorServiceRequest)
   }
 
   public interface CoprocessorServiceResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // required .NameBytesPair value = 2;
+    // required .hbase.pb.NameBytesPair value = 2;
     /**
-     * required .NameBytesPair value = 2;
+     * required .hbase.pb.NameBytesPair value = 2;
      */
     boolean hasValue();
     /**
-     * required .NameBytesPair value = 2;
+     * required .hbase.pb.NameBytesPair value = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getValue();
     /**
-     * required .NameBytesPair value = 2;
+     * required .hbase.pb.NameBytesPair value = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getValueOrBuilder();
   }
   /**
-   * Protobuf type {@code CoprocessorServiceResponse}
+   * Protobuf type {@code hbase.pb.CoprocessorServiceResponse}
    */
   public static final class CoprocessorServiceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -24641,12 +24641,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse.Builder.class);
     }
@@ -24667,45 +24667,45 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // required .NameBytesPair value = 2;
+    // required .hbase.pb.NameBytesPair value = 2;
     public static final int VALUE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value_;
     /**
-     * required .NameBytesPair value = 2;
+     * required .hbase.pb.NameBytesPair value = 2;
      */
     public boolean hasValue() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .NameBytesPair value = 2;
+     * required .hbase.pb.NameBytesPair value = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getValue() {
       return value_;
     }
     /**
-     * required .NameBytesPair value = 2;
+     * required .hbase.pb.NameBytesPair value = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getValueOrBuilder() {
       return value_;
@@ -24892,19 +24892,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CoprocessorServiceResponse}
+     * Protobuf type {@code hbase.pb.CoprocessorServiceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse.Builder.class);
       }
@@ -24952,7 +24952,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_CoprocessorServiceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_CoprocessorServiceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse getDefaultInstanceForType() {
@@ -25052,18 +25052,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -25073,7 +25073,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -25089,7 +25089,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -25103,7 +25103,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -25122,7 +25122,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -25135,7 +25135,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -25143,7 +25143,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -25153,7 +25153,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -25169,18 +25169,18 @@ public final class ClientProtos {
         return regionBuilder_;
       }
 
-      // required .NameBytesPair value = 2;
+      // required .hbase.pb.NameBytesPair value = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> valueBuilder_;
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getValue() {
         if (valueBuilder_ == null) {
@@ -25190,7 +25190,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public Builder setValue(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (valueBuilder_ == null) {
@@ -25206,7 +25206,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public Builder setValue(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -25220,7 +25220,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public Builder mergeValue(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (valueBuilder_ == null) {
@@ -25239,7 +25239,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public Builder clearValue() {
         if (valueBuilder_ == null) {
@@ -25252,7 +25252,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder getValueBuilder() {
         bitField0_ |= 0x00000002;
@@ -25260,7 +25260,7 @@ public final class ClientProtos {
         return getValueFieldBuilder().getBuilder();
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getValueOrBuilder() {
         if (valueBuilder_ != null) {
@@ -25270,7 +25270,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .NameBytesPair value = 2;
+       * required .hbase.pb.NameBytesPair value = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> 
@@ -25286,7 +25286,7 @@ public final class ClientProtos {
         return valueBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CoprocessorServiceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CoprocessorServiceResponse)
     }
 
     static {
@@ -25294,7 +25294,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CoprocessorServiceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CoprocessorServiceResponse)
   }
 
   public interface ActionOrBuilder
@@ -25320,50 +25320,50 @@ public final class ClientProtos {
      */
     int getIndex();
 
-    // optional .MutationProto mutation = 2;
+    // optional .hbase.pb.MutationProto mutation = 2;
     /**
-     * optional .MutationProto mutation = 2;
+     * optional .hbase.pb.MutationProto mutation = 2;
      */
     boolean hasMutation();
     /**
-     * optional .MutationProto mutation = 2;
+     * optional .hbase.pb.MutationProto mutation = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutation();
     /**
-     * optional .MutationProto mutation = 2;
+     * optional .hbase.pb.MutationProto mutation = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationOrBuilder();
 
-    // optional .Get get = 3;
+    // optional .hbase.pb.Get get = 3;
     /**
-     * optional .Get get = 3;
+     * optional .hbase.pb.Get get = 3;
      */
     boolean hasGet();
     /**
-     * optional .Get get = 3;
+     * optional .hbase.pb.Get get = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getGet();
     /**
-     * optional .Get get = 3;
+     * optional .hbase.pb.Get get = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder getGetOrBuilder();
 
-    // optional .CoprocessorServiceCall service_call = 4;
+    // optional .hbase.pb.CoprocessorServiceCall service_call = 4;
     /**
-     * optional .CoprocessorServiceCall service_call = 4;
+     * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
      */
     boolean hasServiceCall();
     /**
-     * optional .CoprocessorServiceCall service_call = 4;
+     * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getServiceCall();
     /**
-     * optional .CoprocessorServiceCall service_call = 4;
+     * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder getServiceCallOrBuilder();
   }
   /**
-   * Protobuf type {@code Action}
+   * Protobuf type {@code hbase.pb.Action}
    *
    * 
    * Either a Get or a Mutation
@@ -25475,12 +25475,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Action_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Action_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Action_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Action_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder.class);
     }
@@ -25527,67 +25527,67 @@ public final class ClientProtos {
       return index_;
     }
 
-    // optional .MutationProto mutation = 2;
+    // optional .hbase.pb.MutationProto mutation = 2;
     public static final int MUTATION_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto mutation_;
     /**
-     * optional .MutationProto mutation = 2;
+     * optional .hbase.pb.MutationProto mutation = 2;
      */
     public boolean hasMutation() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .MutationProto mutation = 2;
+     * optional .hbase.pb.MutationProto mutation = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutation() {
       return mutation_;
     }
     /**
-     * optional .MutationProto mutation = 2;
+     * optional .hbase.pb.MutationProto mutation = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationOrBuilder() {
       return mutation_;
     }
 
-    // optional .Get get = 3;
+    // optional .hbase.pb.Get get = 3;
     public static final int GET_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get get_;
     /**
-     * optional .Get get = 3;
+     * optional .hbase.pb.Get get = 3;
      */
     public boolean hasGet() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .Get get = 3;
+     * optional .hbase.pb.Get get = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getGet() {
       return get_;
     }
     /**
-     * optional .Get get = 3;
+     * optional .hbase.pb.Get get = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder getGetOrBuilder() {
       return get_;
     }
 
-    // optional .CoprocessorServiceCall service_call = 4;
+    // optional .hbase.pb.CoprocessorServiceCall service_call = 4;
     public static final int SERVICE_CALL_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall serviceCall_;
     /**
-     * optional .CoprocessorServiceCall service_call = 4;
+     * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
      */
     public boolean hasServiceCall() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .CoprocessorServiceCall service_call = 4;
+     * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getServiceCall() {
       return serviceCall_;
     }
     /**
-     * optional .CoprocessorServiceCall service_call = 4;
+     * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder getServiceCallOrBuilder() {
       return serviceCall_;
@@ -25810,7 +25810,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Action}
+     * Protobuf type {@code hbase.pb.Action}
      *
      * 
      * Either a Get or a Mutation
@@ -25821,12 +25821,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Action_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Action_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Action_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Action_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder.class);
       }
@@ -25883,7 +25883,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_Action_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_Action_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action getDefaultInstanceForType() {
@@ -26056,18 +26056,18 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .MutationProto mutation = 2;
+      // optional .hbase.pb.MutationProto mutation = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto mutation_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder> mutationBuilder_;
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public boolean hasMutation() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutation() {
         if (mutationBuilder_ == null) {
@@ -26077,7 +26077,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public Builder setMutation(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
         if (mutationBuilder_ == null) {
@@ -26093,7 +26093,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public Builder setMutation(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder builderForValue) {
@@ -26107,7 +26107,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public Builder mergeMutation(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
         if (mutationBuilder_ == null) {
@@ -26126,7 +26126,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public Builder clearMutation() {
         if (mutationBuilder_ == null) {
@@ -26139,7 +26139,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder getMutationBuilder() {
         bitField0_ |= 0x00000002;
@@ -26147,7 +26147,7 @@ public final class ClientProtos {
         return getMutationFieldBuilder().getBuilder();
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationOrBuilder() {
         if (mutationBuilder_ != null) {
@@ -26157,7 +26157,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .MutationProto mutation = 2;
+       * optional .hbase.pb.MutationProto mutation = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder> 
@@ -26173,18 +26173,18 @@ public final class ClientProtos {
         return mutationBuilder_;
       }
 
-      // optional .Get get = 3;
+      // optional .hbase.pb.Get get = 3;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get get_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder> getBuilder_;
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public boolean hasGet() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get getGet() {
         if (getBuilder_ == null) {
@@ -26194,7 +26194,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public Builder setGet(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get value) {
         if (getBuilder_ == null) {
@@ -26210,7 +26210,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public Builder setGet(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder builderForValue) {
@@ -26224,7 +26224,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public Builder mergeGet(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get value) {
         if (getBuilder_ == null) {
@@ -26243,7 +26243,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public Builder clearGet() {
         if (getBuilder_ == null) {
@@ -26256,7 +26256,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder getGetBuilder() {
         bitField0_ |= 0x00000004;
@@ -26264,7 +26264,7 @@ public final class ClientProtos {
         return getGetFieldBuilder().getBuilder();
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder getGetOrBuilder() {
         if (getBuilder_ != null) {
@@ -26274,7 +26274,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Get get = 3;
+       * optional .hbase.pb.Get get = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetOrBuilder> 
@@ -26290,18 +26290,18 @@ public final class ClientProtos {
         return getBuilder_;
       }
 
-      // optional .CoprocessorServiceCall service_call = 4;
+      // optional .hbase.pb.CoprocessorServiceCall service_call = 4;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall serviceCall_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder> serviceCallBuilder_;
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public boolean hasServiceCall() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall getServiceCall() {
         if (serviceCallBuilder_ == null) {
@@ -26311,7 +26311,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public Builder setServiceCall(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall value) {
         if (serviceCallBuilder_ == null) {
@@ -26327,7 +26327,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public Builder setServiceCall(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder builderForValue) {
@@ -26341,7 +26341,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public Builder mergeServiceCall(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall value) {
         if (serviceCallBuilder_ == null) {
@@ -26360,7 +26360,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public Builder clearServiceCall() {
         if (serviceCallBuilder_ == null) {
@@ -26373,7 +26373,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder getServiceCallBuilder() {
         bitField0_ |= 0x00000008;
@@ -26381,7 +26381,7 @@ public final class ClientProtos {
         return getServiceCallFieldBuilder().getBuilder();
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder getServiceCallOrBuilder() {
         if (serviceCallBuilder_ != null) {
@@ -26391,7 +26391,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .CoprocessorServiceCall service_call = 4;
+       * optional .hbase.pb.CoprocessorServiceCall service_call = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCallOrBuilder> 
@@ -26407,7 +26407,7 @@ public final class ClientProtos {
         return serviceCallBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:Action)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Action)
     }
 
     static {
@@ -26415,23 +26415,23 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Action)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Action)
   }
 
   public interface RegionActionOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -26453,33 +26453,33 @@ public final class ClientProtos {
      */
     boolean getAtomic();
 
-    // repeated .Action action = 3;
+    // repeated .hbase.pb.Action action = 3;
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     java.util.List 
         getActionList();
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action getAction(int index);
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     int getActionCount();
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     java.util.List 
         getActionOrBuilderList();
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionOrBuilder getActionOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code RegionAction}
+   * Protobuf type {@code hbase.pb.RegionAction}
    *
    * 
    **
@@ -26577,12 +26577,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionAction_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionAction_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionAction_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionAction_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder.class);
     }
@@ -26603,23 +26603,23 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -26649,36 +26649,36 @@ public final class ClientProtos {
       return atomic_;
     }
 
-    // repeated .Action action = 3;
+    // repeated .hbase.pb.Action action = 3;
     public static final int ACTION_FIELD_NUMBER = 3;
     private java.util.List action_;
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     public java.util.List getActionList() {
       return action_;
     }
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     public java.util.List 
         getActionOrBuilderList() {
       return action_;
     }
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     public int getActionCount() {
       return action_.size();
     }
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action getAction(int index) {
       return action_.get(index);
     }
     /**
-     * repeated .Action action = 3;
+     * repeated .hbase.pb.Action action = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionOrBuilder getActionOrBuilder(
         int index) {
@@ -26878,7 +26878,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionAction}
+     * Protobuf type {@code hbase.pb.RegionAction}
      *
      * 
      **
@@ -26890,12 +26890,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionAction_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionAction_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionAction_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionAction_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder.class);
       }
@@ -26945,7 +26945,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionAction_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionAction_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction getDefaultInstanceForType() {
@@ -27074,18 +27074,18 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -27095,7 +27095,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -27111,7 +27111,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -27125,7 +27125,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -27144,7 +27144,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -27157,7 +27157,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -27165,7 +27165,7 @@ public final class ClientProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -27175,7 +27175,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -27240,7 +27240,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // repeated .Action action = 3;
+      // repeated .hbase.pb.Action action = 3;
       private java.util.List action_ =
         java.util.Collections.emptyList();
       private void ensureActionIsMutable() {
@@ -27254,7 +27254,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionOrBuilder> actionBuilder_;
 
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public java.util.List getActionList() {
         if (actionBuilder_ == null) {
@@ -27264,7 +27264,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public int getActionCount() {
         if (actionBuilder_ == null) {
@@ -27274,7 +27274,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action getAction(int index) {
         if (actionBuilder_ == null) {
@@ -27284,7 +27284,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder setAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action value) {
@@ -27301,7 +27301,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder setAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder builderForValue) {
@@ -27315,7 +27315,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder addAction(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action value) {
         if (actionBuilder_ == null) {
@@ -27331,7 +27331,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder addAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action value) {
@@ -27348,7 +27348,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder addAction(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder builderForValue) {
@@ -27362,7 +27362,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder addAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder builderForValue) {
@@ -27376,7 +27376,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder addAllAction(
           java.lang.Iterable values) {
@@ -27390,7 +27390,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder clearAction() {
         if (actionBuilder_ == null) {
@@ -27403,7 +27403,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public Builder removeAction(int index) {
         if (actionBuilder_ == null) {
@@ -27416,14 +27416,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder getActionBuilder(
           int index) {
         return getActionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionOrBuilder getActionOrBuilder(
           int index) {
@@ -27433,7 +27433,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public java.util.List 
            getActionOrBuilderList() {
@@ -27444,14 +27444,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder addActionBuilder() {
         return getActionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.getDefaultInstance());
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.Builder addActionBuilder(
           int index) {
@@ -27459,7 +27459,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Action.getDefaultInstance());
       }
       /**
-       * repeated .Action action = 3;
+       * repeated .hbase.pb.Action action = 3;
        */
       public java.util.List 
            getActionBuilderList() {
@@ -27480,7 +27480,7 @@ public final class ClientProtos {
         return actionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionAction)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionAction)
     }
 
     static {
@@ -27488,7 +27488,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionAction)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionAction)
   }
 
   public interface RegionLoadStatsOrBuilder
@@ -27533,7 +27533,7 @@ public final class ClientProtos {
     int getHeapOccupancy();
   }
   /**
-   * Protobuf type {@code RegionLoadStats}
+   * Protobuf type {@code hbase.pb.RegionLoadStats}
    *
    * 
    *
@@ -27612,12 +27612,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionLoadStats_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionLoadStats_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionLoadStats_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionLoadStats_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder.class);
     }
@@ -27853,7 +27853,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionLoadStats}
+     * Protobuf type {@code hbase.pb.RegionLoadStats}
      *
      * 
      *
@@ -27865,12 +27865,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionLoadStats_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionLoadStats_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionLoadStats_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionLoadStats_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder.class);
       }
@@ -27908,7 +27908,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionLoadStats_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionLoadStats_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getDefaultInstanceForType() {
@@ -28086,7 +28086,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionLoadStats)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionLoadStats)
     }
 
     static {
@@ -28094,7 +28094,7 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionLoadStats)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionLoadStats)
   }
 
   public interface ResultOrExceptionOrBuilder
@@ -28120,37 +28120,37 @@ public final class ClientProtos {
      */
     int getIndex();
 
-    // optional .Result result = 2;
+    // optional .hbase.pb.Result result = 2;
     /**
-     * optional .Result result = 2;
+     * optional .hbase.pb.Result result = 2;
      */
     boolean hasResult();
     /**
-     * optional .Result result = 2;
+     * optional .hbase.pb.Result result = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult();
     /**
-     * optional .Result result = 2;
+     * optional .hbase.pb.Result result = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder();
 
-    // optional .NameBytesPair exception = 3;
+    // optional .hbase.pb.NameBytesPair exception = 3;
     /**
-     * optional .NameBytesPair exception = 3;
+     * optional .hbase.pb.NameBytesPair exception = 3;
      */
     boolean hasException();
     /**
-     * optional .NameBytesPair exception = 3;
+     * optional .hbase.pb.NameBytesPair exception = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getException();
     /**
-     * optional .NameBytesPair exception = 3;
+     * optional .hbase.pb.NameBytesPair exception = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getExceptionOrBuilder();
 
-    // optional .CoprocessorServiceResult service_result = 4;
+    // optional .hbase.pb.CoprocessorServiceResult service_result = 4;
     /**
-     * optional .CoprocessorServiceResult service_result = 4;
+     * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
      *
      * 
      * result if this was a coprocessor service call
@@ -28158,7 +28158,7 @@ public final class ClientProtos {
      */
     boolean hasServiceResult();
     /**
-     * optional .CoprocessorServiceResult service_result = 4;
+     * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
      *
      * 
      * result if this was a coprocessor service call
@@ -28166,7 +28166,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult getServiceResult();
     /**
-     * optional .CoprocessorServiceResult service_result = 4;
+     * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
      *
      * 
      * result if this was a coprocessor service call
@@ -28174,9 +28174,9 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResultOrBuilder getServiceResultOrBuilder();
 
-    // optional .RegionLoadStats loadStats = 5;
+    // optional .hbase.pb.RegionLoadStats loadStats = 5;
     /**
-     * optional .RegionLoadStats loadStats = 5;
+     * optional .hbase.pb.RegionLoadStats loadStats = 5;
      *
      * 
      * current load on the region
@@ -28184,7 +28184,7 @@ public final class ClientProtos {
      */
     boolean hasLoadStats();
     /**
-     * optional .RegionLoadStats loadStats = 5;
+     * optional .hbase.pb.RegionLoadStats loadStats = 5;
      *
      * 
      * current load on the region
@@ -28192,7 +28192,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats();
     /**
-     * optional .RegionLoadStats loadStats = 5;
+     * optional .hbase.pb.RegionLoadStats loadStats = 5;
      *
      * 
      * current load on the region
@@ -28201,7 +28201,7 @@ public final class ClientProtos {
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder();
   }
   /**
-   * Protobuf type {@code ResultOrException}
+   * Protobuf type {@code hbase.pb.ResultOrException}
    *
    * 
    **
@@ -28329,12 +28329,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ResultOrException_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ResultOrException_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ResultOrException_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ResultOrException_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder.class);
     }
@@ -28381,55 +28381,55 @@ public final class ClientProtos {
       return index_;
     }
 
-    // optional .Result result = 2;
+    // optional .hbase.pb.Result result = 2;
     public static final int RESULT_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result_;
     /**
-     * optional .Result result = 2;
+     * optional .hbase.pb.Result result = 2;
      */
     public boolean hasResult() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .Result result = 2;
+     * optional .hbase.pb.Result result = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult() {
       return result_;
     }
     /**
-     * optional .Result result = 2;
+     * optional .hbase.pb.Result result = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder() {
       return result_;
     }
 
-    // optional .NameBytesPair exception = 3;
+    // optional .hbase.pb.NameBytesPair exception = 3;
     public static final int EXCEPTION_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair exception_;
     /**
-     * optional .NameBytesPair exception = 3;
+     * optional .hbase.pb.NameBytesPair exception = 3;
      */
     public boolean hasException() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .NameBytesPair exception = 3;
+     * optional .hbase.pb.NameBytesPair exception = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getException() {
       return exception_;
     }
     /**
-     * optional .NameBytesPair exception = 3;
+     * optional .hbase.pb.NameBytesPair exception = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getExceptionOrBuilder() {
       return exception_;
     }
 
-    // optional .CoprocessorServiceResult service_result = 4;
+    // optional .hbase.pb.CoprocessorServiceResult service_result = 4;
     public static final int SERVICE_RESULT_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult serviceResult_;
     /**
-     * optional .CoprocessorServiceResult service_result = 4;
+     * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
      *
      * 
      * result if this was a coprocessor service call
@@ -28439,7 +28439,7 @@ public final class ClientProtos {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .CoprocessorServiceResult service_result = 4;
+     * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
      *
      * 
      * result if this was a coprocessor service call
@@ -28449,7 +28449,7 @@ public final class ClientProtos {
       return serviceResult_;
     }
     /**
-     * optional .CoprocessorServiceResult service_result = 4;
+     * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
      *
      * 
      * result if this was a coprocessor service call
@@ -28459,11 +28459,11 @@ public final class ClientProtos {
       return serviceResult_;
     }
 
-    // optional .RegionLoadStats loadStats = 5;
+    // optional .hbase.pb.RegionLoadStats loadStats = 5;
     public static final int LOADSTATS_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats loadStats_;
     /**
-     * optional .RegionLoadStats loadStats = 5;
+     * optional .hbase.pb.RegionLoadStats loadStats = 5;
      *
      * 
      * current load on the region
@@ -28473,7 +28473,7 @@ public final class ClientProtos {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .RegionLoadStats loadStats = 5;
+     * optional .hbase.pb.RegionLoadStats loadStats = 5;
      *
      * 
      * current load on the region
@@ -28483,7 +28483,7 @@ public final class ClientProtos {
       return loadStats_;
     }
     /**
-     * optional .RegionLoadStats loadStats = 5;
+     * optional .hbase.pb.RegionLoadStats loadStats = 5;
      *
      * 
      * current load on the region
@@ -28721,7 +28721,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ResultOrException}
+     * Protobuf type {@code hbase.pb.ResultOrException}
      *
      * 
      **
@@ -28735,12 +28735,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrExceptionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ResultOrException_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ResultOrException_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ResultOrException_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ResultOrException_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder.class);
       }
@@ -28804,7 +28804,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_ResultOrException_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_ResultOrException_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException getDefaultInstanceForType() {
@@ -28982,18 +28982,18 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .Result result = 2;
+      // optional .hbase.pb.Result result = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result result_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> resultBuilder_;
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public boolean hasResult() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result getResult() {
         if (resultBuilder_ == null) {
@@ -29003,7 +29003,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public Builder setResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result value) {
         if (resultBuilder_ == null) {
@@ -29019,7 +29019,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public Builder setResult(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder builderForValue) {
@@ -29033,7 +29033,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public Builder mergeResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result value) {
         if (resultBuilder_ == null) {
@@ -29052,7 +29052,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public Builder clearResult() {
         if (resultBuilder_ == null) {
@@ -29065,7 +29065,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder getResultBuilder() {
         bitField0_ |= 0x00000002;
@@ -29073,7 +29073,7 @@ public final class ClientProtos {
         return getResultFieldBuilder().getBuilder();
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder getResultOrBuilder() {
         if (resultBuilder_ != null) {
@@ -29083,7 +29083,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Result result = 2;
+       * optional .hbase.pb.Result result = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Result.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrBuilder> 
@@ -29099,18 +29099,18 @@ public final class ClientProtos {
         return resultBuilder_;
       }
 
-      // optional .NameBytesPair exception = 3;
+      // optional .hbase.pb.NameBytesPair exception = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair exception_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> exceptionBuilder_;
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public boolean hasException() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getException() {
         if (exceptionBuilder_ == null) {
@@ -29120,7 +29120,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public Builder setException(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (exceptionBuilder_ == null) {
@@ -29136,7 +29136,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public Builder setException(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder builderForValue) {
@@ -29150,7 +29150,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public Builder mergeException(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair value) {
         if (exceptionBuilder_ == null) {
@@ -29169,7 +29169,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public Builder clearException() {
         if (exceptionBuilder_ == null) {
@@ -29182,7 +29182,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder getExceptionBuilder() {
         bitField0_ |= 0x00000004;
@@ -29190,7 +29190,7 @@ public final class ClientProtos {
         return getExceptionFieldBuilder().getBuilder();
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getExceptionOrBuilder() {
         if (exceptionBuilder_ != null) {
@@ -29200,7 +29200,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .NameBytesPair exception = 3;
+       * optional .hbase.pb.NameBytesPair exception = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> 
@@ -29216,12 +29216,12 @@ public final class ClientProtos {
         return exceptionBuilder_;
       }
 
-      // optional .CoprocessorServiceResult service_result = 4;
+      // optional .hbase.pb.CoprocessorServiceResult service_result = 4;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult serviceResult_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResult.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResultOrBuilder> serviceResultBuilder_;
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29231,7 +29231,7 @@ public final class ClientProtos {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29245,7 +29245,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29265,7 +29265,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29283,7 +29283,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29306,7 +29306,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29323,7 +29323,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29335,7 +29335,7 @@ public final class ClientProtos {
         return getServiceResultFieldBuilder().getBuilder();
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29349,7 +29349,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .CoprocessorServiceResult service_result = 4;
+       * optional .hbase.pb.CoprocessorServiceResult service_result = 4;
        *
        * 
        * result if this was a coprocessor service call
@@ -29369,12 +29369,12 @@ public final class ClientProtos {
         return serviceResultBuilder_;
       }
 
-      // optional .RegionLoadStats loadStats = 5;
+      // optional .hbase.pb.RegionLoadStats loadStats = 5;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats loadStats_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> loadStatsBuilder_;
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29384,7 +29384,7 @@ public final class ClientProtos {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29398,7 +29398,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29418,7 +29418,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29436,7 +29436,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29459,7 +29459,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29476,7 +29476,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29488,7 +29488,7 @@ public final class ClientProtos {
         return getLoadStatsFieldBuilder().getBuilder();
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29502,7 +29502,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .RegionLoadStats loadStats = 5;
+       * optional .hbase.pb.RegionLoadStats loadStats = 5;
        *
        * 
        * current load on the region
@@ -29522,7 +29522,7 @@ public final class ClientProtos {
         return loadStatsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ResultOrException)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ResultOrException)
     }
 
     static {
@@ -29530,40 +29530,40 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ResultOrException)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ResultOrException)
   }
 
   public interface RegionActionResultOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .ResultOrException resultOrException = 1;
+    // repeated .hbase.pb.ResultOrException resultOrException = 1;
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     java.util.List 
         getResultOrExceptionList();
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException getResultOrException(int index);
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     int getResultOrExceptionCount();
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     java.util.List 
         getResultOrExceptionOrBuilderList();
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrExceptionOrBuilder getResultOrExceptionOrBuilder(
         int index);
 
-    // optional .NameBytesPair exception = 2;
+    // optional .hbase.pb.NameBytesPair exception = 2;
     /**
-     * optional .NameBytesPair exception = 2;
+     * optional .hbase.pb.NameBytesPair exception = 2;
      *
      * 
      * If the operation failed globally for this region, this exception is set
@@ -29571,7 +29571,7 @@ public final class ClientProtos {
      */
     boolean hasException();
     /**
-     * optional .NameBytesPair exception = 2;
+     * optional .hbase.pb.NameBytesPair exception = 2;
      *
      * 
      * If the operation failed globally for this region, this exception is set
@@ -29579,7 +29579,7 @@ public final class ClientProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getException();
     /**
-     * optional .NameBytesPair exception = 2;
+     * optional .hbase.pb.NameBytesPair exception = 2;
      *
      * 
      * If the operation failed globally for this region, this exception is set
@@ -29588,7 +29588,7 @@ public final class ClientProtos {
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder getExceptionOrBuilder();
   }
   /**
-   * Protobuf type {@code RegionActionResult}
+   * Protobuf type {@code hbase.pb.RegionActionResult}
    *
    * 
    **
@@ -29681,12 +29681,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionActionResult_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionActionResult_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionActionResult_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionActionResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder.class);
     }
@@ -29707,47 +29707,47 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // repeated .ResultOrException resultOrException = 1;
+    // repeated .hbase.pb.ResultOrException resultOrException = 1;
     public static final int RESULTOREXCEPTION_FIELD_NUMBER = 1;
     private java.util.List resultOrException_;
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     public java.util.List getResultOrExceptionList() {
       return resultOrException_;
     }
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     public java.util.List 
         getResultOrExceptionOrBuilderList() {
       return resultOrException_;
     }
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     public int getResultOrExceptionCount() {
       return resultOrException_.size();
     }
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException getResultOrException(int index) {
       return resultOrException_.get(index);
     }
     /**
-     * repeated .ResultOrException resultOrException = 1;
+     * repeated .hbase.pb.ResultOrException resultOrException = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrExceptionOrBuilder getResultOrExceptionOrBuilder(
         int index) {
       return resultOrException_.get(index);
     }
 
-    // optional .NameBytesPair exception = 2;
+    // optional .hbase.pb.NameBytesPair exception = 2;
     public static final int EXCEPTION_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair exception_;
     /**
-     * optional .NameBytesPair exception = 2;
+     * optional .hbase.pb.NameBytesPair exception = 2;
      *
      * 
      * If the operation failed globally for this region, this exception is set
@@ -29757,7 +29757,7 @@ public final class ClientProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .NameBytesPair exception = 2;
+     * optional .hbase.pb.NameBytesPair exception = 2;
      *
      * 
      * If the operation failed globally for this region, this exception is set
@@ -29767,7 +29767,7 @@ public final class ClientProtos {
       return exception_;
     }
     /**
-     * optional .NameBytesPair exception = 2;
+     * optional .hbase.pb.NameBytesPair exception = 2;
      *
      * 
      * If the operation failed globally for this region, this exception is set
@@ -29951,7 +29951,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionActionResult}
+     * Protobuf type {@code hbase.pb.RegionActionResult}
      *
      * 
      **
@@ -29963,12 +29963,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionActionResult_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionActionResult_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionActionResult_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionActionResult_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder.class);
       }
@@ -30016,7 +30016,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_RegionActionResult_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_RegionActionResult_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getDefaultInstanceForType() {
@@ -30136,7 +30136,7 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // repeated .ResultOrException resultOrException = 1;
+      // repeated .hbase.pb.ResultOrException resultOrException = 1;
       private java.util.List resultOrException_ =
         java.util.Collections.emptyList();
       private void ensureResultOrExceptionIsMutable() {
@@ -30150,7 +30150,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrExceptionOrBuilder> resultOrExceptionBuilder_;
 
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public java.util.List getResultOrExceptionList() {
         if (resultOrExceptionBuilder_ == null) {
@@ -30160,7 +30160,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public int getResultOrExceptionCount() {
         if (resultOrExceptionBuilder_ == null) {
@@ -30170,7 +30170,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException getResultOrException(int index) {
         if (resultOrExceptionBuilder_ == null) {
@@ -30180,7 +30180,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder setResultOrException(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException value) {
@@ -30197,7 +30197,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder setResultOrException(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder builderForValue) {
@@ -30211,7 +30211,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder addResultOrException(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException value) {
         if (resultOrExceptionBuilder_ == null) {
@@ -30227,7 +30227,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder addResultOrException(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException value) {
@@ -30244,7 +30244,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder addResultOrException(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder builderForValue) {
@@ -30258,7 +30258,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder addResultOrException(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder builderForValue) {
@@ -30272,7 +30272,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder addAllResultOrException(
           java.lang.Iterable values) {
@@ -30286,7 +30286,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder clearResultOrException() {
         if (resultOrExceptionBuilder_ == null) {
@@ -30299,7 +30299,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public Builder removeResultOrException(int index) {
         if (resultOrExceptionBuilder_ == null) {
@@ -30312,14 +30312,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder getResultOrExceptionBuilder(
           int index) {
         return getResultOrExceptionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrExceptionOrBuilder getResultOrExceptionOrBuilder(
           int index) {
@@ -30329,7 +30329,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public java.util.List 
            getResultOrExceptionOrBuilderList() {
@@ -30340,14 +30340,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder addResultOrExceptionBuilder() {
         return getResultOrExceptionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.getDefaultInstance());
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.Builder addResultOrExceptionBuilder(
           int index) {
@@ -30355,7 +30355,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException.getDefaultInstance());
       }
       /**
-       * repeated .ResultOrException resultOrException = 1;
+       * repeated .hbase.pb.ResultOrException resultOrException = 1;
        */
       public java.util.List 
            getResultOrExceptionBuilderList() {
@@ -30376,12 +30376,12 @@ public final class ClientProtos {
         return resultOrExceptionBuilder_;
       }
 
-      // optional .NameBytesPair exception = 2;
+      // optional .hbase.pb.NameBytesPair exception = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair exception_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder> exceptionBuilder_;
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30391,7 +30391,7 @@ public final class ClientProtos {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30405,7 +30405,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30425,7 +30425,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30443,7 +30443,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30466,7 +30466,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30483,7 +30483,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30495,7 +30495,7 @@ public final class ClientProtos {
         return getExceptionFieldBuilder().getBuilder();
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30509,7 +30509,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .NameBytesPair exception = 2;
+       * optional .hbase.pb.NameBytesPair exception = 2;
        *
        * 
        * If the operation failed globally for this region, this exception is set
@@ -30529,7 +30529,7 @@ public final class ClientProtos {
         return exceptionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionActionResult)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionActionResult)
     }
 
     static {
@@ -30537,33 +30537,33 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionActionResult)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionActionResult)
   }
 
   public interface MultiRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .RegionAction regionAction = 1;
+    // repeated .hbase.pb.RegionAction regionAction = 1;
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     java.util.List 
         getRegionActionList();
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction getRegionAction(int index);
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     int getRegionActionCount();
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     java.util.List 
         getRegionActionOrBuilderList();
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionOrBuilder getRegionActionOrBuilder(
         int index);
@@ -30578,22 +30578,22 @@ public final class ClientProtos {
      */
     long getNonceGroup();
 
-    // optional .Condition condition = 3;
+    // optional .hbase.pb.Condition condition = 3;
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     boolean hasCondition();
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getCondition();
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder getConditionOrBuilder();
   }
   /**
-   * Protobuf type {@code MultiRequest}
+   * Protobuf type {@code hbase.pb.MultiRequest}
    *
    * 
    **
@@ -30695,12 +30695,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest.Builder.class);
     }
@@ -30721,36 +30721,36 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // repeated .RegionAction regionAction = 1;
+    // repeated .hbase.pb.RegionAction regionAction = 1;
     public static final int REGIONACTION_FIELD_NUMBER = 1;
     private java.util.List regionAction_;
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     public java.util.List getRegionActionList() {
       return regionAction_;
     }
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     public java.util.List 
         getRegionActionOrBuilderList() {
       return regionAction_;
     }
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     public int getRegionActionCount() {
       return regionAction_.size();
     }
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction getRegionAction(int index) {
       return regionAction_.get(index);
     }
     /**
-     * repeated .RegionAction regionAction = 1;
+     * repeated .hbase.pb.RegionAction regionAction = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionOrBuilder getRegionActionOrBuilder(
         int index) {
@@ -30773,23 +30773,23 @@ public final class ClientProtos {
       return nonceGroup_;
     }
 
-    // optional .Condition condition = 3;
+    // optional .hbase.pb.Condition condition = 3;
     public static final int CONDITION_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition condition_;
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     public boolean hasCondition() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getCondition() {
       return condition_;
     }
     /**
-     * optional .Condition condition = 3;
+     * optional .hbase.pb.Condition condition = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder getConditionOrBuilder() {
       return condition_;
@@ -30986,7 +30986,7 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultiRequest}
+     * Protobuf type {@code hbase.pb.MultiRequest}
      *
      * 
      **
@@ -31002,12 +31002,12 @@ public final class ClientProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest.Builder.class);
       }
@@ -31057,7 +31057,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest getDefaultInstanceForType() {
@@ -31184,7 +31184,7 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // repeated .RegionAction regionAction = 1;
+      // repeated .hbase.pb.RegionAction regionAction = 1;
       private java.util.List regionAction_ =
         java.util.Collections.emptyList();
       private void ensureRegionActionIsMutable() {
@@ -31198,7 +31198,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionOrBuilder> regionActionBuilder_;
 
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public java.util.List getRegionActionList() {
         if (regionActionBuilder_ == null) {
@@ -31208,7 +31208,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public int getRegionActionCount() {
         if (regionActionBuilder_ == null) {
@@ -31218,7 +31218,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction getRegionAction(int index) {
         if (regionActionBuilder_ == null) {
@@ -31228,7 +31228,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder setRegionAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction value) {
@@ -31245,7 +31245,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder setRegionAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder builderForValue) {
@@ -31259,7 +31259,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder addRegionAction(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction value) {
         if (regionActionBuilder_ == null) {
@@ -31275,7 +31275,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder addRegionAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction value) {
@@ -31292,7 +31292,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder addRegionAction(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder builderForValue) {
@@ -31306,7 +31306,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder addRegionAction(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder builderForValue) {
@@ -31320,7 +31320,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder addAllRegionAction(
           java.lang.Iterable values) {
@@ -31334,7 +31334,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder clearRegionAction() {
         if (regionActionBuilder_ == null) {
@@ -31347,7 +31347,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public Builder removeRegionAction(int index) {
         if (regionActionBuilder_ == null) {
@@ -31360,14 +31360,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder getRegionActionBuilder(
           int index) {
         return getRegionActionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionOrBuilder getRegionActionOrBuilder(
           int index) {
@@ -31377,7 +31377,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public java.util.List 
            getRegionActionOrBuilderList() {
@@ -31388,14 +31388,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder addRegionActionBuilder() {
         return getRegionActionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.getDefaultInstance());
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.Builder addRegionActionBuilder(
           int index) {
@@ -31403,7 +31403,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction.getDefaultInstance());
       }
       /**
-       * repeated .RegionAction regionAction = 1;
+       * repeated .hbase.pb.RegionAction regionAction = 1;
        */
       public java.util.List 
            getRegionActionBuilderList() {
@@ -31457,18 +31457,18 @@ public final class ClientProtos {
         return this;
       }
 
-      // optional .Condition condition = 3;
+      // optional .hbase.pb.Condition condition = 3;
       private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition condition_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder> conditionBuilder_;
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public boolean hasCondition() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition getCondition() {
         if (conditionBuilder_ == null) {
@@ -31478,7 +31478,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder setCondition(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition value) {
         if (conditionBuilder_ == null) {
@@ -31494,7 +31494,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder setCondition(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder builderForValue) {
@@ -31508,7 +31508,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder mergeCondition(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition value) {
         if (conditionBuilder_ == null) {
@@ -31527,7 +31527,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public Builder clearCondition() {
         if (conditionBuilder_ == null) {
@@ -31540,7 +31540,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder getConditionBuilder() {
         bitField0_ |= 0x00000004;
@@ -31548,7 +31548,7 @@ public final class ClientProtos {
         return getConditionFieldBuilder().getBuilder();
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder getConditionOrBuilder() {
         if (conditionBuilder_ != null) {
@@ -31558,7 +31558,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * optional .Condition condition = 3;
+       * optional .hbase.pb.Condition condition = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Condition.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ConditionOrBuilder> 
@@ -31574,7 +31574,7 @@ public final class ClientProtos {
         return conditionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultiRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultiRequest)
     }
 
     static {
@@ -31582,33 +31582,33 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultiRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiRequest)
   }
 
   public interface MultiResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .RegionActionResult regionActionResult = 1;
+    // repeated .hbase.pb.RegionActionResult regionActionResult = 1;
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     java.util.List 
         getRegionActionResultList();
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getRegionActionResult(int index);
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     int getRegionActionResultCount();
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     java.util.List 
         getRegionActionResultOrBuilderList();
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder getRegionActionResultOrBuilder(
         int index);
@@ -31632,7 +31632,7 @@ public final class ClientProtos {
     boolean getProcessed();
   }
   /**
-   * Protobuf type {@code MultiResponse}
+   * Protobuf type {@code hbase.pb.MultiResponse}
    */
   public static final class MultiResponse extends
       com.google.protobuf.GeneratedMessage
@@ -31712,12 +31712,12 @@ public final class ClientProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse.Builder.class);
     }
@@ -31738,36 +31738,36 @@ public final class ClientProtos {
     }
 
     private int bitField0_;
-    // repeated .RegionActionResult regionActionResult = 1;
+    // repeated .hbase.pb.RegionActionResult regionActionResult = 1;
     public static final int REGIONACTIONRESULT_FIELD_NUMBER = 1;
     private java.util.List regionActionResult_;
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     public java.util.List getRegionActionResultList() {
       return regionActionResult_;
     }
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     public java.util.List 
         getRegionActionResultOrBuilderList() {
       return regionActionResult_;
     }
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     public int getRegionActionResultCount() {
       return regionActionResult_.size();
     }
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getRegionActionResult(int index) {
       return regionActionResult_.get(index);
     }
     /**
-     * repeated .RegionActionResult regionActionResult = 1;
+     * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder getRegionActionResultOrBuilder(
         int index) {
@@ -31966,19 +31966,19 @@ public final class ClientProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultiResponse}
+     * Protobuf type {@code hbase.pb.MultiResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse.Builder.class);
       }
@@ -32021,7 +32021,7 @@ public final class ClientProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_MultiResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse getDefaultInstanceForType() {
@@ -32131,7 +32131,7 @@ public final class ClientProtos {
       }
       private int bitField0_;
 
-      // repeated .RegionActionResult regionActionResult = 1;
+      // repeated .hbase.pb.RegionActionResult regionActionResult = 1;
       private java.util.List regionActionResult_ =
         java.util.Collections.emptyList();
       private void ensureRegionActionResultIsMutable() {
@@ -32145,7 +32145,7 @@ public final class ClientProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder> regionActionResultBuilder_;
 
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public java.util.List getRegionActionResultList() {
         if (regionActionResultBuilder_ == null) {
@@ -32155,7 +32155,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public int getRegionActionResultCount() {
         if (regionActionResultBuilder_ == null) {
@@ -32165,7 +32165,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getRegionActionResult(int index) {
         if (regionActionResultBuilder_ == null) {
@@ -32175,7 +32175,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder setRegionActionResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult value) {
@@ -32192,7 +32192,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder setRegionActionResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder builderForValue) {
@@ -32206,7 +32206,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder addRegionActionResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult value) {
         if (regionActionResultBuilder_ == null) {
@@ -32222,7 +32222,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder addRegionActionResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult value) {
@@ -32239,7 +32239,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder addRegionActionResult(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder builderForValue) {
@@ -32253,7 +32253,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder addRegionActionResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder builderForValue) {
@@ -32267,7 +32267,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder addAllRegionActionResult(
           java.lang.Iterable values) {
@@ -32281,7 +32281,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder clearRegionActionResult() {
         if (regionActionResultBuilder_ == null) {
@@ -32294,7 +32294,7 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public Builder removeRegionActionResult(int index) {
         if (regionActionResultBuilder_ == null) {
@@ -32307,14 +32307,14 @@ public final class ClientProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder getRegionActionResultBuilder(
           int index) {
         return getRegionActionResultFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder getRegionActionResultOrBuilder(
           int index) {
@@ -32324,7 +32324,7 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public java.util.List 
            getRegionActionResultOrBuilderList() {
@@ -32335,14 +32335,14 @@ public final class ClientProtos {
         }
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder addRegionActionResultBuilder() {
         return getRegionActionResultFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.getDefaultInstance());
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder addRegionActionResultBuilder(
           int index) {
@@ -32350,7 +32350,7 @@ public final class ClientProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.getDefaultInstance());
       }
       /**
-       * repeated .RegionActionResult regionActionResult = 1;
+       * repeated .hbase.pb.RegionActionResult regionActionResult = 1;
        */
       public java.util.List 
            getRegionActionResultBuilderList() {
@@ -32420,7 +32420,7 @@ public final class ClientProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultiResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultiResponse)
     }
 
     static {
@@ -32428,11 +32428,11 @@ public final class ClientProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultiResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiResponse)
   }
 
   /**
-   * Protobuf service {@code ClientService}
+   * Protobuf service {@code hbase.pb.ClientService}
    */
   public static abstract class ClientService
       implements com.google.protobuf.Service {
@@ -32440,7 +32440,7 @@ public final class ClientProtos {
 
     public interface Interface {
       /**
-       * rpc Get(.GetRequest) returns (.GetResponse);
+       * rpc Get(.hbase.pb.GetRequest) returns (.hbase.pb.GetResponse);
        */
       public abstract void get(
           com.google.protobuf.RpcController controller,
@@ -32448,7 +32448,7 @@ public final class ClientProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Mutate(.MutateRequest) returns (.MutateResponse);
+       * rpc Mutate(.hbase.pb.MutateRequest) returns (.hbase.pb.MutateResponse);
        */
       public abstract void mutate(
           com.google.protobuf.RpcController controller,
@@ -32456,7 +32456,7 @@ public final class ClientProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Scan(.ScanRequest) returns (.ScanResponse);
+       * rpc Scan(.hbase.pb.ScanRequest) returns (.hbase.pb.ScanResponse);
        */
       public abstract void scan(
           com.google.protobuf.RpcController controller,
@@ -32464,7 +32464,7 @@ public final class ClientProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc BulkLoadHFile(.BulkLoadHFileRequest) returns (.BulkLoadHFileResponse);
+       * rpc BulkLoadHFile(.hbase.pb.BulkLoadHFileRequest) returns (.hbase.pb.BulkLoadHFileResponse);
        */
       public abstract void bulkLoadHFile(
           com.google.protobuf.RpcController controller,
@@ -32472,7 +32472,7 @@ public final class ClientProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ExecService(.CoprocessorServiceRequest) returns (.CoprocessorServiceResponse);
+       * rpc ExecService(.hbase.pb.CoprocessorServiceRequest) returns (.hbase.pb.CoprocessorServiceResponse);
        */
       public abstract void execService(
           com.google.protobuf.RpcController controller,
@@ -32480,7 +32480,7 @@ public final class ClientProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ExecRegionServerService(.CoprocessorServiceRequest) returns (.CoprocessorServiceResponse);
+       * rpc ExecRegionServerService(.hbase.pb.CoprocessorServiceRequest) returns (.hbase.pb.CoprocessorServiceResponse);
        */
       public abstract void execRegionServerService(
           com.google.protobuf.RpcController controller,
@@ -32488,7 +32488,7 @@ public final class ClientProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Multi(.MultiRequest) returns (.MultiResponse);
+       * rpc Multi(.hbase.pb.MultiRequest) returns (.hbase.pb.MultiResponse);
        */
       public abstract void multi(
           com.google.protobuf.RpcController controller,
@@ -32657,7 +32657,7 @@ public final class ClientProtos {
     }
 
     /**
-     * rpc Get(.GetRequest) returns (.GetResponse);
+     * rpc Get(.hbase.pb.GetRequest) returns (.hbase.pb.GetResponse);
      */
     public abstract void get(
         com.google.protobuf.RpcController controller,
@@ -32665,7 +32665,7 @@ public final class ClientProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Mutate(.MutateRequest) returns (.MutateResponse);
+     * rpc Mutate(.hbase.pb.MutateRequest) returns (.hbase.pb.MutateResponse);
      */
     public abstract void mutate(
         com.google.protobuf.RpcController controller,
@@ -32673,7 +32673,7 @@ public final class ClientProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Scan(.ScanRequest) returns (.ScanResponse);
+     * rpc Scan(.hbase.pb.ScanRequest) returns (.hbase.pb.ScanResponse);
      */
     public abstract void scan(
         com.google.protobuf.RpcController controller,
@@ -32681,7 +32681,7 @@ public final class ClientProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc BulkLoadHFile(.BulkLoadHFileRequest) returns (.BulkLoadHFileResponse);
+     * rpc BulkLoadHFile(.hbase.pb.BulkLoadHFileRequest) returns (.hbase.pb.BulkLoadHFileResponse);
      */
     public abstract void bulkLoadHFile(
         com.google.protobuf.RpcController controller,
@@ -32689,7 +32689,7 @@ public final class ClientProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ExecService(.CoprocessorServiceRequest) returns (.CoprocessorServiceResponse);
+     * rpc ExecService(.hbase.pb.CoprocessorServiceRequest) returns (.hbase.pb.CoprocessorServiceResponse);
      */
     public abstract void execService(
         com.google.protobuf.RpcController controller,
@@ -32697,7 +32697,7 @@ public final class ClientProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ExecRegionServerService(.CoprocessorServiceRequest) returns (.CoprocessorServiceResponse);
+     * rpc ExecRegionServerService(.hbase.pb.CoprocessorServiceRequest) returns (.hbase.pb.CoprocessorServiceResponse);
      */
     public abstract void execRegionServerService(
         com.google.protobuf.RpcController controller,
@@ -32705,7 +32705,7 @@ public final class ClientProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Multi(.MultiRequest) returns (.MultiResponse);
+     * rpc Multi(.hbase.pb.MultiRequest) returns (.hbase.pb.MultiResponse);
      */
     public abstract void multi(
         com.google.protobuf.RpcController controller,
@@ -33086,159 +33086,159 @@ public final class ClientProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:ClientService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ClientService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Authorizations_descriptor;
+    internal_static_hbase_pb_Authorizations_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Authorizations_fieldAccessorTable;
+      internal_static_hbase_pb_Authorizations_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CellVisibility_descriptor;
+    internal_static_hbase_pb_CellVisibility_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CellVisibility_fieldAccessorTable;
+      internal_static_hbase_pb_CellVisibility_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Column_descriptor;
+    internal_static_hbase_pb_Column_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Column_fieldAccessorTable;
+      internal_static_hbase_pb_Column_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Get_descriptor;
+    internal_static_hbase_pb_Get_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Get_fieldAccessorTable;
+      internal_static_hbase_pb_Get_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Result_descriptor;
+    internal_static_hbase_pb_Result_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Result_fieldAccessorTable;
+      internal_static_hbase_pb_Result_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetRequest_descriptor;
+    internal_static_hbase_pb_GetRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetResponse_descriptor;
+    internal_static_hbase_pb_GetResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Condition_descriptor;
+    internal_static_hbase_pb_Condition_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Condition_fieldAccessorTable;
+      internal_static_hbase_pb_Condition_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutationProto_descriptor;
+    internal_static_hbase_pb_MutationProto_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutationProto_fieldAccessorTable;
+      internal_static_hbase_pb_MutationProto_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutationProto_ColumnValue_descriptor;
+    internal_static_hbase_pb_MutationProto_ColumnValue_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutationProto_ColumnValue_fieldAccessorTable;
+      internal_static_hbase_pb_MutationProto_ColumnValue_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutationProto_ColumnValue_QualifierValue_descriptor;
+    internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable;
+      internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutateRequest_descriptor;
+    internal_static_hbase_pb_MutateRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutateRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MutateRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutateResponse_descriptor;
+    internal_static_hbase_pb_MutateResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutateResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MutateResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Scan_descriptor;
+    internal_static_hbase_pb_Scan_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Scan_fieldAccessorTable;
+      internal_static_hbase_pb_Scan_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ScanRequest_descriptor;
+    internal_static_hbase_pb_ScanRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ScanRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ScanRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ScanResponse_descriptor;
+    internal_static_hbase_pb_ScanResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ScanResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ScanResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BulkLoadHFileRequest_descriptor;
+    internal_static_hbase_pb_BulkLoadHFileRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BulkLoadHFileRequest_fieldAccessorTable;
+      internal_static_hbase_pb_BulkLoadHFileRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BulkLoadHFileRequest_FamilyPath_descriptor;
+    internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable;
+      internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BulkLoadHFileResponse_descriptor;
+    internal_static_hbase_pb_BulkLoadHFileResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BulkLoadHFileResponse_fieldAccessorTable;
+      internal_static_hbase_pb_BulkLoadHFileResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CoprocessorServiceCall_descriptor;
+    internal_static_hbase_pb_CoprocessorServiceCall_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CoprocessorServiceCall_fieldAccessorTable;
+      internal_static_hbase_pb_CoprocessorServiceCall_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CoprocessorServiceResult_descriptor;
+    internal_static_hbase_pb_CoprocessorServiceResult_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CoprocessorServiceResult_fieldAccessorTable;
+      internal_static_hbase_pb_CoprocessorServiceResult_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CoprocessorServiceRequest_descriptor;
+    internal_static_hbase_pb_CoprocessorServiceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CoprocessorServiceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CoprocessorServiceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CoprocessorServiceResponse_descriptor;
+    internal_static_hbase_pb_CoprocessorServiceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CoprocessorServiceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CoprocessorServiceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Action_descriptor;
+    internal_static_hbase_pb_Action_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Action_fieldAccessorTable;
+      internal_static_hbase_pb_Action_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionAction_descriptor;
+    internal_static_hbase_pb_RegionAction_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionAction_fieldAccessorTable;
+      internal_static_hbase_pb_RegionAction_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionLoadStats_descriptor;
+    internal_static_hbase_pb_RegionLoadStats_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionLoadStats_fieldAccessorTable;
+      internal_static_hbase_pb_RegionLoadStats_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ResultOrException_descriptor;
+    internal_static_hbase_pb_ResultOrException_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ResultOrException_fieldAccessorTable;
+      internal_static_hbase_pb_ResultOrException_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionActionResult_descriptor;
+    internal_static_hbase_pb_RegionActionResult_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionActionResult_fieldAccessorTable;
+      internal_static_hbase_pb_RegionActionResult_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultiRequest_descriptor;
+    internal_static_hbase_pb_MultiRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultiRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MultiRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultiResponse_descriptor;
+    internal_static_hbase_pb_MultiResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultiResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MultiResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -33248,310 +33248,325 @@ public final class ClientProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014Client.proto\032\013HBase.proto\032\014Filter.prot" +
-      "o\032\nCell.proto\032\020Comparator.proto\032\017MapRedu" +
-      "ce.proto\"\037\n\016Authorizations\022\r\n\005label\030\001 \003(" +
-      "\t\"$\n\016CellVisibility\022\022\n\nexpression\030\001 \002(\t\"" +
-      "+\n\006Column\022\016\n\006family\030\001 \002(\014\022\021\n\tqualifier\030\002" +
-      " \003(\014\"\324\002\n\003Get\022\013\n\003row\030\001 \002(\014\022\027\n\006column\030\002 \003(" +
-      "\0132\007.Column\022!\n\tattribute\030\003 \003(\0132\016.NameByte" +
-      "sPair\022\027\n\006filter\030\004 \001(\0132\007.Filter\022\036\n\ntime_r" +
-      "ange\030\005 \001(\0132\n.TimeRange\022\027\n\014max_versions\030\006" +
-      " \001(\r:\0011\022\032\n\014cache_blocks\030\007 \001(\010:\004true\022\023\n\013s",
-      "tore_limit\030\010 \001(\r\022\024\n\014store_offset\030\t \001(\r\022\035" +
-      "\n\016existence_only\030\n \001(\010:\005false\022!\n\022closest" +
-      "_row_before\030\013 \001(\010:\005false\022)\n\013consistency\030" +
-      "\014 \001(\0162\014.Consistency:\006STRONG\"z\n\006Result\022\023\n" +
-      "\004cell\030\001 \003(\0132\005.Cell\022\035\n\025associated_cell_co" +
-      "unt\030\002 \001(\005\022\016\n\006exists\030\003 \001(\010\022\024\n\005stale\030\004 \001(\010" +
-      ":\005false\022\026\n\007partial\030\005 \001(\010:\005false\"A\n\nGetRe" +
-      "quest\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier\022" +
-      "\021\n\003get\030\002 \002(\0132\004.Get\"&\n\013GetResponse\022\027\n\006res" +
-      "ult\030\001 \001(\0132\007.Result\"\200\001\n\tCondition\022\013\n\003row\030",
-      "\001 \002(\014\022\016\n\006family\030\002 \002(\014\022\021\n\tqualifier\030\003 \002(\014" +
-      "\022\"\n\014compare_type\030\004 \002(\0162\014.CompareType\022\037\n\n" +
-      "comparator\030\005 \002(\0132\013.Comparator\"\265\006\n\rMutati" +
-      "onProto\022\013\n\003row\030\001 \001(\014\0220\n\013mutate_type\030\002 \001(" +
-      "\0162\033.MutationProto.MutationType\0220\n\014column" +
-      "_value\030\003 \003(\0132\032.MutationProto.ColumnValue" +
-      "\022\021\n\ttimestamp\030\004 \001(\004\022!\n\tattribute\030\005 \003(\0132\016" +
-      ".NameBytesPair\022:\n\ndurability\030\006 \001(\0162\031.Mut" +
-      "ationProto.Durability:\013USE_DEFAULT\022\036\n\nti" +
-      "me_range\030\007 \001(\0132\n.TimeRange\022\035\n\025associated",
-      "_cell_count\030\010 \001(\005\022\r\n\005nonce\030\t \001(\004\032\347\001\n\013Col" +
-      "umnValue\022\016\n\006family\030\001 \002(\014\022B\n\017qualifier_va" +
-      "lue\030\002 \003(\0132).MutationProto.ColumnValue.Qu" +
-      "alifierValue\032\203\001\n\016QualifierValue\022\021\n\tquali" +
-      "fier\030\001 \001(\014\022\r\n\005value\030\002 \001(\014\022\021\n\ttimestamp\030\003" +
-      " \001(\004\022.\n\013delete_type\030\004 \001(\0162\031.MutationProt" +
-      "o.DeleteType\022\014\n\004tags\030\005 \001(\014\"W\n\nDurability" +
-      "\022\017\n\013USE_DEFAULT\020\000\022\014\n\010SKIP_WAL\020\001\022\r\n\tASYNC" +
-      "_WAL\020\002\022\014\n\010SYNC_WAL\020\003\022\r\n\tFSYNC_WAL\020\004\">\n\014M" +
-      "utationType\022\n\n\006APPEND\020\000\022\r\n\tINCREMENT\020\001\022\007",
-      "\n\003PUT\020\002\022\n\n\006DELETE\020\003\"p\n\nDeleteType\022\026\n\022DEL" +
-      "ETE_ONE_VERSION\020\000\022\034\n\030DELETE_MULTIPLE_VER" +
-      "SIONS\020\001\022\021\n\rDELETE_FAMILY\020\002\022\031\n\025DELETE_FAM" +
-      "ILY_VERSION\020\003\"\207\001\n\rMutateRequest\022 \n\006regio" +
-      "n\030\001 \002(\0132\020.RegionSpecifier\022 \n\010mutation\030\002 " +
-      "\002(\0132\016.MutationProto\022\035\n\tcondition\030\003 \001(\0132\n" +
-      ".Condition\022\023\n\013nonce_group\030\004 \001(\004\"<\n\016Mutat" +
-      "eResponse\022\027\n\006result\030\001 \001(\0132\007.Result\022\021\n\tpr" +
-      "ocessed\030\002 \001(\010\"\271\003\n\004Scan\022\027\n\006column\030\001 \003(\0132\007" +
-      ".Column\022!\n\tattribute\030\002 \003(\0132\016.NameBytesPa",
-      "ir\022\021\n\tstart_row\030\003 \001(\014\022\020\n\010stop_row\030\004 \001(\014\022" +
-      "\027\n\006filter\030\005 \001(\0132\007.Filter\022\036\n\ntime_range\030\006" +
-      " \001(\0132\n.TimeRange\022\027\n\014max_versions\030\007 \001(\r:\001" +
-      "1\022\032\n\014cache_blocks\030\010 \001(\010:\004true\022\022\n\nbatch_s" +
-      "ize\030\t \001(\r\022\027\n\017max_result_size\030\n \001(\004\022\023\n\013st" +
-      "ore_limit\030\013 \001(\r\022\024\n\014store_offset\030\014 \001(\r\022&\n" +
-      "\036load_column_families_on_demand\030\r \001(\010\022\r\n" +
-      "\005small\030\016 \001(\010\022\027\n\010reversed\030\017 \001(\010:\005false\022)\n" +
-      "\013consistency\030\020 \001(\0162\014.Consistency:\006STRONG" +
-      "\022\017\n\007caching\030\021 \001(\r\"\376\001\n\013ScanRequest\022 \n\006reg",
-      "ion\030\001 \001(\0132\020.RegionSpecifier\022\023\n\004scan\030\002 \001(" +
-      "\0132\005.Scan\022\022\n\nscanner_id\030\003 \001(\004\022\026\n\016number_o" +
-      "f_rows\030\004 \001(\r\022\025\n\rclose_scanner\030\005 \001(\010\022\025\n\rn" +
-      "ext_call_seq\030\006 \001(\004\022\037\n\027client_handles_par" +
-      "tials\030\007 \001(\010\022!\n\031client_handles_heartbeats" +
-      "\030\010 \001(\010\022\032\n\022track_scan_metrics\030\t \001(\010\"\210\002\n\014S" +
-      "canResponse\022\030\n\020cells_per_result\030\001 \003(\r\022\022\n" +
-      "\nscanner_id\030\002 \001(\004\022\024\n\014more_results\030\003 \001(\010\022" +
-      "\013\n\003ttl\030\004 \001(\r\022\030\n\007results\030\005 \003(\0132\007.Result\022\r" +
-      "\n\005stale\030\006 \001(\010\022\037\n\027partial_flag_per_result",
-      "\030\007 \003(\010\022\036\n\026more_results_in_region\030\010 \001(\010\022\031" +
-      "\n\021heartbeat_message\030\t \001(\010\022\"\n\014scan_metric" +
-      "s\030\n \001(\0132\014.ScanMetrics\"\263\001\n\024BulkLoadHFileR" +
-      "equest\022 \n\006region\030\001 \002(\0132\020.RegionSpecifier" +
-      "\0225\n\013family_path\030\002 \003(\0132 .BulkLoadHFileReq" +
-      "uest.FamilyPath\022\026\n\016assign_seq_num\030\003 \001(\010\032" +
-      "*\n\nFamilyPath\022\016\n\006family\030\001 \002(\014\022\014\n\004path\030\002 " +
-      "\002(\t\"\'\n\025BulkLoadHFileResponse\022\016\n\006loaded\030\001" +
-      " \002(\010\"a\n\026CoprocessorServiceCall\022\013\n\003row\030\001 " +
-      "\002(\014\022\024\n\014service_name\030\002 \002(\t\022\023\n\013method_name",
-      "\030\003 \002(\t\022\017\n\007request\030\004 \002(\014\"9\n\030CoprocessorSe" +
-      "rviceResult\022\035\n\005value\030\001 \001(\0132\016.NameBytesPa" +
-      "ir\"d\n\031CoprocessorServiceRequest\022 \n\006regio" +
-      "n\030\001 \002(\0132\020.RegionSpecifier\022%\n\004call\030\002 \002(\0132" +
-      "\027.CoprocessorServiceCall\"]\n\032CoprocessorS" +
-      "erviceResponse\022 \n\006region\030\001 \002(\0132\020.RegionS" +
-      "pecifier\022\035\n\005value\030\002 \002(\0132\016.NameBytesPair\"" +
-      "{\n\006Action\022\r\n\005index\030\001 \001(\r\022 \n\010mutation\030\002 \001" +
-      "(\0132\016.MutationProto\022\021\n\003get\030\003 \001(\0132\004.Get\022-\n" +
-      "\014service_call\030\004 \001(\0132\027.CoprocessorService",
-      "Call\"Y\n\014RegionAction\022 \n\006region\030\001 \002(\0132\020.R" +
-      "egionSpecifier\022\016\n\006atomic\030\002 \001(\010\022\027\n\006action" +
-      "\030\003 \003(\0132\007.Action\"D\n\017RegionLoadStats\022\027\n\014me" +
-      "mstoreLoad\030\001 \001(\005:\0010\022\030\n\rheapOccupancy\030\002 \001" +
-      "(\005:\0010\"\266\001\n\021ResultOrException\022\r\n\005index\030\001 \001" +
-      "(\r\022\027\n\006result\030\002 \001(\0132\007.Result\022!\n\texception" +
-      "\030\003 \001(\0132\016.NameBytesPair\0221\n\016service_result" +
-      "\030\004 \001(\0132\031.CoprocessorServiceResult\022#\n\tloa" +
-      "dStats\030\005 \001(\0132\020.RegionLoadStats\"f\n\022Region" +
-      "ActionResult\022-\n\021resultOrException\030\001 \003(\0132",
-      "\022.ResultOrException\022!\n\texception\030\002 \001(\0132\016" +
-      ".NameBytesPair\"f\n\014MultiRequest\022#\n\014region" +
-      "Action\030\001 \003(\0132\r.RegionAction\022\022\n\nnonceGrou" +
-      "p\030\002 \001(\004\022\035\n\tcondition\030\003 \001(\0132\n.Condition\"S" +
-      "\n\rMultiResponse\022/\n\022regionActionResult\030\001 " +
-      "\003(\0132\023.RegionActionResult\022\021\n\tprocessed\030\002 " +
+      "\n\014Client.proto\022\010hbase.pb\032\013HBase.proto\032\014F" +
+      "ilter.proto\032\nCell.proto\032\020Comparator.prot" +
+      "o\032\017MapReduce.proto\"\037\n\016Authorizations\022\r\n\005" +
+      "label\030\001 \003(\t\"$\n\016CellVisibility\022\022\n\nexpress" +
+      "ion\030\001 \002(\t\"+\n\006Column\022\016\n\006family\030\001 \002(\014\022\021\n\tq" +
+      "ualifier\030\002 \003(\014\"\201\003\n\003Get\022\013\n\003row\030\001 \002(\014\022 \n\006c" +
+      "olumn\030\002 \003(\0132\020.hbase.pb.Column\022*\n\tattribu" +
+      "te\030\003 \003(\0132\027.hbase.pb.NameBytesPair\022 \n\006fil" +
+      "ter\030\004 \001(\0132\020.hbase.pb.Filter\022\'\n\ntime_rang" +
+      "e\030\005 \001(\0132\023.hbase.pb.TimeRange\022\027\n\014max_vers",
+      "ions\030\006 \001(\r:\0011\022\032\n\014cache_blocks\030\007 \001(\010:\004tru" +
+      "e\022\023\n\013store_limit\030\010 \001(\r\022\024\n\014store_offset\030\t" +
+      " \001(\r\022\035\n\016existence_only\030\n \001(\010:\005false\022!\n\022c" +
+      "losest_row_before\030\013 \001(\010:\005false\0222\n\013consis" +
+      "tency\030\014 \001(\0162\025.hbase.pb.Consistency:\006STRO" +
+      "NG\"\203\001\n\006Result\022\034\n\004cell\030\001 \003(\0132\016.hbase.pb.C" +
+      "ell\022\035\n\025associated_cell_count\030\002 \001(\005\022\016\n\006ex" +
+      "ists\030\003 \001(\010\022\024\n\005stale\030\004 \001(\010:\005false\022\026\n\007part" +
+      "ial\030\005 \001(\010:\005false\"S\n\nGetRequest\022)\n\006region" +
+      "\030\001 \002(\0132\031.hbase.pb.RegionSpecifier\022\032\n\003get",
+      "\030\002 \002(\0132\r.hbase.pb.Get\"/\n\013GetResponse\022 \n\006" +
+      "result\030\001 \001(\0132\020.hbase.pb.Result\"\222\001\n\tCondi" +
+      "tion\022\013\n\003row\030\001 \002(\014\022\016\n\006family\030\002 \002(\014\022\021\n\tqua" +
+      "lifier\030\003 \002(\014\022+\n\014compare_type\030\004 \002(\0162\025.hba" +
+      "se.pb.CompareType\022(\n\ncomparator\030\005 \002(\0132\024." +
+      "hbase.pb.Comparator\"\364\006\n\rMutationProto\022\013\n" +
+      "\003row\030\001 \001(\014\0229\n\013mutate_type\030\002 \001(\0162$.hbase." +
+      "pb.MutationProto.MutationType\0229\n\014column_" +
+      "value\030\003 \003(\0132#.hbase.pb.MutationProto.Col" +
+      "umnValue\022\021\n\ttimestamp\030\004 \001(\004\022*\n\tattribute",
+      "\030\005 \003(\0132\027.hbase.pb.NameBytesPair\022C\n\ndurab" +
+      "ility\030\006 \001(\0162\".hbase.pb.MutationProto.Dur" +
+      "ability:\013USE_DEFAULT\022\'\n\ntime_range\030\007 \001(\013" +
+      "2\023.hbase.pb.TimeRange\022\035\n\025associated_cell" +
+      "_count\030\010 \001(\005\022\r\n\005nonce\030\t \001(\004\032\371\001\n\013ColumnVa" +
+      "lue\022\016\n\006family\030\001 \002(\014\022K\n\017qualifier_value\030\002" +
+      " \003(\01322.hbase.pb.MutationProto.ColumnValu" +
+      "e.QualifierValue\032\214\001\n\016QualifierValue\022\021\n\tq" +
+      "ualifier\030\001 \001(\014\022\r\n\005value\030\002 \001(\014\022\021\n\ttimesta" +
+      "mp\030\003 \001(\004\0227\n\013delete_type\030\004 \001(\0162\".hbase.pb",
+      ".MutationProto.DeleteType\022\014\n\004tags\030\005 \001(\014\"" +
+      "W\n\nDurability\022\017\n\013USE_DEFAULT\020\000\022\014\n\010SKIP_W" +
+      "AL\020\001\022\r\n\tASYNC_WAL\020\002\022\014\n\010SYNC_WAL\020\003\022\r\n\tFSY" +
+      "NC_WAL\020\004\">\n\014MutationType\022\n\n\006APPEND\020\000\022\r\n\t" +
+      "INCREMENT\020\001\022\007\n\003PUT\020\002\022\n\n\006DELETE\020\003\"p\n\nDele" +
+      "teType\022\026\n\022DELETE_ONE_VERSION\020\000\022\034\n\030DELETE" +
+      "_MULTIPLE_VERSIONS\020\001\022\021\n\rDELETE_FAMILY\020\002\022" +
+      "\031\n\025DELETE_FAMILY_VERSION\020\003\"\242\001\n\rMutateReq" +
+      "uest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionSp" +
+      "ecifier\022)\n\010mutation\030\002 \002(\0132\027.hbase.pb.Mut",
+      "ationProto\022&\n\tcondition\030\003 \001(\0132\023.hbase.pb" +
+      ".Condition\022\023\n\013nonce_group\030\004 \001(\004\"E\n\016Mutat" +
+      "eResponse\022 \n\006result\030\001 \001(\0132\020.hbase.pb.Res" +
+      "ult\022\021\n\tprocessed\030\002 \001(\010\"\346\003\n\004Scan\022 \n\006colum" +
+      "n\030\001 \003(\0132\020.hbase.pb.Column\022*\n\tattribute\030\002" +
+      " \003(\0132\027.hbase.pb.NameBytesPair\022\021\n\tstart_r" +
+      "ow\030\003 \001(\014\022\020\n\010stop_row\030\004 \001(\014\022 \n\006filter\030\005 \001" +
+      "(\0132\020.hbase.pb.Filter\022\'\n\ntime_range\030\006 \001(\013" +
+      "2\023.hbase.pb.TimeRange\022\027\n\014max_versions\030\007 " +
+      "\001(\r:\0011\022\032\n\014cache_blocks\030\010 \001(\010:\004true\022\022\n\nba",
+      "tch_size\030\t \001(\r\022\027\n\017max_result_size\030\n \001(\004\022" +
+      "\023\n\013store_limit\030\013 \001(\r\022\024\n\014store_offset\030\014 \001" +
+      "(\r\022&\n\036load_column_families_on_demand\030\r \001" +
+      "(\010\022\r\n\005small\030\016 \001(\010\022\027\n\010reversed\030\017 \001(\010:\005fal" +
+      "se\0222\n\013consistency\030\020 \001(\0162\025.hbase.pb.Consi" +
+      "stency:\006STRONG\022\017\n\007caching\030\021 \001(\r\"\220\002\n\013Scan" +
+      "Request\022)\n\006region\030\001 \001(\0132\031.hbase.pb.Regio" +
+      "nSpecifier\022\034\n\004scan\030\002 \001(\0132\016.hbase.pb.Scan" +
+      "\022\022\n\nscanner_id\030\003 \001(\004\022\026\n\016number_of_rows\030\004" +
+      " \001(\r\022\025\n\rclose_scanner\030\005 \001(\010\022\025\n\rnext_call",
+      "_seq\030\006 \001(\004\022\037\n\027client_handles_partials\030\007 " +
+      "\001(\010\022!\n\031client_handles_heartbeats\030\010 \001(\010\022\032" +
+      "\n\022track_scan_metrics\030\t \001(\010\"\232\002\n\014ScanRespo" +
+      "nse\022\030\n\020cells_per_result\030\001 \003(\r\022\022\n\nscanner" +
+      "_id\030\002 \001(\004\022\024\n\014more_results\030\003 \001(\010\022\013\n\003ttl\030\004" +
+      " \001(\r\022!\n\007results\030\005 \003(\0132\020.hbase.pb.Result\022" +
+      "\r\n\005stale\030\006 \001(\010\022\037\n\027partial_flag_per_resul" +
+      "t\030\007 \003(\010\022\036\n\026more_results_in_region\030\010 \001(\010\022" +
+      "\031\n\021heartbeat_message\030\t \001(\010\022+\n\014scan_metri" +
+      "cs\030\n \001(\0132\025.hbase.pb.ScanMetrics\"\305\001\n\024Bulk",
+      "LoadHFileRequest\022)\n\006region\030\001 \002(\0132\031.hbase" +
+      ".pb.RegionSpecifier\022>\n\013family_path\030\002 \003(\013" +
+      "2).hbase.pb.BulkLoadHFileRequest.FamilyP" +
+      "ath\022\026\n\016assign_seq_num\030\003 \001(\010\032*\n\nFamilyPat" +
+      "h\022\016\n\006family\030\001 \002(\014\022\014\n\004path\030\002 \002(\t\"\'\n\025BulkL" +
+      "oadHFileResponse\022\016\n\006loaded\030\001 \002(\010\"a\n\026Copr" +
+      "ocessorServiceCall\022\013\n\003row\030\001 \002(\014\022\024\n\014servi" +
+      "ce_name\030\002 \002(\t\022\023\n\013method_name\030\003 \002(\t\022\017\n\007re" +
+      "quest\030\004 \002(\014\"B\n\030CoprocessorServiceResult\022" +
+      "&\n\005value\030\001 \001(\0132\027.hbase.pb.NameBytesPair\"",
+      "v\n\031CoprocessorServiceRequest\022)\n\006region\030\001" +
+      " \002(\0132\031.hbase.pb.RegionSpecifier\022.\n\004call\030" +
+      "\002 \002(\0132 .hbase.pb.CoprocessorServiceCall\"" +
+      "o\n\032CoprocessorServiceResponse\022)\n\006region\030" +
+      "\001 \002(\0132\031.hbase.pb.RegionSpecifier\022&\n\005valu" +
+      "e\030\002 \002(\0132\027.hbase.pb.NameBytesPair\"\226\001\n\006Act" +
+      "ion\022\r\n\005index\030\001 \001(\r\022)\n\010mutation\030\002 \001(\0132\027.h" +
+      "base.pb.MutationProto\022\032\n\003get\030\003 \001(\0132\r.hba" +
+      "se.pb.Get\0226\n\014service_call\030\004 \001(\0132 .hbase." +
+      "pb.CoprocessorServiceCall\"k\n\014RegionActio",
+      "n\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionSpeci" +
+      "fier\022\016\n\006atomic\030\002 \001(\010\022 \n\006action\030\003 \003(\0132\020.h" +
+      "base.pb.Action\"D\n\017RegionLoadStats\022\027\n\014mem" +
+      "storeLoad\030\001 \001(\005:\0010\022\030\n\rheapOccupancy\030\002 \001(" +
+      "\005:\0010\"\332\001\n\021ResultOrException\022\r\n\005index\030\001 \001(" +
+      "\r\022 \n\006result\030\002 \001(\0132\020.hbase.pb.Result\022*\n\te" +
+      "xception\030\003 \001(\0132\027.hbase.pb.NameBytesPair\022" +
+      ":\n\016service_result\030\004 \001(\0132\".hbase.pb.Copro" +
+      "cessorServiceResult\022,\n\tloadStats\030\005 \001(\0132\031" +
+      ".hbase.pb.RegionLoadStats\"x\n\022RegionActio",
+      "nResult\0226\n\021resultOrException\030\001 \003(\0132\033.hba" +
+      "se.pb.ResultOrException\022*\n\texception\030\002 \001" +
+      "(\0132\027.hbase.pb.NameBytesPair\"x\n\014MultiRequ" +
+      "est\022,\n\014regionAction\030\001 \003(\0132\026.hbase.pb.Reg" +
+      "ionAction\022\022\n\nnonceGroup\030\002 \001(\004\022&\n\tconditi" +
+      "on\030\003 \001(\0132\023.hbase.pb.Condition\"\\\n\rMultiRe" +
+      "sponse\0228\n\022regionActionResult\030\001 \003(\0132\034.hba" +
+      "se.pb.RegionActionResult\022\021\n\tprocessed\030\002 " +
       "\001(\010*\'\n\013Consistency\022\n\n\006STRONG\020\000\022\014\n\010TIMELI" +
-      "NE\020\0012\205\003\n\rClientService\022 \n\003Get\022\013.GetReque" +
-      "st\032\014.GetResponse\022)\n\006Mutate\022\016.MutateReque" +
-      "st\032\017.MutateResponse\022#\n\004Scan\022\014.ScanReques",
-      "t\032\r.ScanResponse\022>\n\rBulkLoadHFile\022\025.Bulk" +
-      "LoadHFileRequest\032\026.BulkLoadHFileResponse" +
-      "\022F\n\013ExecService\022\032.CoprocessorServiceRequ" +
-      "est\032\033.CoprocessorServiceResponse\022R\n\027Exec" +
-      "RegionServerService\022\032.CoprocessorService" +
-      "Request\032\033.CoprocessorServiceResponse\022&\n\005" +
-      "Multi\022\r.MultiRequest\032\016.MultiResponseBB\n*" +
-      "org.apache.hadoop.hbase.protobuf.generat" +
-      "edB\014ClientProtosH\001\210\001\001\240\001\001"
+      "NE\020\0012\203\004\n\rClientService\0222\n\003Get\022\024.hbase.pb",
+      ".GetRequest\032\025.hbase.pb.GetResponse\022;\n\006Mu" +
+      "tate\022\027.hbase.pb.MutateRequest\032\030.hbase.pb" +
+      ".MutateResponse\0225\n\004Scan\022\025.hbase.pb.ScanR" +
+      "equest\032\026.hbase.pb.ScanResponse\022P\n\rBulkLo" +
+      "adHFile\022\036.hbase.pb.BulkLoadHFileRequest\032" +
+      "\037.hbase.pb.BulkLoadHFileResponse\022X\n\013Exec" +
+      "Service\022#.hbase.pb.CoprocessorServiceReq" +
+      "uest\032$.hbase.pb.CoprocessorServiceRespon" +
+      "se\022d\n\027ExecRegionServerService\022#.hbase.pb" +
+      ".CoprocessorServiceRequest\032$.hbase.pb.Co",
+      "processorServiceResponse\0228\n\005Multi\022\026.hbas" +
+      "e.pb.MultiRequest\032\027.hbase.pb.MultiRespon" +
+      "seBB\n*org.apache.hadoop.hbase.protobuf.g" +
+      "eneratedB\014ClientProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_Authorizations_descriptor =
+          internal_static_hbase_pb_Authorizations_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_Authorizations_fieldAccessorTable = new
+          internal_static_hbase_pb_Authorizations_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Authorizations_descriptor,
+              internal_static_hbase_pb_Authorizations_descriptor,
               new java.lang.String[] { "Label", });
-          internal_static_CellVisibility_descriptor =
+          internal_static_hbase_pb_CellVisibility_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_CellVisibility_fieldAccessorTable = new
+          internal_static_hbase_pb_CellVisibility_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CellVisibility_descriptor,
+              internal_static_hbase_pb_CellVisibility_descriptor,
               new java.lang.String[] { "Expression", });
-          internal_static_Column_descriptor =
+          internal_static_hbase_pb_Column_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_Column_fieldAccessorTable = new
+          internal_static_hbase_pb_Column_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Column_descriptor,
+              internal_static_hbase_pb_Column_descriptor,
               new java.lang.String[] { "Family", "Qualifier", });
-          internal_static_Get_descriptor =
+          internal_static_hbase_pb_Get_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_Get_fieldAccessorTable = new
+          internal_static_hbase_pb_Get_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Get_descriptor,
+              internal_static_hbase_pb_Get_descriptor,
               new java.lang.String[] { "Row", "Column", "Attribute", "Filter", "TimeRange", "MaxVersions", "CacheBlocks", "StoreLimit", "StoreOffset", "ExistenceOnly", "ClosestRowBefore", "Consistency", });
-          internal_static_Result_descriptor =
+          internal_static_hbase_pb_Result_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_Result_fieldAccessorTable = new
+          internal_static_hbase_pb_Result_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Result_descriptor,
+              internal_static_hbase_pb_Result_descriptor,
               new java.lang.String[] { "Cell", "AssociatedCellCount", "Exists", "Stale", "Partial", });
-          internal_static_GetRequest_descriptor =
+          internal_static_hbase_pb_GetRequest_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_GetRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetRequest_descriptor,
+              internal_static_hbase_pb_GetRequest_descriptor,
               new java.lang.String[] { "Region", "Get", });
-          internal_static_GetResponse_descriptor =
+          internal_static_hbase_pb_GetResponse_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_GetResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetResponse_descriptor,
+              internal_static_hbase_pb_GetResponse_descriptor,
               new java.lang.String[] { "Result", });
-          internal_static_Condition_descriptor =
+          internal_static_hbase_pb_Condition_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_Condition_fieldAccessorTable = new
+          internal_static_hbase_pb_Condition_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Condition_descriptor,
+              internal_static_hbase_pb_Condition_descriptor,
               new java.lang.String[] { "Row", "Family", "Qualifier", "CompareType", "Comparator", });
-          internal_static_MutationProto_descriptor =
+          internal_static_hbase_pb_MutationProto_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_MutationProto_fieldAccessorTable = new
+          internal_static_hbase_pb_MutationProto_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutationProto_descriptor,
+              internal_static_hbase_pb_MutationProto_descriptor,
               new java.lang.String[] { "Row", "MutateType", "ColumnValue", "Timestamp", "Attribute", "Durability", "TimeRange", "AssociatedCellCount", "Nonce", });
-          internal_static_MutationProto_ColumnValue_descriptor =
-            internal_static_MutationProto_descriptor.getNestedTypes().get(0);
-          internal_static_MutationProto_ColumnValue_fieldAccessorTable = new
+          internal_static_hbase_pb_MutationProto_ColumnValue_descriptor =
+            internal_static_hbase_pb_MutationProto_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_MutationProto_ColumnValue_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutationProto_ColumnValue_descriptor,
+              internal_static_hbase_pb_MutationProto_ColumnValue_descriptor,
               new java.lang.String[] { "Family", "QualifierValue", });
-          internal_static_MutationProto_ColumnValue_QualifierValue_descriptor =
-            internal_static_MutationProto_ColumnValue_descriptor.getNestedTypes().get(0);
-          internal_static_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable = new
+          internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_descriptor =
+            internal_static_hbase_pb_MutationProto_ColumnValue_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutationProto_ColumnValue_QualifierValue_descriptor,
+              internal_static_hbase_pb_MutationProto_ColumnValue_QualifierValue_descriptor,
               new java.lang.String[] { "Qualifier", "Value", "Timestamp", "DeleteType", "Tags", });
-          internal_static_MutateRequest_descriptor =
+          internal_static_hbase_pb_MutateRequest_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_MutateRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MutateRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutateRequest_descriptor,
+              internal_static_hbase_pb_MutateRequest_descriptor,
               new java.lang.String[] { "Region", "Mutation", "Condition", "NonceGroup", });
-          internal_static_MutateResponse_descriptor =
+          internal_static_hbase_pb_MutateResponse_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_MutateResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MutateResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutateResponse_descriptor,
+              internal_static_hbase_pb_MutateResponse_descriptor,
               new java.lang.String[] { "Result", "Processed", });
-          internal_static_Scan_descriptor =
+          internal_static_hbase_pb_Scan_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_Scan_fieldAccessorTable = new
+          internal_static_hbase_pb_Scan_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Scan_descriptor,
+              internal_static_hbase_pb_Scan_descriptor,
               new java.lang.String[] { "Column", "Attribute", "StartRow", "StopRow", "Filter", "TimeRange", "MaxVersions", "CacheBlocks", "BatchSize", "MaxResultSize", "StoreLimit", "StoreOffset", "LoadColumnFamiliesOnDemand", "Small", "Reversed", "Consistency", "Caching", });
-          internal_static_ScanRequest_descriptor =
+          internal_static_hbase_pb_ScanRequest_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_ScanRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ScanRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ScanRequest_descriptor,
+              internal_static_hbase_pb_ScanRequest_descriptor,
               new java.lang.String[] { "Region", "Scan", "ScannerId", "NumberOfRows", "CloseScanner", "NextCallSeq", "ClientHandlesPartials", "ClientHandlesHeartbeats", "TrackScanMetrics", });
-          internal_static_ScanResponse_descriptor =
+          internal_static_hbase_pb_ScanResponse_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_ScanResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ScanResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ScanResponse_descriptor,
+              internal_static_hbase_pb_ScanResponse_descriptor,
               new java.lang.String[] { "CellsPerResult", "ScannerId", "MoreResults", "Ttl", "Results", "Stale", "PartialFlagPerResult", "MoreResultsInRegion", "HeartbeatMessage", "ScanMetrics", });
-          internal_static_BulkLoadHFileRequest_descriptor =
+          internal_static_hbase_pb_BulkLoadHFileRequest_descriptor =
             getDescriptor().getMessageTypes().get(14);
-          internal_static_BulkLoadHFileRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_BulkLoadHFileRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BulkLoadHFileRequest_descriptor,
+              internal_static_hbase_pb_BulkLoadHFileRequest_descriptor,
               new java.lang.String[] { "Region", "FamilyPath", "AssignSeqNum", });
-          internal_static_BulkLoadHFileRequest_FamilyPath_descriptor =
-            internal_static_BulkLoadHFileRequest_descriptor.getNestedTypes().get(0);
-          internal_static_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable = new
+          internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_descriptor =
+            internal_static_hbase_pb_BulkLoadHFileRequest_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BulkLoadHFileRequest_FamilyPath_descriptor,
+              internal_static_hbase_pb_BulkLoadHFileRequest_FamilyPath_descriptor,
               new java.lang.String[] { "Family", "Path", });
-          internal_static_BulkLoadHFileResponse_descriptor =
+          internal_static_hbase_pb_BulkLoadHFileResponse_descriptor =
             getDescriptor().getMessageTypes().get(15);
-          internal_static_BulkLoadHFileResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_BulkLoadHFileResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BulkLoadHFileResponse_descriptor,
+              internal_static_hbase_pb_BulkLoadHFileResponse_descriptor,
               new java.lang.String[] { "Loaded", });
-          internal_static_CoprocessorServiceCall_descriptor =
+          internal_static_hbase_pb_CoprocessorServiceCall_descriptor =
             getDescriptor().getMessageTypes().get(16);
-          internal_static_CoprocessorServiceCall_fieldAccessorTable = new
+          internal_static_hbase_pb_CoprocessorServiceCall_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CoprocessorServiceCall_descriptor,
+              internal_static_hbase_pb_CoprocessorServiceCall_descriptor,
               new java.lang.String[] { "Row", "ServiceName", "MethodName", "Request", });
-          internal_static_CoprocessorServiceResult_descriptor =
+          internal_static_hbase_pb_CoprocessorServiceResult_descriptor =
             getDescriptor().getMessageTypes().get(17);
-          internal_static_CoprocessorServiceResult_fieldAccessorTable = new
+          internal_static_hbase_pb_CoprocessorServiceResult_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CoprocessorServiceResult_descriptor,
+              internal_static_hbase_pb_CoprocessorServiceResult_descriptor,
               new java.lang.String[] { "Value", });
-          internal_static_CoprocessorServiceRequest_descriptor =
+          internal_static_hbase_pb_CoprocessorServiceRequest_descriptor =
             getDescriptor().getMessageTypes().get(18);
-          internal_static_CoprocessorServiceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CoprocessorServiceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CoprocessorServiceRequest_descriptor,
+              internal_static_hbase_pb_CoprocessorServiceRequest_descriptor,
               new java.lang.String[] { "Region", "Call", });
-          internal_static_CoprocessorServiceResponse_descriptor =
+          internal_static_hbase_pb_CoprocessorServiceResponse_descriptor =
             getDescriptor().getMessageTypes().get(19);
-          internal_static_CoprocessorServiceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CoprocessorServiceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CoprocessorServiceResponse_descriptor,
+              internal_static_hbase_pb_CoprocessorServiceResponse_descriptor,
               new java.lang.String[] { "Region", "Value", });
-          internal_static_Action_descriptor =
+          internal_static_hbase_pb_Action_descriptor =
             getDescriptor().getMessageTypes().get(20);
-          internal_static_Action_fieldAccessorTable = new
+          internal_static_hbase_pb_Action_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Action_descriptor,
+              internal_static_hbase_pb_Action_descriptor,
               new java.lang.String[] { "Index", "Mutation", "Get", "ServiceCall", });
-          internal_static_RegionAction_descriptor =
+          internal_static_hbase_pb_RegionAction_descriptor =
             getDescriptor().getMessageTypes().get(21);
-          internal_static_RegionAction_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionAction_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionAction_descriptor,
+              internal_static_hbase_pb_RegionAction_descriptor,
               new java.lang.String[] { "Region", "Atomic", "Action", });
-          internal_static_RegionLoadStats_descriptor =
+          internal_static_hbase_pb_RegionLoadStats_descriptor =
             getDescriptor().getMessageTypes().get(22);
-          internal_static_RegionLoadStats_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionLoadStats_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionLoadStats_descriptor,
+              internal_static_hbase_pb_RegionLoadStats_descriptor,
               new java.lang.String[] { "MemstoreLoad", "HeapOccupancy", });
-          internal_static_ResultOrException_descriptor =
+          internal_static_hbase_pb_ResultOrException_descriptor =
             getDescriptor().getMessageTypes().get(23);
-          internal_static_ResultOrException_fieldAccessorTable = new
+          internal_static_hbase_pb_ResultOrException_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ResultOrException_descriptor,
+              internal_static_hbase_pb_ResultOrException_descriptor,
               new java.lang.String[] { "Index", "Result", "Exception", "ServiceResult", "LoadStats", });
-          internal_static_RegionActionResult_descriptor =
+          internal_static_hbase_pb_RegionActionResult_descriptor =
             getDescriptor().getMessageTypes().get(24);
-          internal_static_RegionActionResult_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionActionResult_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionActionResult_descriptor,
+              internal_static_hbase_pb_RegionActionResult_descriptor,
               new java.lang.String[] { "ResultOrException", "Exception", });
-          internal_static_MultiRequest_descriptor =
+          internal_static_hbase_pb_MultiRequest_descriptor =
             getDescriptor().getMessageTypes().get(25);
-          internal_static_MultiRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MultiRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultiRequest_descriptor,
+              internal_static_hbase_pb_MultiRequest_descriptor,
               new java.lang.String[] { "RegionAction", "NonceGroup", "Condition", });
-          internal_static_MultiResponse_descriptor =
+          internal_static_hbase_pb_MultiResponse_descriptor =
             getDescriptor().getMessageTypes().get(26);
-          internal_static_MultiResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MultiResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultiResponse_descriptor,
+              internal_static_hbase_pb_MultiResponse_descriptor,
               new java.lang.String[] { "RegionActionResult", "Processed", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterIdProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterIdProtos.java
index 5b849dc0fe8..79026728681 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterIdProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterIdProtos.java
@@ -39,7 +39,7 @@ public final class ClusterIdProtos {
         getClusterIdBytes();
   }
   /**
-   * Protobuf type {@code ClusterId}
+   * Protobuf type {@code hbase.pb.ClusterId}
    *
    * 
    **
@@ -114,12 +114,12 @@ public final class ClusterIdProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_ClusterId_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_hbase_pb_ClusterId_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_ClusterId_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_hbase_pb_ClusterId_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.class, org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.Builder.class);
     }
@@ -347,7 +347,7 @@ public final class ClusterIdProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ClusterId}
+     * Protobuf type {@code hbase.pb.ClusterId}
      *
      * 
      **
@@ -360,12 +360,12 @@ public final class ClusterIdProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterIdOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_ClusterId_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_hbase_pb_ClusterId_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_ClusterId_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_hbase_pb_ClusterId_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.class, org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.Builder.class);
       }
@@ -401,7 +401,7 @@ public final class ClusterIdProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_ClusterId_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.internal_static_hbase_pb_ClusterId_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId getDefaultInstanceForType() {
@@ -574,7 +574,7 @@ public final class ClusterIdProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ClusterId)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ClusterId)
     }
 
     static {
@@ -582,14 +582,14 @@ public final class ClusterIdProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ClusterId)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ClusterId)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ClusterId_descriptor;
+    internal_static_hbase_pb_ClusterId_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ClusterId_fieldAccessorTable;
+      internal_static_hbase_pb_ClusterId_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -599,20 +599,21 @@ public final class ClusterIdProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017ClusterId.proto\"\037\n\tClusterId\022\022\n\ncluste" +
-      "r_id\030\001 \002(\tBB\n*org.apache.hadoop.hbase.pr" +
-      "otobuf.generatedB\017ClusterIdProtosH\001\240\001\001"
+      "\n\017ClusterId.proto\022\010hbase.pb\"\037\n\tClusterId" +
+      "\022\022\n\ncluster_id\030\001 \002(\tBB\n*org.apache.hadoo" +
+      "p.hbase.protobuf.generatedB\017ClusterIdPro" +
+      "tosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_ClusterId_descriptor =
+          internal_static_hbase_pb_ClusterId_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_ClusterId_fieldAccessorTable = new
+          internal_static_hbase_pb_ClusterId_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ClusterId_descriptor,
+              internal_static_hbase_pb_ClusterId_descriptor,
               new java.lang.String[] { "ClusterId", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java
index 817694739e4..5fd4e181ba3 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java
@@ -11,27 +11,27 @@ public final class ClusterStatusProtos {
   public interface RegionStateOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionInfo region_info = 1;
+    // required .hbase.pb.RegionInfo region_info = 1;
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     boolean hasRegionInfo();
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo();
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder();
 
-    // required .RegionState.State state = 2;
+    // required .hbase.pb.RegionState.State state = 2;
     /**
-     * required .RegionState.State state = 2;
+     * required .hbase.pb.RegionState.State state = 2;
      */
     boolean hasState();
     /**
-     * required .RegionState.State state = 2;
+     * required .hbase.pb.RegionState.State state = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State getState();
 
@@ -46,7 +46,7 @@ public final class ClusterStatusProtos {
     long getStamp();
   }
   /**
-   * Protobuf type {@code RegionState}
+   * Protobuf type {@code hbase.pb.RegionState}
    */
   public static final class RegionState extends
       com.google.protobuf.GeneratedMessage
@@ -139,12 +139,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionState_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionState_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionState_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.Builder.class);
     }
@@ -165,7 +165,7 @@ public final class ClusterStatusProtos {
     }
 
     /**
-     * Protobuf enum {@code RegionState.State}
+     * Protobuf enum {@code hbase.pb.RegionState.State}
      */
     public enum State
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -482,43 +482,43 @@ public final class ClusterStatusProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:RegionState.State)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.RegionState.State)
     }
 
     private int bitField0_;
-    // required .RegionInfo region_info = 1;
+    // required .hbase.pb.RegionInfo region_info = 1;
     public static final int REGION_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo regionInfo_;
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     public boolean hasRegionInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo() {
       return regionInfo_;
     }
     /**
-     * required .RegionInfo region_info = 1;
+     * required .hbase.pb.RegionInfo region_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder() {
       return regionInfo_;
     }
 
-    // required .RegionState.State state = 2;
+    // required .hbase.pb.RegionState.State state = 2;
     public static final int STATE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State state_;
     /**
-     * required .RegionState.State state = 2;
+     * required .hbase.pb.RegionState.State state = 2;
      */
     public boolean hasState() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .RegionState.State state = 2;
+     * required .hbase.pb.RegionState.State state = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State getState() {
       return state_;
@@ -734,19 +734,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionState}
+     * Protobuf type {@code hbase.pb.RegionState}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionState_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionState_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.Builder.class);
       }
@@ -791,7 +791,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionState_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState getDefaultInstanceForType() {
@@ -890,18 +890,18 @@ public final class ClusterStatusProtos {
       }
       private int bitField0_;
 
-      // required .RegionInfo region_info = 1;
+      // required .hbase.pb.RegionInfo region_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo regionInfo_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public boolean hasRegionInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -911,7 +911,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder setRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -927,7 +927,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder setRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -941,7 +941,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder mergeRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -960,7 +960,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -973,7 +973,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -981,7 +981,7 @@ public final class ClusterStatusProtos {
         return getRegionInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder() {
         if (regionInfoBuilder_ != null) {
@@ -991,7 +991,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionInfo region_info = 1;
+       * required .hbase.pb.RegionInfo region_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> 
@@ -1007,22 +1007,22 @@ public final class ClusterStatusProtos {
         return regionInfoBuilder_;
       }
 
-      // required .RegionState.State state = 2;
+      // required .hbase.pb.RegionState.State state = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State state_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State.OFFLINE;
       /**
-       * required .RegionState.State state = 2;
+       * required .hbase.pb.RegionState.State state = 2;
        */
       public boolean hasState() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .RegionState.State state = 2;
+       * required .hbase.pb.RegionState.State state = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State getState() {
         return state_;
       }
       /**
-       * required .RegionState.State state = 2;
+       * required .hbase.pb.RegionState.State state = 2;
        */
       public Builder setState(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State value) {
         if (value == null) {
@@ -1034,7 +1034,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionState.State state = 2;
+       * required .hbase.pb.RegionState.State state = 2;
        */
       public Builder clearState() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1076,7 +1076,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionState)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionState)
     }
 
     static {
@@ -1084,42 +1084,42 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionState)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionState)
   }
 
   public interface RegionInTransitionOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier spec = 1;
+    // required .hbase.pb.RegionSpecifier spec = 1;
     /**
-     * required .RegionSpecifier spec = 1;
+     * required .hbase.pb.RegionSpecifier spec = 1;
      */
     boolean hasSpec();
     /**
-     * required .RegionSpecifier spec = 1;
+     * required .hbase.pb.RegionSpecifier spec = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getSpec();
     /**
-     * required .RegionSpecifier spec = 1;
+     * required .hbase.pb.RegionSpecifier spec = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getSpecOrBuilder();
 
-    // required .RegionState region_state = 2;
+    // required .hbase.pb.RegionState region_state = 2;
     /**
-     * required .RegionState region_state = 2;
+     * required .hbase.pb.RegionState region_state = 2;
      */
     boolean hasRegionState();
     /**
-     * required .RegionState region_state = 2;
+     * required .hbase.pb.RegionState region_state = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState getRegionState();
     /**
-     * required .RegionState region_state = 2;
+     * required .hbase.pb.RegionState region_state = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStateOrBuilder getRegionStateOrBuilder();
   }
   /**
-   * Protobuf type {@code RegionInTransition}
+   * Protobuf type {@code hbase.pb.RegionInTransition}
    */
   public static final class RegionInTransition extends
       com.google.protobuf.GeneratedMessage
@@ -1209,12 +1209,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionInTransition_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionInTransition_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionInTransition_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionInTransition_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder.class);
     }
@@ -1235,45 +1235,45 @@ public final class ClusterStatusProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier spec = 1;
+    // required .hbase.pb.RegionSpecifier spec = 1;
     public static final int SPEC_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier spec_;
     /**
-     * required .RegionSpecifier spec = 1;
+     * required .hbase.pb.RegionSpecifier spec = 1;
      */
     public boolean hasSpec() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier spec = 1;
+     * required .hbase.pb.RegionSpecifier spec = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getSpec() {
       return spec_;
     }
     /**
-     * required .RegionSpecifier spec = 1;
+     * required .hbase.pb.RegionSpecifier spec = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getSpecOrBuilder() {
       return spec_;
     }
 
-    // required .RegionState region_state = 2;
+    // required .hbase.pb.RegionState region_state = 2;
     public static final int REGION_STATE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState regionState_;
     /**
-     * required .RegionState region_state = 2;
+     * required .hbase.pb.RegionState region_state = 2;
      */
     public boolean hasRegionState() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .RegionState region_state = 2;
+     * required .hbase.pb.RegionState region_state = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState getRegionState() {
       return regionState_;
     }
     /**
-     * required .RegionState region_state = 2;
+     * required .hbase.pb.RegionState region_state = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStateOrBuilder getRegionStateOrBuilder() {
       return regionState_;
@@ -1460,19 +1460,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionInTransition}
+     * Protobuf type {@code hbase.pb.RegionInTransition}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransitionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionInTransition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionInTransition_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionInTransition_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionInTransition_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder.class);
       }
@@ -1520,7 +1520,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionInTransition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionInTransition_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition getDefaultInstanceForType() {
@@ -1620,18 +1620,18 @@ public final class ClusterStatusProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier spec = 1;
+      // required .hbase.pb.RegionSpecifier spec = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier spec_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> specBuilder_;
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public boolean hasSpec() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getSpec() {
         if (specBuilder_ == null) {
@@ -1641,7 +1641,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public Builder setSpec(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (specBuilder_ == null) {
@@ -1657,7 +1657,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public Builder setSpec(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -1671,7 +1671,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public Builder mergeSpec(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (specBuilder_ == null) {
@@ -1690,7 +1690,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public Builder clearSpec() {
         if (specBuilder_ == null) {
@@ -1703,7 +1703,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getSpecBuilder() {
         bitField0_ |= 0x00000001;
@@ -1711,7 +1711,7 @@ public final class ClusterStatusProtos {
         return getSpecFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getSpecOrBuilder() {
         if (specBuilder_ != null) {
@@ -1721,7 +1721,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionSpecifier spec = 1;
+       * required .hbase.pb.RegionSpecifier spec = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -1737,18 +1737,18 @@ public final class ClusterStatusProtos {
         return specBuilder_;
       }
 
-      // required .RegionState region_state = 2;
+      // required .hbase.pb.RegionState region_state = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState regionState_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStateOrBuilder> regionStateBuilder_;
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public boolean hasRegionState() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState getRegionState() {
         if (regionStateBuilder_ == null) {
@@ -1758,7 +1758,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public Builder setRegionState(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState value) {
         if (regionStateBuilder_ == null) {
@@ -1774,7 +1774,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public Builder setRegionState(
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.Builder builderForValue) {
@@ -1788,7 +1788,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public Builder mergeRegionState(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState value) {
         if (regionStateBuilder_ == null) {
@@ -1807,7 +1807,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public Builder clearRegionState() {
         if (regionStateBuilder_ == null) {
@@ -1820,7 +1820,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.Builder getRegionStateBuilder() {
         bitField0_ |= 0x00000002;
@@ -1828,7 +1828,7 @@ public final class ClusterStatusProtos {
         return getRegionStateFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStateOrBuilder getRegionStateOrBuilder() {
         if (regionStateBuilder_ != null) {
@@ -1838,7 +1838,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionState region_state = 2;
+       * required .hbase.pb.RegionState region_state = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStateOrBuilder> 
@@ -1854,7 +1854,7 @@ public final class ClusterStatusProtos {
         return regionStateBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionInTransition)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionInTransition)
     }
 
     static {
@@ -1862,7 +1862,7 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionInTransition)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionInTransition)
   }
 
   public interface StoreSequenceIdOrBuilder
@@ -1889,7 +1889,7 @@ public final class ClusterStatusProtos {
     long getSequenceId();
   }
   /**
-   * Protobuf type {@code StoreSequenceId}
+   * Protobuf type {@code hbase.pb.StoreSequenceId}
    *
    * 
    **
@@ -1968,12 +1968,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_StoreSequenceId_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_StoreSequenceId_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_StoreSequenceId_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_StoreSequenceId_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder.class);
     }
@@ -2199,7 +2199,7 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StoreSequenceId}
+     * Protobuf type {@code hbase.pb.StoreSequenceId}
      *
      * 
      **
@@ -2211,12 +2211,12 @@ public final class ClusterStatusProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_StoreSequenceId_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_StoreSequenceId_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_StoreSequenceId_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_StoreSequenceId_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder.class);
       }
@@ -2254,7 +2254,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_StoreSequenceId_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_StoreSequenceId_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId getDefaultInstanceForType() {
@@ -2407,7 +2407,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StoreSequenceId)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StoreSequenceId)
     }
 
     static {
@@ -2415,7 +2415,7 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StoreSequenceId)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StoreSequenceId)
   }
 
   public interface RegionStoreSequenceIdsOrBuilder
@@ -2431,33 +2431,33 @@ public final class ClusterStatusProtos {
      */
     long getLastFlushedSequenceId();
 
-    // repeated .StoreSequenceId store_sequence_id = 2;
+    // repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     java.util.List 
         getStoreSequenceIdList();
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId getStoreSequenceId(int index);
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     int getStoreSequenceIdCount();
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     java.util.List 
         getStoreSequenceIdOrBuilderList();
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder getStoreSequenceIdOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code RegionStoreSequenceIds}
+   * Protobuf type {@code hbase.pb.RegionStoreSequenceIds}
    *
    * 
    **
@@ -2543,12 +2543,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionStoreSequenceIds_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionStoreSequenceIds_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionStoreSequenceIds_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionStoreSequenceIds_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIds.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIds.Builder.class);
     }
@@ -2585,36 +2585,36 @@ public final class ClusterStatusProtos {
       return lastFlushedSequenceId_;
     }
 
-    // repeated .StoreSequenceId store_sequence_id = 2;
+    // repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
     public static final int STORE_SEQUENCE_ID_FIELD_NUMBER = 2;
     private java.util.List storeSequenceId_;
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     public java.util.List getStoreSequenceIdList() {
       return storeSequenceId_;
     }
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     public java.util.List 
         getStoreSequenceIdOrBuilderList() {
       return storeSequenceId_;
     }
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     public int getStoreSequenceIdCount() {
       return storeSequenceId_.size();
     }
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId getStoreSequenceId(int index) {
       return storeSequenceId_.get(index);
     }
     /**
-     * repeated .StoreSequenceId store_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder getStoreSequenceIdOrBuilder(
         int index) {
@@ -2793,7 +2793,7 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionStoreSequenceIds}
+     * Protobuf type {@code hbase.pb.RegionStoreSequenceIds}
      *
      * 
      **
@@ -2806,12 +2806,12 @@ public final class ClusterStatusProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIdsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionStoreSequenceIds_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionStoreSequenceIds_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionStoreSequenceIds_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionStoreSequenceIds_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIds.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIds.Builder.class);
       }
@@ -2854,7 +2854,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionStoreSequenceIds_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionStoreSequenceIds_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIds getDefaultInstanceForType() {
@@ -3001,7 +3001,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // repeated .StoreSequenceId store_sequence_id = 2;
+      // repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
       private java.util.List storeSequenceId_ =
         java.util.Collections.emptyList();
       private void ensureStoreSequenceIdIsMutable() {
@@ -3015,7 +3015,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder> storeSequenceIdBuilder_;
 
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public java.util.List getStoreSequenceIdList() {
         if (storeSequenceIdBuilder_ == null) {
@@ -3025,7 +3025,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public int getStoreSequenceIdCount() {
         if (storeSequenceIdBuilder_ == null) {
@@ -3035,7 +3035,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId getStoreSequenceId(int index) {
         if (storeSequenceIdBuilder_ == null) {
@@ -3045,7 +3045,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder setStoreSequenceId(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId value) {
@@ -3062,7 +3062,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder setStoreSequenceId(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder builderForValue) {
@@ -3076,7 +3076,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder addStoreSequenceId(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId value) {
         if (storeSequenceIdBuilder_ == null) {
@@ -3092,7 +3092,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder addStoreSequenceId(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId value) {
@@ -3109,7 +3109,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder addStoreSequenceId(
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder builderForValue) {
@@ -3123,7 +3123,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder addStoreSequenceId(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder builderForValue) {
@@ -3137,7 +3137,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder addAllStoreSequenceId(
           java.lang.Iterable values) {
@@ -3151,7 +3151,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder clearStoreSequenceId() {
         if (storeSequenceIdBuilder_ == null) {
@@ -3164,7 +3164,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public Builder removeStoreSequenceId(int index) {
         if (storeSequenceIdBuilder_ == null) {
@@ -3177,14 +3177,14 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder getStoreSequenceIdBuilder(
           int index) {
         return getStoreSequenceIdFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder getStoreSequenceIdOrBuilder(
           int index) {
@@ -3194,7 +3194,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public java.util.List 
            getStoreSequenceIdOrBuilderList() {
@@ -3205,14 +3205,14 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder addStoreSequenceIdBuilder() {
         return getStoreSequenceIdFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.getDefaultInstance());
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder addStoreSequenceIdBuilder(
           int index) {
@@ -3220,7 +3220,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.getDefaultInstance());
       }
       /**
-       * repeated .StoreSequenceId store_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_sequence_id = 2;
        */
       public java.util.List 
            getStoreSequenceIdBuilderList() {
@@ -3241,7 +3241,7 @@ public final class ClusterStatusProtos {
         return storeSequenceIdBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionStoreSequenceIds)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionStoreSequenceIds)
     }
 
     static {
@@ -3249,15 +3249,15 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionStoreSequenceIds)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionStoreSequenceIds)
   }
 
   public interface RegionLoadOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region_specifier = 1;
+    // required .hbase.pb.RegionSpecifier region_specifier = 1;
     /**
-     * required .RegionSpecifier region_specifier = 1;
+     * required .hbase.pb.RegionSpecifier region_specifier = 1;
      *
      * 
      ** the region specifier 
@@ -3265,7 +3265,7 @@ public final class ClusterStatusProtos {
      */
     boolean hasRegionSpecifier();
     /**
-     * required .RegionSpecifier region_specifier = 1;
+     * required .hbase.pb.RegionSpecifier region_specifier = 1;
      *
      * 
      ** the region specifier 
@@ -3273,7 +3273,7 @@ public final class ClusterStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionSpecifier();
     /**
-     * required .RegionSpecifier region_specifier = 1;
+     * required .hbase.pb.RegionSpecifier region_specifier = 1;
      *
      * 
      ** the region specifier 
@@ -3569,9 +3569,9 @@ public final class ClusterStatusProtos {
      */
     long getLastMajorCompactionTs();
 
-    // repeated .StoreSequenceId store_complete_sequence_id = 18;
+    // repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -3580,7 +3580,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getStoreCompleteSequenceIdList();
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -3588,7 +3588,7 @@ public final class ClusterStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId getStoreCompleteSequenceId(int index);
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -3596,7 +3596,7 @@ public final class ClusterStatusProtos {
      */
     int getStoreCompleteSequenceIdCount();
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -3605,7 +3605,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getStoreCompleteSequenceIdOrBuilderList();
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -3615,7 +3615,7 @@ public final class ClusterStatusProtos {
         int index);
   }
   /**
-   * Protobuf type {@code RegionLoad}
+   * Protobuf type {@code hbase.pb.RegionLoad}
    */
   public static final class RegionLoad extends
       com.google.protobuf.GeneratedMessage
@@ -3783,12 +3783,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionLoad_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionLoad_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionLoad_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionLoad_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.Builder.class);
     }
@@ -3809,11 +3809,11 @@ public final class ClusterStatusProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region_specifier = 1;
+    // required .hbase.pb.RegionSpecifier region_specifier = 1;
     public static final int REGION_SPECIFIER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionSpecifier_;
     /**
-     * required .RegionSpecifier region_specifier = 1;
+     * required .hbase.pb.RegionSpecifier region_specifier = 1;
      *
      * 
      ** the region specifier 
@@ -3823,7 +3823,7 @@ public final class ClusterStatusProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region_specifier = 1;
+     * required .hbase.pb.RegionSpecifier region_specifier = 1;
      *
      * 
      ** the region specifier 
@@ -3833,7 +3833,7 @@ public final class ClusterStatusProtos {
       return regionSpecifier_;
     }
     /**
-     * required .RegionSpecifier region_specifier = 1;
+     * required .hbase.pb.RegionSpecifier region_specifier = 1;
      *
      * 
      ** the region specifier 
@@ -4227,11 +4227,11 @@ public final class ClusterStatusProtos {
       return lastMajorCompactionTs_;
     }
 
-    // repeated .StoreSequenceId store_complete_sequence_id = 18;
+    // repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
     public static final int STORE_COMPLETE_SEQUENCE_ID_FIELD_NUMBER = 18;
     private java.util.List storeCompleteSequenceId_;
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -4241,7 +4241,7 @@ public final class ClusterStatusProtos {
       return storeCompleteSequenceId_;
     }
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -4252,7 +4252,7 @@ public final class ClusterStatusProtos {
       return storeCompleteSequenceId_;
     }
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -4262,7 +4262,7 @@ public final class ClusterStatusProtos {
       return storeCompleteSequenceId_.size();
     }
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -4272,7 +4272,7 @@ public final class ClusterStatusProtos {
       return storeCompleteSequenceId_.get(index);
     }
     /**
-     * repeated .StoreSequenceId store_complete_sequence_id = 18;
+     * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
      *
      * 
      ** the most recent sequence Id of store from cache flush 
@@ -4731,19 +4731,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionLoad}
+     * Protobuf type {@code hbase.pb.RegionLoad}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoadOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionLoad_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionLoad_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionLoad_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionLoad_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.Builder.class);
       }
@@ -4823,7 +4823,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_RegionLoad_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_RegionLoad_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad getDefaultInstanceForType() {
@@ -5057,12 +5057,12 @@ public final class ClusterStatusProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region_specifier = 1;
+      // required .hbase.pb.RegionSpecifier region_specifier = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionSpecifier_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionSpecifierBuilder_;
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5072,7 +5072,7 @@ public final class ClusterStatusProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5086,7 +5086,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5106,7 +5106,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5124,7 +5124,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5147,7 +5147,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5164,7 +5164,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5176,7 +5176,7 @@ public final class ClusterStatusProtos {
         return getRegionSpecifierFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5190,7 +5190,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_specifier = 1;
+       * required .hbase.pb.RegionSpecifier region_specifier = 1;
        *
        * 
        ** the region specifier 
@@ -5994,7 +5994,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // repeated .StoreSequenceId store_complete_sequence_id = 18;
+      // repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
       private java.util.List storeCompleteSequenceId_ =
         java.util.Collections.emptyList();
       private void ensureStoreCompleteSequenceIdIsMutable() {
@@ -6008,7 +6008,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder> storeCompleteSequenceIdBuilder_;
 
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6022,7 +6022,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6036,7 +6036,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6050,7 +6050,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6071,7 +6071,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6089,7 +6089,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6109,7 +6109,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6130,7 +6130,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6148,7 +6148,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6166,7 +6166,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6184,7 +6184,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6201,7 +6201,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6218,7 +6218,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6229,7 +6229,7 @@ public final class ClusterStatusProtos {
         return getStoreCompleteSequenceIdFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6243,7 +6243,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6258,7 +6258,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6269,7 +6269,7 @@ public final class ClusterStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.getDefaultInstance());
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6281,7 +6281,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.getDefaultInstance());
       }
       /**
-       * repeated .StoreSequenceId store_complete_sequence_id = 18;
+       * repeated .hbase.pb.StoreSequenceId store_complete_sequence_id = 18;
        *
        * 
        ** the most recent sequence Id of store from cache flush 
@@ -6306,7 +6306,7 @@ public final class ClusterStatusProtos {
         return storeCompleteSequenceIdBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionLoad)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionLoad)
     }
 
     static {
@@ -6314,7 +6314,7 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionLoad)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionLoad)
   }
 
   public interface ReplicationLoadSinkOrBuilder
@@ -6341,7 +6341,7 @@ public final class ClusterStatusProtos {
     long getTimeStampsOfLastAppliedOp();
   }
   /**
-   * Protobuf type {@code ReplicationLoadSink}
+   * Protobuf type {@code hbase.pb.ReplicationLoadSink}
    */
   public static final class ReplicationLoadSink extends
       com.google.protobuf.GeneratedMessage
@@ -6415,12 +6415,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSink_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSink_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSink_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSink_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink.Builder.class);
     }
@@ -6646,19 +6646,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicationLoadSink}
+     * Protobuf type {@code hbase.pb.ReplicationLoadSink}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSinkOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSink_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSink_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSink_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSink_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink.Builder.class);
       }
@@ -6696,7 +6696,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSink_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSink_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink getDefaultInstanceForType() {
@@ -6846,7 +6846,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicationLoadSink)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationLoadSink)
     }
 
     static {
@@ -6854,7 +6854,7 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicationLoadSink)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicationLoadSink)
   }
 
   public interface ReplicationLoadSourceOrBuilder
@@ -6916,7 +6916,7 @@ public final class ClusterStatusProtos {
     long getReplicationLag();
   }
   /**
-   * Protobuf type {@code ReplicationLoadSource}
+   * Protobuf type {@code hbase.pb.ReplicationLoadSource}
    */
   public static final class ReplicationLoadSource extends
       com.google.protobuf.GeneratedMessage
@@ -7005,12 +7005,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSource_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSource_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSource_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSource_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.Builder.class);
     }
@@ -7374,19 +7374,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicationLoadSource}
+     * Protobuf type {@code hbase.pb.ReplicationLoadSource}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSourceOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSource_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSource_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSource_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSource_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.Builder.class);
       }
@@ -7430,7 +7430,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ReplicationLoadSource_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ReplicationLoadSource_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource getDefaultInstanceForType() {
@@ -7755,7 +7755,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicationLoadSource)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationLoadSource)
     }
 
     static {
@@ -7763,7 +7763,7 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicationLoadSource)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicationLoadSource)
   }
 
   public interface ServerLoadOrBuilder
@@ -7841,9 +7841,9 @@ public final class ClusterStatusProtos {
      */
     int getMaxHeapMB();
 
-    // repeated .RegionLoad region_loads = 5;
+    // repeated .hbase.pb.RegionLoad region_loads = 5;
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -7852,7 +7852,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getRegionLoadsList();
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -7860,7 +7860,7 @@ public final class ClusterStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad getRegionLoads(int index);
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -7868,7 +7868,7 @@ public final class ClusterStatusProtos {
      */
     int getRegionLoadsCount();
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -7877,7 +7877,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getRegionLoadsOrBuilderList();
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -7886,9 +7886,9 @@ public final class ClusterStatusProtos {
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoadOrBuilder getRegionLoadsOrBuilder(
         int index);
 
-    // repeated .Coprocessor coprocessors = 6;
+    // repeated .hbase.pb.Coprocessor coprocessors = 6;
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -7900,7 +7900,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getCoprocessorsList();
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -7911,7 +7911,7 @@ public final class ClusterStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor getCoprocessors(int index);
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -7922,7 +7922,7 @@ public final class ClusterStatusProtos {
      */
     int getCoprocessorsCount();
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -7934,7 +7934,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getCoprocessorsOrBuilderList();
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -8014,9 +8014,9 @@ public final class ClusterStatusProtos {
      */
     int getInfoServerPort();
 
-    // repeated .ReplicationLoadSource replLoadSource = 10;
+    // repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8026,7 +8026,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getReplLoadSourceList();
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8035,7 +8035,7 @@ public final class ClusterStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource getReplLoadSource(int index);
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8044,7 +8044,7 @@ public final class ClusterStatusProtos {
      */
     int getReplLoadSourceCount();
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8054,7 +8054,7 @@ public final class ClusterStatusProtos {
     java.util.List 
         getReplLoadSourceOrBuilderList();
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8064,9 +8064,9 @@ public final class ClusterStatusProtos {
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSourceOrBuilder getReplLoadSourceOrBuilder(
         int index);
 
-    // optional .ReplicationLoadSink replLoadSink = 11;
+    // optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
     /**
-     * optional .ReplicationLoadSink replLoadSink = 11;
+     * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
      *
      * 
      **
@@ -8075,7 +8075,7 @@ public final class ClusterStatusProtos {
      */
     boolean hasReplLoadSink();
     /**
-     * optional .ReplicationLoadSink replLoadSink = 11;
+     * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
      *
      * 
      **
@@ -8084,7 +8084,7 @@ public final class ClusterStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink getReplLoadSink();
     /**
-     * optional .ReplicationLoadSink replLoadSink = 11;
+     * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
      *
      * 
      **
@@ -8094,7 +8094,7 @@ public final class ClusterStatusProtos {
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSinkOrBuilder getReplLoadSinkOrBuilder();
   }
   /**
-   * Protobuf type {@code ServerLoad}
+   * Protobuf type {@code hbase.pb.ServerLoad}
    */
   public static final class ServerLoad extends
       com.google.protobuf.GeneratedMessage
@@ -8239,12 +8239,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ServerLoad_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ServerLoad_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ServerLoad_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ServerLoad_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder.class);
     }
@@ -8361,11 +8361,11 @@ public final class ClusterStatusProtos {
       return maxHeapMB_;
     }
 
-    // repeated .RegionLoad region_loads = 5;
+    // repeated .hbase.pb.RegionLoad region_loads = 5;
     public static final int REGION_LOADS_FIELD_NUMBER = 5;
     private java.util.List regionLoads_;
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -8375,7 +8375,7 @@ public final class ClusterStatusProtos {
       return regionLoads_;
     }
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -8386,7 +8386,7 @@ public final class ClusterStatusProtos {
       return regionLoads_;
     }
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -8396,7 +8396,7 @@ public final class ClusterStatusProtos {
       return regionLoads_.size();
     }
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -8406,7 +8406,7 @@ public final class ClusterStatusProtos {
       return regionLoads_.get(index);
     }
     /**
-     * repeated .RegionLoad region_loads = 5;
+     * repeated .hbase.pb.RegionLoad region_loads = 5;
      *
      * 
      ** Information on the load of individual regions. 
@@ -8417,11 +8417,11 @@ public final class ClusterStatusProtos {
       return regionLoads_.get(index);
     }
 
-    // repeated .Coprocessor coprocessors = 6;
+    // repeated .hbase.pb.Coprocessor coprocessors = 6;
     public static final int COPROCESSORS_FIELD_NUMBER = 6;
     private java.util.List coprocessors_;
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -8434,7 +8434,7 @@ public final class ClusterStatusProtos {
       return coprocessors_;
     }
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -8448,7 +8448,7 @@ public final class ClusterStatusProtos {
       return coprocessors_;
     }
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -8461,7 +8461,7 @@ public final class ClusterStatusProtos {
       return coprocessors_.size();
     }
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -8474,7 +8474,7 @@ public final class ClusterStatusProtos {
       return coprocessors_.get(index);
     }
     /**
-     * repeated .Coprocessor coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor coprocessors = 6;
      *
      * 
      **
@@ -8574,11 +8574,11 @@ public final class ClusterStatusProtos {
       return infoServerPort_;
     }
 
-    // repeated .ReplicationLoadSource replLoadSource = 10;
+    // repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
     public static final int REPLLOADSOURCE_FIELD_NUMBER = 10;
     private java.util.List replLoadSource_;
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8589,7 +8589,7 @@ public final class ClusterStatusProtos {
       return replLoadSource_;
     }
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8601,7 +8601,7 @@ public final class ClusterStatusProtos {
       return replLoadSource_;
     }
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8612,7 +8612,7 @@ public final class ClusterStatusProtos {
       return replLoadSource_.size();
     }
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8623,7 +8623,7 @@ public final class ClusterStatusProtos {
       return replLoadSource_.get(index);
     }
     /**
-     * repeated .ReplicationLoadSource replLoadSource = 10;
+     * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
      *
      * 
      **
@@ -8635,11 +8635,11 @@ public final class ClusterStatusProtos {
       return replLoadSource_.get(index);
     }
 
-    // optional .ReplicationLoadSink replLoadSink = 11;
+    // optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
     public static final int REPLLOADSINK_FIELD_NUMBER = 11;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink replLoadSink_;
     /**
-     * optional .ReplicationLoadSink replLoadSink = 11;
+     * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
      *
      * 
      **
@@ -8650,7 +8650,7 @@ public final class ClusterStatusProtos {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * optional .ReplicationLoadSink replLoadSink = 11;
+     * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
      *
      * 
      **
@@ -8661,7 +8661,7 @@ public final class ClusterStatusProtos {
       return replLoadSink_;
     }
     /**
-     * optional .ReplicationLoadSink replLoadSink = 11;
+     * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
      *
      * 
      **
@@ -9005,19 +9005,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ServerLoad}
+     * Protobuf type {@code hbase.pb.ServerLoad}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ServerLoad_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ServerLoad_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ServerLoad_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ServerLoad_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder.class);
       }
@@ -9093,7 +9093,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ServerLoad_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ServerLoad_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad getDefaultInstanceForType() {
@@ -9540,7 +9540,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // repeated .RegionLoad region_loads = 5;
+      // repeated .hbase.pb.RegionLoad region_loads = 5;
       private java.util.List regionLoads_ =
         java.util.Collections.emptyList();
       private void ensureRegionLoadsIsMutable() {
@@ -9554,7 +9554,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoadOrBuilder> regionLoadsBuilder_;
 
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9568,7 +9568,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9582,7 +9582,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9596,7 +9596,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9617,7 +9617,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9635,7 +9635,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9655,7 +9655,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9676,7 +9676,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9694,7 +9694,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9712,7 +9712,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9730,7 +9730,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9747,7 +9747,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9764,7 +9764,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9775,7 +9775,7 @@ public final class ClusterStatusProtos {
         return getRegionLoadsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9789,7 +9789,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9804,7 +9804,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9815,7 +9815,7 @@ public final class ClusterStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.getDefaultInstance());
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9827,7 +9827,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad.getDefaultInstance());
       }
       /**
-       * repeated .RegionLoad region_loads = 5;
+       * repeated .hbase.pb.RegionLoad region_loads = 5;
        *
        * 
        ** Information on the load of individual regions. 
@@ -9852,7 +9852,7 @@ public final class ClusterStatusProtos {
         return regionLoadsBuilder_;
       }
 
-      // repeated .Coprocessor coprocessors = 6;
+      // repeated .hbase.pb.Coprocessor coprocessors = 6;
       private java.util.List coprocessors_ =
         java.util.Collections.emptyList();
       private void ensureCoprocessorsIsMutable() {
@@ -9866,7 +9866,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CoprocessorOrBuilder> coprocessorsBuilder_;
 
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -9883,7 +9883,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -9900,7 +9900,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -9917,7 +9917,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -9941,7 +9941,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -9962,7 +9962,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -9985,7 +9985,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10009,7 +10009,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10030,7 +10030,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10051,7 +10051,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10072,7 +10072,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10092,7 +10092,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10112,7 +10112,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10126,7 +10126,7 @@ public final class ClusterStatusProtos {
         return getCoprocessorsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10143,7 +10143,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10161,7 +10161,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10175,7 +10175,7 @@ public final class ClusterStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.getDefaultInstance());
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10190,7 +10190,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.getDefaultInstance());
       }
       /**
-       * repeated .Coprocessor coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor coprocessors = 6;
        *
        * 
        **
@@ -10393,7 +10393,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // repeated .ReplicationLoadSource replLoadSource = 10;
+      // repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
       private java.util.List replLoadSource_ =
         java.util.Collections.emptyList();
       private void ensureReplLoadSourceIsMutable() {
@@ -10407,7 +10407,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSourceOrBuilder> replLoadSourceBuilder_;
 
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10422,7 +10422,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10437,7 +10437,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10452,7 +10452,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10474,7 +10474,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10493,7 +10493,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10514,7 +10514,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10536,7 +10536,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10555,7 +10555,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10574,7 +10574,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10593,7 +10593,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10611,7 +10611,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10629,7 +10629,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10641,7 +10641,7 @@ public final class ClusterStatusProtos {
         return getReplLoadSourceFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10656,7 +10656,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10672,7 +10672,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10684,7 +10684,7 @@ public final class ClusterStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.getDefaultInstance());
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10697,7 +10697,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSource.getDefaultInstance());
       }
       /**
-       * repeated .ReplicationLoadSource replLoadSource = 10;
+       * repeated .hbase.pb.ReplicationLoadSource replLoadSource = 10;
        *
        * 
        **
@@ -10723,12 +10723,12 @@ public final class ClusterStatusProtos {
         return replLoadSourceBuilder_;
       }
 
-      // optional .ReplicationLoadSink replLoadSink = 11;
+      // optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink replLoadSink_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSink.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ReplicationLoadSinkOrBuilder> replLoadSinkBuilder_;
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10739,7 +10739,7 @@ public final class ClusterStatusProtos {
         return ((bitField0_ & 0x00000400) == 0x00000400);
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10754,7 +10754,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10775,7 +10775,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10794,7 +10794,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10818,7 +10818,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10836,7 +10836,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10849,7 +10849,7 @@ public final class ClusterStatusProtos {
         return getReplLoadSinkFieldBuilder().getBuilder();
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10864,7 +10864,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .ReplicationLoadSink replLoadSink = 11;
+       * optional .hbase.pb.ReplicationLoadSink replLoadSink = 11;
        *
        * 
        **
@@ -10885,7 +10885,7 @@ public final class ClusterStatusProtos {
         return replLoadSinkBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ServerLoad)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ServerLoad)
     }
 
     static {
@@ -10893,42 +10893,42 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ServerLoad)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ServerLoad)
   }
 
   public interface LiveServerInfoOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     boolean hasServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder();
 
-    // required .ServerLoad server_load = 2;
+    // required .hbase.pb.ServerLoad server_load = 2;
     /**
-     * required .ServerLoad server_load = 2;
+     * required .hbase.pb.ServerLoad server_load = 2;
      */
     boolean hasServerLoad();
     /**
-     * required .ServerLoad server_load = 2;
+     * required .hbase.pb.ServerLoad server_load = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad getServerLoad();
     /**
-     * required .ServerLoad server_load = 2;
+     * required .hbase.pb.ServerLoad server_load = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder getServerLoadOrBuilder();
   }
   /**
-   * Protobuf type {@code LiveServerInfo}
+   * Protobuf type {@code hbase.pb.LiveServerInfo}
    */
   public static final class LiveServerInfo extends
       com.google.protobuf.GeneratedMessage
@@ -11018,12 +11018,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_LiveServerInfo_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_LiveServerInfo_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_LiveServerInfo_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_LiveServerInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder.class);
     }
@@ -11044,45 +11044,45 @@ public final class ClusterStatusProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     public static final int SERVER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     public boolean hasServer() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer() {
       return server_;
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder() {
       return server_;
     }
 
-    // required .ServerLoad server_load = 2;
+    // required .hbase.pb.ServerLoad server_load = 2;
     public static final int SERVER_LOAD_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad serverLoad_;
     /**
-     * required .ServerLoad server_load = 2;
+     * required .hbase.pb.ServerLoad server_load = 2;
      */
     public boolean hasServerLoad() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .ServerLoad server_load = 2;
+     * required .hbase.pb.ServerLoad server_load = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad getServerLoad() {
       return serverLoad_;
     }
     /**
-     * required .ServerLoad server_load = 2;
+     * required .hbase.pb.ServerLoad server_load = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder getServerLoadOrBuilder() {
       return serverLoad_;
@@ -11269,19 +11269,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code LiveServerInfo}
+     * Protobuf type {@code hbase.pb.LiveServerInfo}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_LiveServerInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_LiveServerInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_LiveServerInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_LiveServerInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder.class);
       }
@@ -11329,7 +11329,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_LiveServerInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_LiveServerInfo_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo getDefaultInstanceForType() {
@@ -11429,18 +11429,18 @@ public final class ClusterStatusProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server = 1;
+      // required .hbase.pb.ServerName server = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_;
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public boolean hasServer() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer() {
         if (serverBuilder_ == null) {
@@ -11450,7 +11450,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder setServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverBuilder_ == null) {
@@ -11466,7 +11466,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder setServer(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -11480,7 +11480,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder mergeServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverBuilder_ == null) {
@@ -11499,7 +11499,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder clearServer() {
         if (serverBuilder_ == null) {
@@ -11512,7 +11512,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getServerBuilder() {
         bitField0_ |= 0x00000001;
@@ -11520,7 +11520,7 @@ public final class ClusterStatusProtos {
         return getServerFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder() {
         if (serverBuilder_ != null) {
@@ -11530,7 +11530,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -11546,18 +11546,18 @@ public final class ClusterStatusProtos {
         return serverBuilder_;
       }
 
-      // required .ServerLoad server_load = 2;
+      // required .hbase.pb.ServerLoad server_load = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad serverLoad_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder> serverLoadBuilder_;
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public boolean hasServerLoad() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad getServerLoad() {
         if (serverLoadBuilder_ == null) {
@@ -11567,7 +11567,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public Builder setServerLoad(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad value) {
         if (serverLoadBuilder_ == null) {
@@ -11583,7 +11583,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public Builder setServerLoad(
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder builderForValue) {
@@ -11597,7 +11597,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public Builder mergeServerLoad(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad value) {
         if (serverLoadBuilder_ == null) {
@@ -11616,7 +11616,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public Builder clearServerLoad() {
         if (serverLoadBuilder_ == null) {
@@ -11629,7 +11629,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder getServerLoadBuilder() {
         bitField0_ |= 0x00000002;
@@ -11637,7 +11637,7 @@ public final class ClusterStatusProtos {
         return getServerLoadFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder getServerLoadOrBuilder() {
         if (serverLoadBuilder_ != null) {
@@ -11647,7 +11647,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * required .ServerLoad server_load = 2;
+       * required .hbase.pb.ServerLoad server_load = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder> 
@@ -11663,7 +11663,7 @@ public final class ClusterStatusProtos {
         return serverLoadBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:LiveServerInfo)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.LiveServerInfo)
     }
 
     static {
@@ -11671,175 +11671,175 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:LiveServerInfo)
+    // @@protoc_insertion_point(class_scope:hbase.pb.LiveServerInfo)
   }
 
   public interface ClusterStatusOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .HBaseVersionFileContent hbase_version = 1;
+    // optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
     /**
-     * optional .HBaseVersionFileContent hbase_version = 1;
+     * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
      */
     boolean hasHbaseVersion();
     /**
-     * optional .HBaseVersionFileContent hbase_version = 1;
+     * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent getHbaseVersion();
     /**
-     * optional .HBaseVersionFileContent hbase_version = 1;
+     * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContentOrBuilder getHbaseVersionOrBuilder();
 
-    // repeated .LiveServerInfo live_servers = 2;
+    // repeated .hbase.pb.LiveServerInfo live_servers = 2;
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     java.util.List 
         getLiveServersList();
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo getLiveServers(int index);
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     int getLiveServersCount();
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     java.util.List 
         getLiveServersOrBuilderList();
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfoOrBuilder getLiveServersOrBuilder(
         int index);
 
-    // repeated .ServerName dead_servers = 3;
+    // repeated .hbase.pb.ServerName dead_servers = 3;
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     java.util.List 
         getDeadServersList();
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDeadServers(int index);
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     int getDeadServersCount();
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     java.util.List 
         getDeadServersOrBuilderList();
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDeadServersOrBuilder(
         int index);
 
-    // repeated .RegionInTransition regions_in_transition = 4;
+    // repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     java.util.List 
         getRegionsInTransitionList();
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition getRegionsInTransition(int index);
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     int getRegionsInTransitionCount();
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     java.util.List 
         getRegionsInTransitionOrBuilderList();
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransitionOrBuilder getRegionsInTransitionOrBuilder(
         int index);
 
-    // optional .ClusterId cluster_id = 5;
+    // optional .hbase.pb.ClusterId cluster_id = 5;
     /**
-     * optional .ClusterId cluster_id = 5;
+     * optional .hbase.pb.ClusterId cluster_id = 5;
      */
     boolean hasClusterId();
     /**
-     * optional .ClusterId cluster_id = 5;
+     * optional .hbase.pb.ClusterId cluster_id = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId getClusterId();
     /**
-     * optional .ClusterId cluster_id = 5;
+     * optional .hbase.pb.ClusterId cluster_id = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterIdOrBuilder getClusterIdOrBuilder();
 
-    // repeated .Coprocessor master_coprocessors = 6;
+    // repeated .hbase.pb.Coprocessor master_coprocessors = 6;
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     java.util.List 
         getMasterCoprocessorsList();
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor getMasterCoprocessors(int index);
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     int getMasterCoprocessorsCount();
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     java.util.List 
         getMasterCoprocessorsOrBuilderList();
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CoprocessorOrBuilder getMasterCoprocessorsOrBuilder(
         int index);
 
-    // optional .ServerName master = 7;
+    // optional .hbase.pb.ServerName master = 7;
     /**
-     * optional .ServerName master = 7;
+     * optional .hbase.pb.ServerName master = 7;
      */
     boolean hasMaster();
     /**
-     * optional .ServerName master = 7;
+     * optional .hbase.pb.ServerName master = 7;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getMaster();
     /**
-     * optional .ServerName master = 7;
+     * optional .hbase.pb.ServerName master = 7;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getMasterOrBuilder();
 
-    // repeated .ServerName backup_masters = 8;
+    // repeated .hbase.pb.ServerName backup_masters = 8;
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     java.util.List 
         getBackupMastersList();
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getBackupMasters(int index);
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     int getBackupMastersCount();
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     java.util.List 
         getBackupMastersOrBuilderList();
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getBackupMastersOrBuilder(
         int index);
@@ -11855,7 +11855,7 @@ public final class ClusterStatusProtos {
     boolean getBalancerOn();
   }
   /**
-   * Protobuf type {@code ClusterStatus}
+   * Protobuf type {@code hbase.pb.ClusterStatus}
    */
   public static final class ClusterStatus extends
       com.google.protobuf.GeneratedMessage
@@ -12018,12 +12018,12 @@ public final class ClusterStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ClusterStatus_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ClusterStatus_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ClusterStatus_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ClusterStatus_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.Builder.class);
     }
@@ -12044,246 +12044,246 @@ public final class ClusterStatusProtos {
     }
 
     private int bitField0_;
-    // optional .HBaseVersionFileContent hbase_version = 1;
+    // optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
     public static final int HBASE_VERSION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent hbaseVersion_;
     /**
-     * optional .HBaseVersionFileContent hbase_version = 1;
+     * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
      */
     public boolean hasHbaseVersion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .HBaseVersionFileContent hbase_version = 1;
+     * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent getHbaseVersion() {
       return hbaseVersion_;
     }
     /**
-     * optional .HBaseVersionFileContent hbase_version = 1;
+     * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContentOrBuilder getHbaseVersionOrBuilder() {
       return hbaseVersion_;
     }
 
-    // repeated .LiveServerInfo live_servers = 2;
+    // repeated .hbase.pb.LiveServerInfo live_servers = 2;
     public static final int LIVE_SERVERS_FIELD_NUMBER = 2;
     private java.util.List liveServers_;
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     public java.util.List getLiveServersList() {
       return liveServers_;
     }
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     public java.util.List 
         getLiveServersOrBuilderList() {
       return liveServers_;
     }
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     public int getLiveServersCount() {
       return liveServers_.size();
     }
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo getLiveServers(int index) {
       return liveServers_.get(index);
     }
     /**
-     * repeated .LiveServerInfo live_servers = 2;
+     * repeated .hbase.pb.LiveServerInfo live_servers = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfoOrBuilder getLiveServersOrBuilder(
         int index) {
       return liveServers_.get(index);
     }
 
-    // repeated .ServerName dead_servers = 3;
+    // repeated .hbase.pb.ServerName dead_servers = 3;
     public static final int DEAD_SERVERS_FIELD_NUMBER = 3;
     private java.util.List deadServers_;
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     public java.util.List getDeadServersList() {
       return deadServers_;
     }
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     public java.util.List 
         getDeadServersOrBuilderList() {
       return deadServers_;
     }
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     public int getDeadServersCount() {
       return deadServers_.size();
     }
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDeadServers(int index) {
       return deadServers_.get(index);
     }
     /**
-     * repeated .ServerName dead_servers = 3;
+     * repeated .hbase.pb.ServerName dead_servers = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDeadServersOrBuilder(
         int index) {
       return deadServers_.get(index);
     }
 
-    // repeated .RegionInTransition regions_in_transition = 4;
+    // repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
     public static final int REGIONS_IN_TRANSITION_FIELD_NUMBER = 4;
     private java.util.List regionsInTransition_;
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     public java.util.List getRegionsInTransitionList() {
       return regionsInTransition_;
     }
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     public java.util.List 
         getRegionsInTransitionOrBuilderList() {
       return regionsInTransition_;
     }
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     public int getRegionsInTransitionCount() {
       return regionsInTransition_.size();
     }
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition getRegionsInTransition(int index) {
       return regionsInTransition_.get(index);
     }
     /**
-     * repeated .RegionInTransition regions_in_transition = 4;
+     * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransitionOrBuilder getRegionsInTransitionOrBuilder(
         int index) {
       return regionsInTransition_.get(index);
     }
 
-    // optional .ClusterId cluster_id = 5;
+    // optional .hbase.pb.ClusterId cluster_id = 5;
     public static final int CLUSTER_ID_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId clusterId_;
     /**
-     * optional .ClusterId cluster_id = 5;
+     * optional .hbase.pb.ClusterId cluster_id = 5;
      */
     public boolean hasClusterId() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .ClusterId cluster_id = 5;
+     * optional .hbase.pb.ClusterId cluster_id = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId getClusterId() {
       return clusterId_;
     }
     /**
-     * optional .ClusterId cluster_id = 5;
+     * optional .hbase.pb.ClusterId cluster_id = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterIdOrBuilder getClusterIdOrBuilder() {
       return clusterId_;
     }
 
-    // repeated .Coprocessor master_coprocessors = 6;
+    // repeated .hbase.pb.Coprocessor master_coprocessors = 6;
     public static final int MASTER_COPROCESSORS_FIELD_NUMBER = 6;
     private java.util.List masterCoprocessors_;
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     public java.util.List getMasterCoprocessorsList() {
       return masterCoprocessors_;
     }
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     public java.util.List 
         getMasterCoprocessorsOrBuilderList() {
       return masterCoprocessors_;
     }
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     public int getMasterCoprocessorsCount() {
       return masterCoprocessors_.size();
     }
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor getMasterCoprocessors(int index) {
       return masterCoprocessors_.get(index);
     }
     /**
-     * repeated .Coprocessor master_coprocessors = 6;
+     * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CoprocessorOrBuilder getMasterCoprocessorsOrBuilder(
         int index) {
       return masterCoprocessors_.get(index);
     }
 
-    // optional .ServerName master = 7;
+    // optional .hbase.pb.ServerName master = 7;
     public static final int MASTER_FIELD_NUMBER = 7;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName master_;
     /**
-     * optional .ServerName master = 7;
+     * optional .hbase.pb.ServerName master = 7;
      */
     public boolean hasMaster() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .ServerName master = 7;
+     * optional .hbase.pb.ServerName master = 7;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getMaster() {
       return master_;
     }
     /**
-     * optional .ServerName master = 7;
+     * optional .hbase.pb.ServerName master = 7;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getMasterOrBuilder() {
       return master_;
     }
 
-    // repeated .ServerName backup_masters = 8;
+    // repeated .hbase.pb.ServerName backup_masters = 8;
     public static final int BACKUP_MASTERS_FIELD_NUMBER = 8;
     private java.util.List backupMasters_;
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     public java.util.List getBackupMastersList() {
       return backupMasters_;
     }
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     public java.util.List 
         getBackupMastersOrBuilderList() {
       return backupMasters_;
     }
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     public int getBackupMastersCount() {
       return backupMasters_.size();
     }
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getBackupMasters(int index) {
       return backupMasters_.get(index);
     }
     /**
-     * repeated .ServerName backup_masters = 8;
+     * repeated .hbase.pb.ServerName backup_masters = 8;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getBackupMastersOrBuilder(
         int index) {
@@ -12623,19 +12623,19 @@ public final class ClusterStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ClusterStatus}
+     * Protobuf type {@code hbase.pb.ClusterStatus}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatusOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ClusterStatus_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ClusterStatus_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ClusterStatus_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ClusterStatus_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.class, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.Builder.class);
       }
@@ -12727,7 +12727,7 @@ public final class ClusterStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_ClusterStatus_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.internal_static_hbase_pb_ClusterStatus_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus getDefaultInstanceForType() {
@@ -13052,18 +13052,18 @@ public final class ClusterStatusProtos {
       }
       private int bitField0_;
 
-      // optional .HBaseVersionFileContent hbase_version = 1;
+      // optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent hbaseVersion_ = org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent, org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.Builder, org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContentOrBuilder> hbaseVersionBuilder_;
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public boolean hasHbaseVersion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent getHbaseVersion() {
         if (hbaseVersionBuilder_ == null) {
@@ -13073,7 +13073,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public Builder setHbaseVersion(org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent value) {
         if (hbaseVersionBuilder_ == null) {
@@ -13089,7 +13089,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public Builder setHbaseVersion(
           org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.Builder builderForValue) {
@@ -13103,7 +13103,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public Builder mergeHbaseVersion(org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent value) {
         if (hbaseVersionBuilder_ == null) {
@@ -13122,7 +13122,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public Builder clearHbaseVersion() {
         if (hbaseVersionBuilder_ == null) {
@@ -13135,7 +13135,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.Builder getHbaseVersionBuilder() {
         bitField0_ |= 0x00000001;
@@ -13143,7 +13143,7 @@ public final class ClusterStatusProtos {
         return getHbaseVersionFieldBuilder().getBuilder();
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContentOrBuilder getHbaseVersionOrBuilder() {
         if (hbaseVersionBuilder_ != null) {
@@ -13153,7 +13153,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .HBaseVersionFileContent hbase_version = 1;
+       * optional .hbase.pb.HBaseVersionFileContent hbase_version = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent, org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.Builder, org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContentOrBuilder> 
@@ -13169,7 +13169,7 @@ public final class ClusterStatusProtos {
         return hbaseVersionBuilder_;
       }
 
-      // repeated .LiveServerInfo live_servers = 2;
+      // repeated .hbase.pb.LiveServerInfo live_servers = 2;
       private java.util.List liveServers_ =
         java.util.Collections.emptyList();
       private void ensureLiveServersIsMutable() {
@@ -13183,7 +13183,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfoOrBuilder> liveServersBuilder_;
 
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public java.util.List getLiveServersList() {
         if (liveServersBuilder_ == null) {
@@ -13193,7 +13193,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public int getLiveServersCount() {
         if (liveServersBuilder_ == null) {
@@ -13203,7 +13203,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo getLiveServers(int index) {
         if (liveServersBuilder_ == null) {
@@ -13213,7 +13213,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder setLiveServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo value) {
@@ -13230,7 +13230,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder setLiveServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder builderForValue) {
@@ -13244,7 +13244,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder addLiveServers(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo value) {
         if (liveServersBuilder_ == null) {
@@ -13260,7 +13260,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder addLiveServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo value) {
@@ -13277,7 +13277,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder addLiveServers(
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder builderForValue) {
@@ -13291,7 +13291,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder addLiveServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder builderForValue) {
@@ -13305,7 +13305,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder addAllLiveServers(
           java.lang.Iterable values) {
@@ -13319,7 +13319,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder clearLiveServers() {
         if (liveServersBuilder_ == null) {
@@ -13332,7 +13332,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public Builder removeLiveServers(int index) {
         if (liveServersBuilder_ == null) {
@@ -13345,14 +13345,14 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder getLiveServersBuilder(
           int index) {
         return getLiveServersFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfoOrBuilder getLiveServersOrBuilder(
           int index) {
@@ -13362,7 +13362,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public java.util.List 
            getLiveServersOrBuilderList() {
@@ -13373,14 +13373,14 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder addLiveServersBuilder() {
         return getLiveServersFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.getDefaultInstance());
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.Builder addLiveServersBuilder(
           int index) {
@@ -13388,7 +13388,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.LiveServerInfo.getDefaultInstance());
       }
       /**
-       * repeated .LiveServerInfo live_servers = 2;
+       * repeated .hbase.pb.LiveServerInfo live_servers = 2;
        */
       public java.util.List 
            getLiveServersBuilderList() {
@@ -13409,7 +13409,7 @@ public final class ClusterStatusProtos {
         return liveServersBuilder_;
       }
 
-      // repeated .ServerName dead_servers = 3;
+      // repeated .hbase.pb.ServerName dead_servers = 3;
       private java.util.List deadServers_ =
         java.util.Collections.emptyList();
       private void ensureDeadServersIsMutable() {
@@ -13423,7 +13423,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> deadServersBuilder_;
 
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public java.util.List getDeadServersList() {
         if (deadServersBuilder_ == null) {
@@ -13433,7 +13433,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public int getDeadServersCount() {
         if (deadServersBuilder_ == null) {
@@ -13443,7 +13443,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDeadServers(int index) {
         if (deadServersBuilder_ == null) {
@@ -13453,7 +13453,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder setDeadServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -13470,7 +13470,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder setDeadServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -13484,7 +13484,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder addDeadServers(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (deadServersBuilder_ == null) {
@@ -13500,7 +13500,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder addDeadServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -13517,7 +13517,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder addDeadServers(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -13531,7 +13531,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder addDeadServers(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -13545,7 +13545,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder addAllDeadServers(
           java.lang.Iterable values) {
@@ -13559,7 +13559,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder clearDeadServers() {
         if (deadServersBuilder_ == null) {
@@ -13572,7 +13572,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public Builder removeDeadServers(int index) {
         if (deadServersBuilder_ == null) {
@@ -13585,14 +13585,14 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getDeadServersBuilder(
           int index) {
         return getDeadServersFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDeadServersOrBuilder(
           int index) {
@@ -13602,7 +13602,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public java.util.List 
            getDeadServersOrBuilderList() {
@@ -13613,14 +13613,14 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addDeadServersBuilder() {
         return getDeadServersFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addDeadServersBuilder(
           int index) {
@@ -13628,7 +13628,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
       }
       /**
-       * repeated .ServerName dead_servers = 3;
+       * repeated .hbase.pb.ServerName dead_servers = 3;
        */
       public java.util.List 
            getDeadServersBuilderList() {
@@ -13649,7 +13649,7 @@ public final class ClusterStatusProtos {
         return deadServersBuilder_;
       }
 
-      // repeated .RegionInTransition regions_in_transition = 4;
+      // repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
       private java.util.List regionsInTransition_ =
         java.util.Collections.emptyList();
       private void ensureRegionsInTransitionIsMutable() {
@@ -13663,7 +13663,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransitionOrBuilder> regionsInTransitionBuilder_;
 
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public java.util.List getRegionsInTransitionList() {
         if (regionsInTransitionBuilder_ == null) {
@@ -13673,7 +13673,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public int getRegionsInTransitionCount() {
         if (regionsInTransitionBuilder_ == null) {
@@ -13683,7 +13683,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition getRegionsInTransition(int index) {
         if (regionsInTransitionBuilder_ == null) {
@@ -13693,7 +13693,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder setRegionsInTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition value) {
@@ -13710,7 +13710,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder setRegionsInTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder builderForValue) {
@@ -13724,7 +13724,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder addRegionsInTransition(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition value) {
         if (regionsInTransitionBuilder_ == null) {
@@ -13740,7 +13740,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder addRegionsInTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition value) {
@@ -13757,7 +13757,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder addRegionsInTransition(
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder builderForValue) {
@@ -13771,7 +13771,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder addRegionsInTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder builderForValue) {
@@ -13785,7 +13785,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder addAllRegionsInTransition(
           java.lang.Iterable values) {
@@ -13799,7 +13799,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder clearRegionsInTransition() {
         if (regionsInTransitionBuilder_ == null) {
@@ -13812,7 +13812,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public Builder removeRegionsInTransition(int index) {
         if (regionsInTransitionBuilder_ == null) {
@@ -13825,14 +13825,14 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder getRegionsInTransitionBuilder(
           int index) {
         return getRegionsInTransitionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransitionOrBuilder getRegionsInTransitionOrBuilder(
           int index) {
@@ -13842,7 +13842,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public java.util.List 
            getRegionsInTransitionOrBuilderList() {
@@ -13853,14 +13853,14 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder addRegionsInTransitionBuilder() {
         return getRegionsInTransitionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.getDefaultInstance());
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.Builder addRegionsInTransitionBuilder(
           int index) {
@@ -13868,7 +13868,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionInTransition.getDefaultInstance());
       }
       /**
-       * repeated .RegionInTransition regions_in_transition = 4;
+       * repeated .hbase.pb.RegionInTransition regions_in_transition = 4;
        */
       public java.util.List 
            getRegionsInTransitionBuilderList() {
@@ -13889,18 +13889,18 @@ public final class ClusterStatusProtos {
         return regionsInTransitionBuilder_;
       }
 
-      // optional .ClusterId cluster_id = 5;
+      // optional .hbase.pb.ClusterId cluster_id = 5;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId clusterId_ = org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId, org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterIdOrBuilder> clusterIdBuilder_;
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public boolean hasClusterId() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId getClusterId() {
         if (clusterIdBuilder_ == null) {
@@ -13910,7 +13910,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public Builder setClusterId(org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId value) {
         if (clusterIdBuilder_ == null) {
@@ -13926,7 +13926,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public Builder setClusterId(
           org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.Builder builderForValue) {
@@ -13940,7 +13940,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public Builder mergeClusterId(org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId value) {
         if (clusterIdBuilder_ == null) {
@@ -13959,7 +13959,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public Builder clearClusterId() {
         if (clusterIdBuilder_ == null) {
@@ -13972,7 +13972,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.Builder getClusterIdBuilder() {
         bitField0_ |= 0x00000010;
@@ -13980,7 +13980,7 @@ public final class ClusterStatusProtos {
         return getClusterIdFieldBuilder().getBuilder();
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterIdOrBuilder getClusterIdOrBuilder() {
         if (clusterIdBuilder_ != null) {
@@ -13990,7 +13990,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .ClusterId cluster_id = 5;
+       * optional .hbase.pb.ClusterId cluster_id = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId, org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterId.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterIdProtos.ClusterIdOrBuilder> 
@@ -14006,7 +14006,7 @@ public final class ClusterStatusProtos {
         return clusterIdBuilder_;
       }
 
-      // repeated .Coprocessor master_coprocessors = 6;
+      // repeated .hbase.pb.Coprocessor master_coprocessors = 6;
       private java.util.List masterCoprocessors_ =
         java.util.Collections.emptyList();
       private void ensureMasterCoprocessorsIsMutable() {
@@ -14020,7 +14020,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CoprocessorOrBuilder> masterCoprocessorsBuilder_;
 
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public java.util.List getMasterCoprocessorsList() {
         if (masterCoprocessorsBuilder_ == null) {
@@ -14030,7 +14030,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public int getMasterCoprocessorsCount() {
         if (masterCoprocessorsBuilder_ == null) {
@@ -14040,7 +14040,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor getMasterCoprocessors(int index) {
         if (masterCoprocessorsBuilder_ == null) {
@@ -14050,7 +14050,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder setMasterCoprocessors(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor value) {
@@ -14067,7 +14067,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder setMasterCoprocessors(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder builderForValue) {
@@ -14081,7 +14081,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder addMasterCoprocessors(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor value) {
         if (masterCoprocessorsBuilder_ == null) {
@@ -14097,7 +14097,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder addMasterCoprocessors(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor value) {
@@ -14114,7 +14114,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder addMasterCoprocessors(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder builderForValue) {
@@ -14128,7 +14128,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder addMasterCoprocessors(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder builderForValue) {
@@ -14142,7 +14142,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder addAllMasterCoprocessors(
           java.lang.Iterable values) {
@@ -14156,7 +14156,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder clearMasterCoprocessors() {
         if (masterCoprocessorsBuilder_ == null) {
@@ -14169,7 +14169,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public Builder removeMasterCoprocessors(int index) {
         if (masterCoprocessorsBuilder_ == null) {
@@ -14182,14 +14182,14 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder getMasterCoprocessorsBuilder(
           int index) {
         return getMasterCoprocessorsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CoprocessorOrBuilder getMasterCoprocessorsOrBuilder(
           int index) {
@@ -14199,7 +14199,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public java.util.List 
            getMasterCoprocessorsOrBuilderList() {
@@ -14210,14 +14210,14 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder addMasterCoprocessorsBuilder() {
         return getMasterCoprocessorsFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.getDefaultInstance());
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder addMasterCoprocessorsBuilder(
           int index) {
@@ -14225,7 +14225,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.getDefaultInstance());
       }
       /**
-       * repeated .Coprocessor master_coprocessors = 6;
+       * repeated .hbase.pb.Coprocessor master_coprocessors = 6;
        */
       public java.util.List 
            getMasterCoprocessorsBuilderList() {
@@ -14246,18 +14246,18 @@ public final class ClusterStatusProtos {
         return masterCoprocessorsBuilder_;
       }
 
-      // optional .ServerName master = 7;
+      // optional .hbase.pb.ServerName master = 7;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName master_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> masterBuilder_;
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public boolean hasMaster() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getMaster() {
         if (masterBuilder_ == null) {
@@ -14267,7 +14267,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public Builder setMaster(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (masterBuilder_ == null) {
@@ -14283,7 +14283,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public Builder setMaster(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -14297,7 +14297,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public Builder mergeMaster(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (masterBuilder_ == null) {
@@ -14316,7 +14316,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public Builder clearMaster() {
         if (masterBuilder_ == null) {
@@ -14329,7 +14329,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getMasterBuilder() {
         bitField0_ |= 0x00000040;
@@ -14337,7 +14337,7 @@ public final class ClusterStatusProtos {
         return getMasterFieldBuilder().getBuilder();
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getMasterOrBuilder() {
         if (masterBuilder_ != null) {
@@ -14347,7 +14347,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * optional .ServerName master = 7;
+       * optional .hbase.pb.ServerName master = 7;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -14363,7 +14363,7 @@ public final class ClusterStatusProtos {
         return masterBuilder_;
       }
 
-      // repeated .ServerName backup_masters = 8;
+      // repeated .hbase.pb.ServerName backup_masters = 8;
       private java.util.List backupMasters_ =
         java.util.Collections.emptyList();
       private void ensureBackupMastersIsMutable() {
@@ -14377,7 +14377,7 @@ public final class ClusterStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> backupMastersBuilder_;
 
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public java.util.List getBackupMastersList() {
         if (backupMastersBuilder_ == null) {
@@ -14387,7 +14387,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public int getBackupMastersCount() {
         if (backupMastersBuilder_ == null) {
@@ -14397,7 +14397,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getBackupMasters(int index) {
         if (backupMastersBuilder_ == null) {
@@ -14407,7 +14407,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder setBackupMasters(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -14424,7 +14424,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder setBackupMasters(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -14438,7 +14438,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder addBackupMasters(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (backupMastersBuilder_ == null) {
@@ -14454,7 +14454,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder addBackupMasters(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -14471,7 +14471,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder addBackupMasters(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -14485,7 +14485,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder addBackupMasters(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -14499,7 +14499,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder addAllBackupMasters(
           java.lang.Iterable values) {
@@ -14513,7 +14513,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder clearBackupMasters() {
         if (backupMastersBuilder_ == null) {
@@ -14526,7 +14526,7 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public Builder removeBackupMasters(int index) {
         if (backupMastersBuilder_ == null) {
@@ -14539,14 +14539,14 @@ public final class ClusterStatusProtos {
         return this;
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getBackupMastersBuilder(
           int index) {
         return getBackupMastersFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getBackupMastersOrBuilder(
           int index) {
@@ -14556,7 +14556,7 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public java.util.List 
            getBackupMastersOrBuilderList() {
@@ -14567,14 +14567,14 @@ public final class ClusterStatusProtos {
         }
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addBackupMastersBuilder() {
         return getBackupMastersFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addBackupMastersBuilder(
           int index) {
@@ -14582,7 +14582,7 @@ public final class ClusterStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
       }
       /**
-       * repeated .ServerName backup_masters = 8;
+       * repeated .hbase.pb.ServerName backup_masters = 8;
        */
       public java.util.List 
            getBackupMastersBuilderList() {
@@ -14636,7 +14636,7 @@ public final class ClusterStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ClusterStatus)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ClusterStatus)
     }
 
     static {
@@ -14644,59 +14644,59 @@ public final class ClusterStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ClusterStatus)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ClusterStatus)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionState_descriptor;
+    internal_static_hbase_pb_RegionState_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionState_fieldAccessorTable;
+      internal_static_hbase_pb_RegionState_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionInTransition_descriptor;
+    internal_static_hbase_pb_RegionInTransition_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionInTransition_fieldAccessorTable;
+      internal_static_hbase_pb_RegionInTransition_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StoreSequenceId_descriptor;
+    internal_static_hbase_pb_StoreSequenceId_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StoreSequenceId_fieldAccessorTable;
+      internal_static_hbase_pb_StoreSequenceId_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionStoreSequenceIds_descriptor;
+    internal_static_hbase_pb_RegionStoreSequenceIds_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionStoreSequenceIds_fieldAccessorTable;
+      internal_static_hbase_pb_RegionStoreSequenceIds_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionLoad_descriptor;
+    internal_static_hbase_pb_RegionLoad_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionLoad_fieldAccessorTable;
+      internal_static_hbase_pb_RegionLoad_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicationLoadSink_descriptor;
+    internal_static_hbase_pb_ReplicationLoadSink_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicationLoadSink_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicationLoadSink_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicationLoadSource_descriptor;
+    internal_static_hbase_pb_ReplicationLoadSource_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicationLoadSource_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicationLoadSource_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ServerLoad_descriptor;
+    internal_static_hbase_pb_ServerLoad_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ServerLoad_fieldAccessorTable;
+      internal_static_hbase_pb_ServerLoad_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_LiveServerInfo_descriptor;
+    internal_static_hbase_pb_LiveServerInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_LiveServerInfo_fieldAccessorTable;
+      internal_static_hbase_pb_LiveServerInfo_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ClusterStatus_descriptor;
+    internal_static_hbase_pb_ClusterStatus_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ClusterStatus_fieldAccessorTable;
+      internal_static_hbase_pb_ClusterStatus_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -14706,130 +14706,135 @@ public final class ClusterStatusProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023ClusterStatus.proto\032\013HBase.proto\032\017Clus" +
-      "terId.proto\032\010FS.proto\"\307\002\n\013RegionState\022 \n" +
-      "\013region_info\030\001 \002(\0132\013.RegionInfo\022!\n\005state" +
-      "\030\002 \002(\0162\022.RegionState.State\022\r\n\005stamp\030\003 \001(" +
-      "\004\"\343\001\n\005State\022\013\n\007OFFLINE\020\000\022\020\n\014PENDING_OPEN" +
-      "\020\001\022\013\n\007OPENING\020\002\022\010\n\004OPEN\020\003\022\021\n\rPENDING_CLO" +
-      "SE\020\004\022\013\n\007CLOSING\020\005\022\n\n\006CLOSED\020\006\022\r\n\tSPLITTI" +
-      "NG\020\007\022\t\n\005SPLIT\020\010\022\017\n\013FAILED_OPEN\020\t\022\020\n\014FAIL" +
-      "ED_CLOSE\020\n\022\013\n\007MERGING\020\013\022\n\n\006MERGED\020\014\022\021\n\rS" +
-      "PLITTING_NEW\020\r\022\017\n\013MERGING_NEW\020\016\"X\n\022Regio",
-      "nInTransition\022\036\n\004spec\030\001 \002(\0132\020.RegionSpec" +
-      "ifier\022\"\n\014region_state\030\002 \002(\0132\014.RegionStat" +
-      "e\";\n\017StoreSequenceId\022\023\n\013family_name\030\001 \002(" +
-      "\014\022\023\n\013sequence_id\030\002 \002(\004\"g\n\026RegionStoreSeq" +
-      "uenceIds\022 \n\030last_flushed_sequence_id\030\001 \002" +
-      "(\004\022+\n\021store_sequence_id\030\002 \003(\0132\020.StoreSeq" +
-      "uenceId\"\302\004\n\nRegionLoad\022*\n\020region_specifi" +
-      "er\030\001 \002(\0132\020.RegionSpecifier\022\016\n\006stores\030\002 \001" +
-      "(\r\022\022\n\nstorefiles\030\003 \001(\r\022\"\n\032store_uncompre" +
-      "ssed_size_MB\030\004 \001(\r\022\031\n\021storefile_size_MB\030",
-      "\005 \001(\r\022\030\n\020memstore_size_MB\030\006 \001(\r\022\037\n\027store" +
-      "file_index_size_MB\030\007 \001(\r\022\033\n\023read_request" +
-      "s_count\030\010 \001(\004\022\034\n\024write_requests_count\030\t " +
-      "\001(\004\022\034\n\024total_compacting_KVs\030\n \001(\004\022\035\n\025cur" +
-      "rent_compacted_KVs\030\013 \001(\004\022\032\n\022root_index_s" +
-      "ize_KB\030\014 \001(\r\022\"\n\032total_static_index_size_" +
-      "KB\030\r \001(\r\022\"\n\032total_static_bloom_size_KB\030\016" +
-      " \001(\r\022\034\n\024complete_sequence_id\030\017 \001(\004\022\025\n\rda" +
-      "ta_locality\030\020 \001(\002\022#\n\030last_major_compacti" +
-      "on_ts\030\021 \001(\004:\0010\0224\n\032store_complete_sequenc",
-      "e_id\030\022 \003(\0132\020.StoreSequenceId\"T\n\023Replicat" +
-      "ionLoadSink\022\032\n\022ageOfLastAppliedOp\030\001 \002(\004\022" +
-      "!\n\031timeStampsOfLastAppliedOp\030\002 \002(\004\"\225\001\n\025R" +
-      "eplicationLoadSource\022\016\n\006peerID\030\001 \002(\t\022\032\n\022" +
-      "ageOfLastShippedOp\030\002 \002(\004\022\026\n\016sizeOfLogQue" +
-      "ue\030\003 \002(\r\022 \n\030timeStampOfLastShippedOp\030\004 \002" +
-      "(\004\022\026\n\016replicationLag\030\005 \002(\004\"\346\002\n\nServerLoa" +
-      "d\022\032\n\022number_of_requests\030\001 \001(\004\022 \n\030total_n" +
-      "umber_of_requests\030\002 \001(\004\022\024\n\014used_heap_MB\030" +
-      "\003 \001(\r\022\023\n\013max_heap_MB\030\004 \001(\r\022!\n\014region_loa",
-      "ds\030\005 \003(\0132\013.RegionLoad\022\"\n\014coprocessors\030\006 " +
-      "\003(\0132\014.Coprocessor\022\031\n\021report_start_time\030\007" +
-      " \001(\004\022\027\n\017report_end_time\030\010 \001(\004\022\030\n\020info_se" +
-      "rver_port\030\t \001(\r\022.\n\016replLoadSource\030\n \003(\0132" +
-      "\026.ReplicationLoadSource\022*\n\014replLoadSink\030" +
-      "\013 \001(\0132\024.ReplicationLoadSink\"O\n\016LiveServe" +
-      "rInfo\022\033\n\006server\030\001 \002(\0132\013.ServerName\022 \n\013se" +
-      "rver_load\030\002 \002(\0132\013.ServerLoad\"\340\002\n\rCluster" +
-      "Status\022/\n\rhbase_version\030\001 \001(\0132\030.HBaseVer" +
-      "sionFileContent\022%\n\014live_servers\030\002 \003(\0132\017.",
-      "LiveServerInfo\022!\n\014dead_servers\030\003 \003(\0132\013.S" +
-      "erverName\0222\n\025regions_in_transition\030\004 \003(\013" +
-      "2\023.RegionInTransition\022\036\n\ncluster_id\030\005 \001(" +
-      "\0132\n.ClusterId\022)\n\023master_coprocessors\030\006 \003" +
-      "(\0132\014.Coprocessor\022\033\n\006master\030\007 \001(\0132\013.Serve" +
-      "rName\022#\n\016backup_masters\030\010 \003(\0132\013.ServerNa" +
-      "me\022\023\n\013balancer_on\030\t \001(\010BF\n*org.apache.ha" +
-      "doop.hbase.protobuf.generatedB\023ClusterSt" +
-      "atusProtosH\001\240\001\001"
+      "\n\023ClusterStatus.proto\022\010hbase.pb\032\013HBase.p" +
+      "roto\032\017ClusterId.proto\032\010FS.proto\"\331\002\n\013Regi" +
+      "onState\022)\n\013region_info\030\001 \002(\0132\024.hbase.pb." +
+      "RegionInfo\022*\n\005state\030\002 \002(\0162\033.hbase.pb.Reg" +
+      "ionState.State\022\r\n\005stamp\030\003 \001(\004\"\343\001\n\005State\022" +
+      "\013\n\007OFFLINE\020\000\022\020\n\014PENDING_OPEN\020\001\022\013\n\007OPENIN" +
+      "G\020\002\022\010\n\004OPEN\020\003\022\021\n\rPENDING_CLOSE\020\004\022\013\n\007CLOS" +
+      "ING\020\005\022\n\n\006CLOSED\020\006\022\r\n\tSPLITTING\020\007\022\t\n\005SPLI" +
+      "T\020\010\022\017\n\013FAILED_OPEN\020\t\022\020\n\014FAILED_CLOSE\020\n\022\013" +
+      "\n\007MERGING\020\013\022\n\n\006MERGED\020\014\022\021\n\rSPLITTING_NEW",
+      "\020\r\022\017\n\013MERGING_NEW\020\016\"j\n\022RegionInTransitio" +
+      "n\022\'\n\004spec\030\001 \002(\0132\031.hbase.pb.RegionSpecifi" +
+      "er\022+\n\014region_state\030\002 \002(\0132\025.hbase.pb.Regi" +
+      "onState\";\n\017StoreSequenceId\022\023\n\013family_nam" +
+      "e\030\001 \002(\014\022\023\n\013sequence_id\030\002 \002(\004\"p\n\026RegionSt" +
+      "oreSequenceIds\022 \n\030last_flushed_sequence_" +
+      "id\030\001 \002(\004\0224\n\021store_sequence_id\030\002 \003(\0132\031.hb" +
+      "ase.pb.StoreSequenceId\"\324\004\n\nRegionLoad\0223\n" +
+      "\020region_specifier\030\001 \002(\0132\031.hbase.pb.Regio" +
+      "nSpecifier\022\016\n\006stores\030\002 \001(\r\022\022\n\nstorefiles",
+      "\030\003 \001(\r\022\"\n\032store_uncompressed_size_MB\030\004 \001" +
+      "(\r\022\031\n\021storefile_size_MB\030\005 \001(\r\022\030\n\020memstor" +
+      "e_size_MB\030\006 \001(\r\022\037\n\027storefile_index_size_" +
+      "MB\030\007 \001(\r\022\033\n\023read_requests_count\030\010 \001(\004\022\034\n" +
+      "\024write_requests_count\030\t \001(\004\022\034\n\024total_com" +
+      "pacting_KVs\030\n \001(\004\022\035\n\025current_compacted_K" +
+      "Vs\030\013 \001(\004\022\032\n\022root_index_size_KB\030\014 \001(\r\022\"\n\032" +
+      "total_static_index_size_KB\030\r \001(\r\022\"\n\032tota" +
+      "l_static_bloom_size_KB\030\016 \001(\r\022\034\n\024complete" +
+      "_sequence_id\030\017 \001(\004\022\025\n\rdata_locality\030\020 \001(",
+      "\002\022#\n\030last_major_compaction_ts\030\021 \001(\004:\0010\022=" +
+      "\n\032store_complete_sequence_id\030\022 \003(\0132\031.hba" +
+      "se.pb.StoreSequenceId\"T\n\023ReplicationLoad" +
+      "Sink\022\032\n\022ageOfLastAppliedOp\030\001 \002(\004\022!\n\031time" +
+      "StampsOfLastAppliedOp\030\002 \002(\004\"\225\001\n\025Replicat" +
+      "ionLoadSource\022\016\n\006peerID\030\001 \002(\t\022\032\n\022ageOfLa" +
+      "stShippedOp\030\002 \002(\004\022\026\n\016sizeOfLogQueue\030\003 \002(" +
+      "\r\022 \n\030timeStampOfLastShippedOp\030\004 \002(\004\022\026\n\016r" +
+      "eplicationLag\030\005 \002(\004\"\212\003\n\nServerLoad\022\032\n\022nu" +
+      "mber_of_requests\030\001 \001(\004\022 \n\030total_number_o",
+      "f_requests\030\002 \001(\004\022\024\n\014used_heap_MB\030\003 \001(\r\022\023" +
+      "\n\013max_heap_MB\030\004 \001(\r\022*\n\014region_loads\030\005 \003(" +
+      "\0132\024.hbase.pb.RegionLoad\022+\n\014coprocessors\030" +
+      "\006 \003(\0132\025.hbase.pb.Coprocessor\022\031\n\021report_s" +
+      "tart_time\030\007 \001(\004\022\027\n\017report_end_time\030\010 \001(\004" +
+      "\022\030\n\020info_server_port\030\t \001(\r\0227\n\016replLoadSo" +
+      "urce\030\n \003(\0132\037.hbase.pb.ReplicationLoadSou" +
+      "rce\0223\n\014replLoadSink\030\013 \001(\0132\035.hbase.pb.Rep" +
+      "licationLoadSink\"a\n\016LiveServerInfo\022$\n\006se" +
+      "rver\030\001 \002(\0132\024.hbase.pb.ServerName\022)\n\013serv",
+      "er_load\030\002 \002(\0132\024.hbase.pb.ServerLoad\"\250\003\n\r" +
+      "ClusterStatus\0228\n\rhbase_version\030\001 \001(\0132!.h" +
+      "base.pb.HBaseVersionFileContent\022.\n\014live_" +
+      "servers\030\002 \003(\0132\030.hbase.pb.LiveServerInfo\022" +
+      "*\n\014dead_servers\030\003 \003(\0132\024.hbase.pb.ServerN" +
+      "ame\022;\n\025regions_in_transition\030\004 \003(\0132\034.hba" +
+      "se.pb.RegionInTransition\022\'\n\ncluster_id\030\005" +
+      " \001(\0132\023.hbase.pb.ClusterId\0222\n\023master_copr" +
+      "ocessors\030\006 \003(\0132\025.hbase.pb.Coprocessor\022$\n" +
+      "\006master\030\007 \001(\0132\024.hbase.pb.ServerName\022,\n\016b",
+      "ackup_masters\030\010 \003(\0132\024.hbase.pb.ServerNam" +
+      "e\022\023\n\013balancer_on\030\t \001(\010BF\n*org.apache.had" +
+      "oop.hbase.protobuf.generatedB\023ClusterSta" +
+      "tusProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_RegionState_descriptor =
+          internal_static_hbase_pb_RegionState_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_RegionState_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionState_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionState_descriptor,
+              internal_static_hbase_pb_RegionState_descriptor,
               new java.lang.String[] { "RegionInfo", "State", "Stamp", });
-          internal_static_RegionInTransition_descriptor =
+          internal_static_hbase_pb_RegionInTransition_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_RegionInTransition_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionInTransition_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionInTransition_descriptor,
+              internal_static_hbase_pb_RegionInTransition_descriptor,
               new java.lang.String[] { "Spec", "RegionState", });
-          internal_static_StoreSequenceId_descriptor =
+          internal_static_hbase_pb_StoreSequenceId_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_StoreSequenceId_fieldAccessorTable = new
+          internal_static_hbase_pb_StoreSequenceId_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StoreSequenceId_descriptor,
+              internal_static_hbase_pb_StoreSequenceId_descriptor,
               new java.lang.String[] { "FamilyName", "SequenceId", });
-          internal_static_RegionStoreSequenceIds_descriptor =
+          internal_static_hbase_pb_RegionStoreSequenceIds_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_RegionStoreSequenceIds_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionStoreSequenceIds_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionStoreSequenceIds_descriptor,
+              internal_static_hbase_pb_RegionStoreSequenceIds_descriptor,
               new java.lang.String[] { "LastFlushedSequenceId", "StoreSequenceId", });
-          internal_static_RegionLoad_descriptor =
+          internal_static_hbase_pb_RegionLoad_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_RegionLoad_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionLoad_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionLoad_descriptor,
+              internal_static_hbase_pb_RegionLoad_descriptor,
               new java.lang.String[] { "RegionSpecifier", "Stores", "Storefiles", "StoreUncompressedSizeMB", "StorefileSizeMB", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "TotalCompactingKVs", "CurrentCompactedKVs", "RootIndexSizeKB", "TotalStaticIndexSizeKB", "TotalStaticBloomSizeKB", "CompleteSequenceId", "DataLocality", "LastMajorCompactionTs", "StoreCompleteSequenceId", });
-          internal_static_ReplicationLoadSink_descriptor =
+          internal_static_hbase_pb_ReplicationLoadSink_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_ReplicationLoadSink_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicationLoadSink_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicationLoadSink_descriptor,
+              internal_static_hbase_pb_ReplicationLoadSink_descriptor,
               new java.lang.String[] { "AgeOfLastAppliedOp", "TimeStampsOfLastAppliedOp", });
-          internal_static_ReplicationLoadSource_descriptor =
+          internal_static_hbase_pb_ReplicationLoadSource_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_ReplicationLoadSource_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicationLoadSource_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicationLoadSource_descriptor,
+              internal_static_hbase_pb_ReplicationLoadSource_descriptor,
               new java.lang.String[] { "PeerID", "AgeOfLastShippedOp", "SizeOfLogQueue", "TimeStampOfLastShippedOp", "ReplicationLag", });
-          internal_static_ServerLoad_descriptor =
+          internal_static_hbase_pb_ServerLoad_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_ServerLoad_fieldAccessorTable = new
+          internal_static_hbase_pb_ServerLoad_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ServerLoad_descriptor,
+              internal_static_hbase_pb_ServerLoad_descriptor,
               new java.lang.String[] { "NumberOfRequests", "TotalNumberOfRequests", "UsedHeapMB", "MaxHeapMB", "RegionLoads", "Coprocessors", "ReportStartTime", "ReportEndTime", "InfoServerPort", "ReplLoadSource", "ReplLoadSink", });
-          internal_static_LiveServerInfo_descriptor =
+          internal_static_hbase_pb_LiveServerInfo_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_LiveServerInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_LiveServerInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_LiveServerInfo_descriptor,
+              internal_static_hbase_pb_LiveServerInfo_descriptor,
               new java.lang.String[] { "Server", "ServerLoad", });
-          internal_static_ClusterStatus_descriptor =
+          internal_static_hbase_pb_ClusterStatus_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_ClusterStatus_fieldAccessorTable = new
+          internal_static_hbase_pb_ClusterStatus_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ClusterStatus_descriptor,
+              internal_static_hbase_pb_ClusterStatus_descriptor,
               new java.lang.String[] { "HbaseVersion", "LiveServers", "DeadServers", "RegionsInTransition", "ClusterId", "MasterCoprocessors", "Master", "BackupMasters", "BalancerOn", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ComparatorProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ComparatorProtos.java
index ea42a81645d..2afe6a8ea3d 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ComparatorProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ComparatorProtos.java
@@ -37,7 +37,7 @@ public final class ComparatorProtos {
     com.google.protobuf.ByteString getSerializedComparator();
   }
   /**
-   * Protobuf type {@code Comparator}
+   * Protobuf type {@code hbase.pb.Comparator}
    */
   public static final class Comparator extends
       com.google.protobuf.GeneratedMessage
@@ -111,12 +111,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_Comparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_Comparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_Comparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_Comparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder.class);
     }
@@ -365,19 +365,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Comparator}
+     * Protobuf type {@code hbase.pb.Comparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_Comparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_Comparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_Comparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_Comparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder.class);
       }
@@ -415,7 +415,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_Comparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_Comparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getDefaultInstanceForType() {
@@ -607,7 +607,7 @@ public final class ComparatorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Comparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Comparator)
     }
 
     static {
@@ -615,7 +615,7 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Comparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Comparator)
   }
 
   public interface ByteArrayComparableOrBuilder
@@ -632,7 +632,7 @@ public final class ComparatorProtos {
     com.google.protobuf.ByteString getValue();
   }
   /**
-   * Protobuf type {@code ByteArrayComparable}
+   * Protobuf type {@code hbase.pb.ByteArrayComparable}
    */
   public static final class ByteArrayComparable extends
       com.google.protobuf.GeneratedMessage
@@ -701,12 +701,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_ByteArrayComparable_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_ByteArrayComparable_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_ByteArrayComparable_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_ByteArrayComparable_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder.class);
     }
@@ -891,19 +891,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ByteArrayComparable}
+     * Protobuf type {@code hbase.pb.ByteArrayComparable}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_ByteArrayComparable_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_ByteArrayComparable_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_ByteArrayComparable_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_ByteArrayComparable_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder.class);
       }
@@ -939,7 +939,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_ByteArrayComparable_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_ByteArrayComparable_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getDefaultInstanceForType() {
@@ -1044,7 +1044,7 @@ public final class ComparatorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ByteArrayComparable)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ByteArrayComparable)
     }
 
     static {
@@ -1052,28 +1052,28 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ByteArrayComparable)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ByteArrayComparable)
   }
 
   public interface BinaryComparatorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     boolean hasComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder();
   }
   /**
-   * Protobuf type {@code BinaryComparator}
+   * Protobuf type {@code hbase.pb.BinaryComparator}
    */
   public static final class BinaryComparator extends
       com.google.protobuf.GeneratedMessage
@@ -1150,12 +1150,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryComparator.Builder.class);
     }
@@ -1176,23 +1176,23 @@ public final class ComparatorProtos {
     }
 
     private int bitField0_;
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     public static final int COMPARABLE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public boolean hasComparable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
       return comparable_;
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
       return comparable_;
@@ -1350,19 +1350,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BinaryComparator}
+     * Protobuf type {@code hbase.pb.BinaryComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryComparator.Builder.class);
       }
@@ -1403,7 +1403,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryComparator getDefaultInstanceForType() {
@@ -1480,18 +1480,18 @@ public final class ComparatorProtos {
       }
       private int bitField0_;
 
-      // required .ByteArrayComparable comparable = 1;
+      // required .hbase.pb.ByteArrayComparable comparable = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> comparableBuilder_;
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public boolean hasComparable() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
         if (comparableBuilder_ == null) {
@@ -1501,7 +1501,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -1517,7 +1517,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder builderForValue) {
@@ -1531,7 +1531,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder mergeComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -1550,7 +1550,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder clearComparable() {
         if (comparableBuilder_ == null) {
@@ -1563,7 +1563,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder getComparableBuilder() {
         bitField0_ |= 0x00000001;
@@ -1571,7 +1571,7 @@ public final class ComparatorProtos {
         return getComparableFieldBuilder().getBuilder();
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
         if (comparableBuilder_ != null) {
@@ -1581,7 +1581,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> 
@@ -1597,7 +1597,7 @@ public final class ComparatorProtos {
         return comparableBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:BinaryComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BinaryComparator)
     }
 
     static {
@@ -1605,28 +1605,28 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BinaryComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BinaryComparator)
   }
 
   public interface LongComparatorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     boolean hasComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder();
   }
   /**
-   * Protobuf type {@code LongComparator}
+   * Protobuf type {@code hbase.pb.LongComparator}
    */
   public static final class LongComparator extends
       com.google.protobuf.GeneratedMessage
@@ -1703,12 +1703,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_LongComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_LongComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_LongComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_LongComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.LongComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.LongComparator.Builder.class);
     }
@@ -1729,23 +1729,23 @@ public final class ComparatorProtos {
     }
 
     private int bitField0_;
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     public static final int COMPARABLE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public boolean hasComparable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
       return comparable_;
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
       return comparable_;
@@ -1903,19 +1903,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code LongComparator}
+     * Protobuf type {@code hbase.pb.LongComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.LongComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_LongComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_LongComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_LongComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_LongComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.LongComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.LongComparator.Builder.class);
       }
@@ -1956,7 +1956,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_LongComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_LongComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.LongComparator getDefaultInstanceForType() {
@@ -2033,18 +2033,18 @@ public final class ComparatorProtos {
       }
       private int bitField0_;
 
-      // required .ByteArrayComparable comparable = 1;
+      // required .hbase.pb.ByteArrayComparable comparable = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> comparableBuilder_;
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public boolean hasComparable() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
         if (comparableBuilder_ == null) {
@@ -2054,7 +2054,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -2070,7 +2070,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder builderForValue) {
@@ -2084,7 +2084,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder mergeComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -2103,7 +2103,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder clearComparable() {
         if (comparableBuilder_ == null) {
@@ -2116,7 +2116,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder getComparableBuilder() {
         bitField0_ |= 0x00000001;
@@ -2124,7 +2124,7 @@ public final class ComparatorProtos {
         return getComparableFieldBuilder().getBuilder();
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
         if (comparableBuilder_ != null) {
@@ -2134,7 +2134,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> 
@@ -2150,7 +2150,7 @@ public final class ComparatorProtos {
         return comparableBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:LongComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.LongComparator)
     }
 
     static {
@@ -2158,28 +2158,28 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:LongComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.LongComparator)
   }
 
   public interface BinaryPrefixComparatorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     boolean hasComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder();
   }
   /**
-   * Protobuf type {@code BinaryPrefixComparator}
+   * Protobuf type {@code hbase.pb.BinaryPrefixComparator}
    */
   public static final class BinaryPrefixComparator extends
       com.google.protobuf.GeneratedMessage
@@ -2256,12 +2256,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryPrefixComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryPrefixComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryPrefixComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryPrefixComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryPrefixComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryPrefixComparator.Builder.class);
     }
@@ -2282,23 +2282,23 @@ public final class ComparatorProtos {
     }
 
     private int bitField0_;
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     public static final int COMPARABLE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public boolean hasComparable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
       return comparable_;
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
       return comparable_;
@@ -2456,19 +2456,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BinaryPrefixComparator}
+     * Protobuf type {@code hbase.pb.BinaryPrefixComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryPrefixComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryPrefixComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryPrefixComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryPrefixComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryPrefixComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryPrefixComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryPrefixComparator.Builder.class);
       }
@@ -2509,7 +2509,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BinaryPrefixComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BinaryPrefixComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BinaryPrefixComparator getDefaultInstanceForType() {
@@ -2586,18 +2586,18 @@ public final class ComparatorProtos {
       }
       private int bitField0_;
 
-      // required .ByteArrayComparable comparable = 1;
+      // required .hbase.pb.ByteArrayComparable comparable = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> comparableBuilder_;
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public boolean hasComparable() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
         if (comparableBuilder_ == null) {
@@ -2607,7 +2607,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -2623,7 +2623,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder builderForValue) {
@@ -2637,7 +2637,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder mergeComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -2656,7 +2656,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder clearComparable() {
         if (comparableBuilder_ == null) {
@@ -2669,7 +2669,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder getComparableBuilder() {
         bitField0_ |= 0x00000001;
@@ -2677,7 +2677,7 @@ public final class ComparatorProtos {
         return getComparableFieldBuilder().getBuilder();
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
         if (comparableBuilder_ != null) {
@@ -2687,7 +2687,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> 
@@ -2703,7 +2703,7 @@ public final class ComparatorProtos {
         return comparableBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:BinaryPrefixComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BinaryPrefixComparator)
     }
 
     static {
@@ -2711,38 +2711,38 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BinaryPrefixComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BinaryPrefixComparator)
   }
 
   public interface BitComparatorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     boolean hasComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable();
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder();
 
-    // required .BitComparator.BitwiseOp bitwise_op = 2;
+    // required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
     /**
-     * required .BitComparator.BitwiseOp bitwise_op = 2;
+     * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
      */
     boolean hasBitwiseOp();
     /**
-     * required .BitComparator.BitwiseOp bitwise_op = 2;
+     * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp getBitwiseOp();
   }
   /**
-   * Protobuf type {@code BitComparator}
+   * Protobuf type {@code hbase.pb.BitComparator}
    */
   public static final class BitComparator extends
       com.google.protobuf.GeneratedMessage
@@ -2830,12 +2830,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BitComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BitComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BitComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BitComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.Builder.class);
     }
@@ -2856,7 +2856,7 @@ public final class ComparatorProtos {
     }
 
     /**
-     * Protobuf enum {@code BitComparator.BitwiseOp}
+     * Protobuf enum {@code hbase.pb.BitComparator.BitwiseOp}
      */
     public enum BitwiseOp
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -2943,43 +2943,43 @@ public final class ComparatorProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:BitComparator.BitwiseOp)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.BitComparator.BitwiseOp)
     }
 
     private int bitField0_;
-    // required .ByteArrayComparable comparable = 1;
+    // required .hbase.pb.ByteArrayComparable comparable = 1;
     public static final int COMPARABLE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_;
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public boolean hasComparable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
       return comparable_;
     }
     /**
-     * required .ByteArrayComparable comparable = 1;
+     * required .hbase.pb.ByteArrayComparable comparable = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
       return comparable_;
     }
 
-    // required .BitComparator.BitwiseOp bitwise_op = 2;
+    // required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
     public static final int BITWISE_OP_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp bitwiseOp_;
     /**
-     * required .BitComparator.BitwiseOp bitwise_op = 2;
+     * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
      */
     public boolean hasBitwiseOp() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .BitComparator.BitwiseOp bitwise_op = 2;
+     * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp getBitwiseOp() {
       return bitwiseOp_;
@@ -3158,19 +3158,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BitComparator}
+     * Protobuf type {@code hbase.pb.BitComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BitComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BitComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BitComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BitComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.Builder.class);
       }
@@ -3213,7 +3213,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_BitComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_BitComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator getDefaultInstanceForType() {
@@ -3301,18 +3301,18 @@ public final class ComparatorProtos {
       }
       private int bitField0_;
 
-      // required .ByteArrayComparable comparable = 1;
+      // required .hbase.pb.ByteArrayComparable comparable = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable comparable_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> comparableBuilder_;
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public boolean hasComparable() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable getComparable() {
         if (comparableBuilder_ == null) {
@@ -3322,7 +3322,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -3338,7 +3338,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder setComparable(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder builderForValue) {
@@ -3352,7 +3352,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder mergeComparable(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable value) {
         if (comparableBuilder_ == null) {
@@ -3371,7 +3371,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public Builder clearComparable() {
         if (comparableBuilder_ == null) {
@@ -3384,7 +3384,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder getComparableBuilder() {
         bitField0_ |= 0x00000001;
@@ -3392,7 +3392,7 @@ public final class ComparatorProtos {
         return getComparableFieldBuilder().getBuilder();
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder getComparableOrBuilder() {
         if (comparableBuilder_ != null) {
@@ -3402,7 +3402,7 @@ public final class ComparatorProtos {
         }
       }
       /**
-       * required .ByteArrayComparable comparable = 1;
+       * required .hbase.pb.ByteArrayComparable comparable = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparable.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ByteArrayComparableOrBuilder> 
@@ -3418,22 +3418,22 @@ public final class ComparatorProtos {
         return comparableBuilder_;
       }
 
-      // required .BitComparator.BitwiseOp bitwise_op = 2;
+      // required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp bitwiseOp_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp.AND;
       /**
-       * required .BitComparator.BitwiseOp bitwise_op = 2;
+       * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
        */
       public boolean hasBitwiseOp() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .BitComparator.BitwiseOp bitwise_op = 2;
+       * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp getBitwiseOp() {
         return bitwiseOp_;
       }
       /**
-       * required .BitComparator.BitwiseOp bitwise_op = 2;
+       * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
        */
       public Builder setBitwiseOp(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.BitComparator.BitwiseOp value) {
         if (value == null) {
@@ -3445,7 +3445,7 @@ public final class ComparatorProtos {
         return this;
       }
       /**
-       * required .BitComparator.BitwiseOp bitwise_op = 2;
+       * required .hbase.pb.BitComparator.BitwiseOp bitwise_op = 2;
        */
       public Builder clearBitwiseOp() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -3454,7 +3454,7 @@ public final class ComparatorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BitComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BitComparator)
     }
 
     static {
@@ -3462,14 +3462,14 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BitComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BitComparator)
   }
 
   public interface NullComparatorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code NullComparator}
+   * Protobuf type {@code hbase.pb.NullComparator}
    */
   public static final class NullComparator extends
       com.google.protobuf.GeneratedMessage
@@ -3532,12 +3532,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_NullComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_NullComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_NullComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_NullComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.NullComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.NullComparator.Builder.class);
     }
@@ -3688,19 +3688,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code NullComparator}
+     * Protobuf type {@code hbase.pb.NullComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.NullComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_NullComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_NullComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_NullComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_NullComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.NullComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.NullComparator.Builder.class);
       }
@@ -3734,7 +3734,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_NullComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_NullComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.NullComparator getDefaultInstanceForType() {
@@ -3792,7 +3792,7 @@ public final class ComparatorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:NullComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.NullComparator)
     }
 
     static {
@@ -3800,7 +3800,7 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:NullComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.NullComparator)
   }
 
   public interface RegexStringComparatorOrBuilder
@@ -3862,7 +3862,7 @@ public final class ComparatorProtos {
         getEngineBytes();
   }
   /**
-   * Protobuf type {@code RegexStringComparator}
+   * Protobuf type {@code hbase.pb.RegexStringComparator}
    */
   public static final class RegexStringComparator extends
       com.google.protobuf.GeneratedMessage
@@ -3946,12 +3946,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_RegexStringComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_RegexStringComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_RegexStringComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_RegexStringComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.RegexStringComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.RegexStringComparator.Builder.class);
     }
@@ -4328,19 +4328,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegexStringComparator}
+     * Protobuf type {@code hbase.pb.RegexStringComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.RegexStringComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_RegexStringComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_RegexStringComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_RegexStringComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_RegexStringComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.RegexStringComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.RegexStringComparator.Builder.class);
       }
@@ -4382,7 +4382,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_RegexStringComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_RegexStringComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.RegexStringComparator getDefaultInstanceForType() {
@@ -4745,7 +4745,7 @@ public final class ComparatorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegexStringComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegexStringComparator)
     }
 
     static {
@@ -4753,7 +4753,7 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegexStringComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegexStringComparator)
   }
 
   public interface SubstringComparatorOrBuilder
@@ -4775,7 +4775,7 @@ public final class ComparatorProtos {
         getSubstrBytes();
   }
   /**
-   * Protobuf type {@code SubstringComparator}
+   * Protobuf type {@code hbase.pb.SubstringComparator}
    */
   public static final class SubstringComparator extends
       com.google.protobuf.GeneratedMessage
@@ -4844,12 +4844,12 @@ public final class ComparatorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_SubstringComparator_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_SubstringComparator_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_SubstringComparator_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_SubstringComparator_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.SubstringComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.SubstringComparator.Builder.class);
     }
@@ -5065,19 +5065,19 @@ public final class ComparatorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SubstringComparator}
+     * Protobuf type {@code hbase.pb.SubstringComparator}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.SubstringComparatorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_SubstringComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_SubstringComparator_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_SubstringComparator_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_SubstringComparator_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.SubstringComparator.class, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.SubstringComparator.Builder.class);
       }
@@ -5113,7 +5113,7 @@ public final class ComparatorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_SubstringComparator_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.internal_static_hbase_pb_SubstringComparator_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.SubstringComparator getDefaultInstanceForType() {
@@ -5262,7 +5262,7 @@ public final class ComparatorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SubstringComparator)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SubstringComparator)
     }
 
     static {
@@ -5270,54 +5270,54 @@ public final class ComparatorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SubstringComparator)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SubstringComparator)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Comparator_descriptor;
+    internal_static_hbase_pb_Comparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Comparator_fieldAccessorTable;
+      internal_static_hbase_pb_Comparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ByteArrayComparable_descriptor;
+    internal_static_hbase_pb_ByteArrayComparable_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ByteArrayComparable_fieldAccessorTable;
+      internal_static_hbase_pb_ByteArrayComparable_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BinaryComparator_descriptor;
+    internal_static_hbase_pb_BinaryComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BinaryComparator_fieldAccessorTable;
+      internal_static_hbase_pb_BinaryComparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_LongComparator_descriptor;
+    internal_static_hbase_pb_LongComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_LongComparator_fieldAccessorTable;
+      internal_static_hbase_pb_LongComparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BinaryPrefixComparator_descriptor;
+    internal_static_hbase_pb_BinaryPrefixComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BinaryPrefixComparator_fieldAccessorTable;
+      internal_static_hbase_pb_BinaryPrefixComparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BitComparator_descriptor;
+    internal_static_hbase_pb_BitComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BitComparator_fieldAccessorTable;
+      internal_static_hbase_pb_BitComparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_NullComparator_descriptor;
+    internal_static_hbase_pb_NullComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_NullComparator_fieldAccessorTable;
+      internal_static_hbase_pb_NullComparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegexStringComparator_descriptor;
+    internal_static_hbase_pb_RegexStringComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegexStringComparator_fieldAccessorTable;
+      internal_static_hbase_pb_RegexStringComparator_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SubstringComparator_descriptor;
+    internal_static_hbase_pb_SubstringComparator_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SubstringComparator_fieldAccessorTable;
+      internal_static_hbase_pb_SubstringComparator_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -5327,82 +5327,84 @@ public final class ComparatorProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020Comparator.proto\"9\n\nComparator\022\014\n\004name" +
-      "\030\001 \002(\t\022\035\n\025serialized_comparator\030\002 \001(\014\"$\n" +
-      "\023ByteArrayComparable\022\r\n\005value\030\001 \001(\014\"<\n\020B" +
-      "inaryComparator\022(\n\ncomparable\030\001 \002(\0132\024.By" +
-      "teArrayComparable\":\n\016LongComparator\022(\n\nc" +
-      "omparable\030\001 \002(\0132\024.ByteArrayComparable\"B\n" +
-      "\026BinaryPrefixComparator\022(\n\ncomparable\030\001 " +
-      "\002(\0132\024.ByteArrayComparable\"\216\001\n\rBitCompara" +
-      "tor\022(\n\ncomparable\030\001 \002(\0132\024.ByteArrayCompa" +
-      "rable\022,\n\nbitwise_op\030\002 \002(\0162\030.BitComparato",
-      "r.BitwiseOp\"%\n\tBitwiseOp\022\007\n\003AND\020\001\022\006\n\002OR\020" +
-      "\002\022\007\n\003XOR\020\003\"\020\n\016NullComparator\"`\n\025RegexStr" +
-      "ingComparator\022\017\n\007pattern\030\001 \002(\t\022\025\n\rpatter" +
-      "n_flags\030\002 \002(\005\022\017\n\007charset\030\003 \002(\t\022\016\n\006engine" +
-      "\030\004 \001(\t\"%\n\023SubstringComparator\022\016\n\006substr\030" +
-      "\001 \002(\tBF\n*org.apache.hadoop.hbase.protobu" +
-      "f.generatedB\020ComparatorProtosH\001\210\001\001\240\001\001"
+      "\n\020Comparator.proto\022\010hbase.pb\"9\n\nComparat" +
+      "or\022\014\n\004name\030\001 \002(\t\022\035\n\025serialized_comparato" +
+      "r\030\002 \001(\014\"$\n\023ByteArrayComparable\022\r\n\005value\030" +
+      "\001 \001(\014\"E\n\020BinaryComparator\0221\n\ncomparable\030" +
+      "\001 \002(\0132\035.hbase.pb.ByteArrayComparable\"C\n\016" +
+      "LongComparator\0221\n\ncomparable\030\001 \002(\0132\035.hba" +
+      "se.pb.ByteArrayComparable\"K\n\026BinaryPrefi" +
+      "xComparator\0221\n\ncomparable\030\001 \002(\0132\035.hbase." +
+      "pb.ByteArrayComparable\"\240\001\n\rBitComparator" +
+      "\0221\n\ncomparable\030\001 \002(\0132\035.hbase.pb.ByteArra",
+      "yComparable\0225\n\nbitwise_op\030\002 \002(\0162!.hbase." +
+      "pb.BitComparator.BitwiseOp\"%\n\tBitwiseOp\022" +
+      "\007\n\003AND\020\001\022\006\n\002OR\020\002\022\007\n\003XOR\020\003\"\020\n\016NullCompara" +
+      "tor\"`\n\025RegexStringComparator\022\017\n\007pattern\030" +
+      "\001 \002(\t\022\025\n\rpattern_flags\030\002 \002(\005\022\017\n\007charset\030" +
+      "\003 \002(\t\022\016\n\006engine\030\004 \001(\t\"%\n\023SubstringCompar" +
+      "ator\022\016\n\006substr\030\001 \002(\tBF\n*org.apache.hadoo" +
+      "p.hbase.protobuf.generatedB\020ComparatorPr" +
+      "otosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_Comparator_descriptor =
+          internal_static_hbase_pb_Comparator_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_Comparator_fieldAccessorTable = new
+          internal_static_hbase_pb_Comparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Comparator_descriptor,
+              internal_static_hbase_pb_Comparator_descriptor,
               new java.lang.String[] { "Name", "SerializedComparator", });
-          internal_static_ByteArrayComparable_descriptor =
+          internal_static_hbase_pb_ByteArrayComparable_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_ByteArrayComparable_fieldAccessorTable = new
+          internal_static_hbase_pb_ByteArrayComparable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ByteArrayComparable_descriptor,
+              internal_static_hbase_pb_ByteArrayComparable_descriptor,
               new java.lang.String[] { "Value", });
-          internal_static_BinaryComparator_descriptor =
+          internal_static_hbase_pb_BinaryComparator_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_BinaryComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_BinaryComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BinaryComparator_descriptor,
+              internal_static_hbase_pb_BinaryComparator_descriptor,
               new java.lang.String[] { "Comparable", });
-          internal_static_LongComparator_descriptor =
+          internal_static_hbase_pb_LongComparator_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_LongComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_LongComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_LongComparator_descriptor,
+              internal_static_hbase_pb_LongComparator_descriptor,
               new java.lang.String[] { "Comparable", });
-          internal_static_BinaryPrefixComparator_descriptor =
+          internal_static_hbase_pb_BinaryPrefixComparator_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_BinaryPrefixComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_BinaryPrefixComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BinaryPrefixComparator_descriptor,
+              internal_static_hbase_pb_BinaryPrefixComparator_descriptor,
               new java.lang.String[] { "Comparable", });
-          internal_static_BitComparator_descriptor =
+          internal_static_hbase_pb_BitComparator_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_BitComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_BitComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BitComparator_descriptor,
+              internal_static_hbase_pb_BitComparator_descriptor,
               new java.lang.String[] { "Comparable", "BitwiseOp", });
-          internal_static_NullComparator_descriptor =
+          internal_static_hbase_pb_NullComparator_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_NullComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_NullComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_NullComparator_descriptor,
+              internal_static_hbase_pb_NullComparator_descriptor,
               new java.lang.String[] { });
-          internal_static_RegexStringComparator_descriptor =
+          internal_static_hbase_pb_RegexStringComparator_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_RegexStringComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_RegexStringComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegexStringComparator_descriptor,
+              internal_static_hbase_pb_RegexStringComparator_descriptor,
               new java.lang.String[] { "Pattern", "PatternFlags", "Charset", "Engine", });
-          internal_static_SubstringComparator_descriptor =
+          internal_static_hbase_pb_SubstringComparator_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_SubstringComparator_fieldAccessorTable = new
+          internal_static_hbase_pb_SubstringComparator_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SubstringComparator_descriptor,
+              internal_static_hbase_pb_SubstringComparator_descriptor,
               new java.lang.String[] { "Substr", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/EncryptionProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/EncryptionProtos.java
index 02dcc481159..ce8f693725e 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/EncryptionProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/EncryptionProtos.java
@@ -67,7 +67,7 @@ public final class EncryptionProtos {
     com.google.protobuf.ByteString getHash();
   }
   /**
-   * Protobuf type {@code WrappedKey}
+   * Protobuf type {@code hbase.pb.WrappedKey}
    */
   public static final class WrappedKey extends
       com.google.protobuf.GeneratedMessage
@@ -156,12 +156,12 @@ public final class EncryptionProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_WrappedKey_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_hbase_pb_WrappedKey_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_WrappedKey_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_hbase_pb_WrappedKey_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey.class, org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey.Builder.class);
     }
@@ -517,19 +517,19 @@ public final class EncryptionProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WrappedKey}
+     * Protobuf type {@code hbase.pb.WrappedKey}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKeyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_WrappedKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_hbase_pb_WrappedKey_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_WrappedKey_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_hbase_pb_WrappedKey_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey.class, org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey.Builder.class);
       }
@@ -573,7 +573,7 @@ public final class EncryptionProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_WrappedKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.internal_static_hbase_pb_WrappedKey_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.EncryptionProtos.WrappedKey getDefaultInstanceForType() {
@@ -899,7 +899,7 @@ public final class EncryptionProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WrappedKey)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WrappedKey)
     }
 
     static {
@@ -907,14 +907,14 @@ public final class EncryptionProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WrappedKey)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WrappedKey)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WrappedKey_descriptor;
+    internal_static_hbase_pb_WrappedKey_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WrappedKey_fieldAccessorTable;
+      internal_static_hbase_pb_WrappedKey_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -924,22 +924,22 @@ public final class EncryptionProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020Encryption.proto\"W\n\nWrappedKey\022\021\n\talgo" +
-      "rithm\030\001 \002(\t\022\016\n\006length\030\002 \002(\r\022\014\n\004data\030\003 \002(" +
-      "\014\022\n\n\002iv\030\004 \001(\014\022\014\n\004hash\030\005 \001(\014BC\n*org.apach" +
-      "e.hadoop.hbase.protobuf.generatedB\020Encry" +
-      "ptionProtosH\001\240\001\001"
+      "\n\020Encryption.proto\022\010hbase.pb\"W\n\nWrappedK" +
+      "ey\022\021\n\talgorithm\030\001 \002(\t\022\016\n\006length\030\002 \002(\r\022\014\n" +
+      "\004data\030\003 \002(\014\022\n\n\002iv\030\004 \001(\014\022\014\n\004hash\030\005 \001(\014BC\n" +
+      "*org.apache.hadoop.hbase.protobuf.genera" +
+      "tedB\020EncryptionProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_WrappedKey_descriptor =
+          internal_static_hbase_pb_WrappedKey_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_WrappedKey_fieldAccessorTable = new
+          internal_static_hbase_pb_WrappedKey_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WrappedKey_descriptor,
+              internal_static_hbase_pb_WrappedKey_descriptor,
               new java.lang.String[] { "Algorithm", "Length", "Data", "Iv", "Hash", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ErrorHandlingProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ErrorHandlingProtos.java
index 264938b9580..25f3dc34af0 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ErrorHandlingProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ErrorHandlingProtos.java
@@ -67,7 +67,7 @@ public final class ErrorHandlingProtos {
     int getLineNumber();
   }
   /**
-   * Protobuf type {@code StackTraceElementMessage}
+   * Protobuf type {@code hbase.pb.StackTraceElementMessage}
    *
    * 
    **
@@ -157,12 +157,12 @@ public final class ErrorHandlingProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_StackTraceElementMessage_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_StackTraceElementMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_StackTraceElementMessage_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_StackTraceElementMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.class, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder.class);
     }
@@ -527,7 +527,7 @@ public final class ErrorHandlingProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StackTraceElementMessage}
+     * Protobuf type {@code hbase.pb.StackTraceElementMessage}
      *
      * 
      **
@@ -540,12 +540,12 @@ public final class ErrorHandlingProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_StackTraceElementMessage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_StackTraceElementMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_StackTraceElementMessage_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_StackTraceElementMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.class, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder.class);
       }
@@ -587,7 +587,7 @@ public final class ErrorHandlingProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_StackTraceElementMessage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_StackTraceElementMessage_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage getDefaultInstanceForType() {
@@ -938,7 +938,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StackTraceElementMessage)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StackTraceElementMessage)
     }
 
     static {
@@ -946,7 +946,7 @@ public final class ErrorHandlingProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StackTraceElementMessage)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StackTraceElementMessage)
   }
 
   public interface GenericExceptionMessageOrBuilder
@@ -992,33 +992,33 @@ public final class ErrorHandlingProtos {
      */
     com.google.protobuf.ByteString getErrorInfo();
 
-    // repeated .StackTraceElementMessage trace = 4;
+    // repeated .hbase.pb.StackTraceElementMessage trace = 4;
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     java.util.List 
         getTraceList();
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage getTrace(int index);
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     int getTraceCount();
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     java.util.List 
         getTraceOrBuilderList();
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessageOrBuilder getTraceOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code GenericExceptionMessage}
+   * Protobuf type {@code hbase.pb.GenericExceptionMessage}
    *
    * 
    **
@@ -1116,12 +1116,12 @@ public final class ErrorHandlingProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_GenericExceptionMessage_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_GenericExceptionMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_GenericExceptionMessage_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_GenericExceptionMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.class, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.Builder.class);
     }
@@ -1244,36 +1244,36 @@ public final class ErrorHandlingProtos {
       return errorInfo_;
     }
 
-    // repeated .StackTraceElementMessage trace = 4;
+    // repeated .hbase.pb.StackTraceElementMessage trace = 4;
     public static final int TRACE_FIELD_NUMBER = 4;
     private java.util.List trace_;
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     public java.util.List getTraceList() {
       return trace_;
     }
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     public java.util.List 
         getTraceOrBuilderList() {
       return trace_;
     }
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     public int getTraceCount() {
       return trace_.size();
     }
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage getTrace(int index) {
       return trace_.get(index);
     }
     /**
-     * repeated .StackTraceElementMessage trace = 4;
+     * repeated .hbase.pb.StackTraceElementMessage trace = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessageOrBuilder getTraceOrBuilder(
         int index) {
@@ -1476,7 +1476,7 @@ public final class ErrorHandlingProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GenericExceptionMessage}
+     * Protobuf type {@code hbase.pb.GenericExceptionMessage}
      *
      * 
      **
@@ -1491,12 +1491,12 @@ public final class ErrorHandlingProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_GenericExceptionMessage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_GenericExceptionMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_GenericExceptionMessage_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_GenericExceptionMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.class, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.Builder.class);
       }
@@ -1543,7 +1543,7 @@ public final class ErrorHandlingProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_GenericExceptionMessage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_GenericExceptionMessage_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage getDefaultInstanceForType() {
@@ -1849,7 +1849,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
 
-      // repeated .StackTraceElementMessage trace = 4;
+      // repeated .hbase.pb.StackTraceElementMessage trace = 4;
       private java.util.List trace_ =
         java.util.Collections.emptyList();
       private void ensureTraceIsMutable() {
@@ -1863,7 +1863,7 @@ public final class ErrorHandlingProtos {
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessageOrBuilder> traceBuilder_;
 
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public java.util.List getTraceList() {
         if (traceBuilder_ == null) {
@@ -1873,7 +1873,7 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public int getTraceCount() {
         if (traceBuilder_ == null) {
@@ -1883,7 +1883,7 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage getTrace(int index) {
         if (traceBuilder_ == null) {
@@ -1893,7 +1893,7 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder setTrace(
           int index, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage value) {
@@ -1910,7 +1910,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder setTrace(
           int index, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder builderForValue) {
@@ -1924,7 +1924,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder addTrace(org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage value) {
         if (traceBuilder_ == null) {
@@ -1940,7 +1940,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder addTrace(
           int index, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage value) {
@@ -1957,7 +1957,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder addTrace(
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder builderForValue) {
@@ -1971,7 +1971,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder addTrace(
           int index, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder builderForValue) {
@@ -1985,7 +1985,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder addAllTrace(
           java.lang.Iterable values) {
@@ -1999,7 +1999,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder clearTrace() {
         if (traceBuilder_ == null) {
@@ -2012,7 +2012,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public Builder removeTrace(int index) {
         if (traceBuilder_ == null) {
@@ -2025,14 +2025,14 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder getTraceBuilder(
           int index) {
         return getTraceFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessageOrBuilder getTraceOrBuilder(
           int index) {
@@ -2042,7 +2042,7 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public java.util.List 
            getTraceOrBuilderList() {
@@ -2053,14 +2053,14 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder addTraceBuilder() {
         return getTraceFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.getDefaultInstance());
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.Builder addTraceBuilder(
           int index) {
@@ -2068,7 +2068,7 @@ public final class ErrorHandlingProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage.getDefaultInstance());
       }
       /**
-       * repeated .StackTraceElementMessage trace = 4;
+       * repeated .hbase.pb.StackTraceElementMessage trace = 4;
        */
       public java.util.List 
            getTraceBuilderList() {
@@ -2089,7 +2089,7 @@ public final class ErrorHandlingProtos {
         return traceBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GenericExceptionMessage)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GenericExceptionMessage)
     }
 
     static {
@@ -2097,7 +2097,7 @@ public final class ErrorHandlingProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GenericExceptionMessage)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GenericExceptionMessage)
   }
 
   public interface ForeignExceptionMessageOrBuilder
@@ -2118,22 +2118,22 @@ public final class ErrorHandlingProtos {
     com.google.protobuf.ByteString
         getSourceBytes();
 
-    // optional .GenericExceptionMessage generic_exception = 2;
+    // optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
     /**
-     * optional .GenericExceptionMessage generic_exception = 2;
+     * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
      */
     boolean hasGenericException();
     /**
-     * optional .GenericExceptionMessage generic_exception = 2;
+     * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage getGenericException();
     /**
-     * optional .GenericExceptionMessage generic_exception = 2;
+     * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessageOrBuilder getGenericExceptionOrBuilder();
   }
   /**
-   * Protobuf type {@code ForeignExceptionMessage}
+   * Protobuf type {@code hbase.pb.ForeignExceptionMessage}
    *
    * 
    **
@@ -2221,12 +2221,12 @@ public final class ErrorHandlingProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_ForeignExceptionMessage_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_ForeignExceptionMessage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_ForeignExceptionMessage_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_ForeignExceptionMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.class, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder.class);
     }
@@ -2290,23 +2290,23 @@ public final class ErrorHandlingProtos {
       }
     }
 
-    // optional .GenericExceptionMessage generic_exception = 2;
+    // optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
     public static final int GENERIC_EXCEPTION_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage genericException_;
     /**
-     * optional .GenericExceptionMessage generic_exception = 2;
+     * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
      */
     public boolean hasGenericException() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .GenericExceptionMessage generic_exception = 2;
+     * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage getGenericException() {
       return genericException_;
     }
     /**
-     * optional .GenericExceptionMessage generic_exception = 2;
+     * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessageOrBuilder getGenericExceptionOrBuilder() {
       return genericException_;
@@ -2477,7 +2477,7 @@ public final class ErrorHandlingProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ForeignExceptionMessage}
+     * Protobuf type {@code hbase.pb.ForeignExceptionMessage}
      *
      * 
      **
@@ -2490,12 +2490,12 @@ public final class ErrorHandlingProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_ForeignExceptionMessage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_ForeignExceptionMessage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_ForeignExceptionMessage_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_ForeignExceptionMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.class, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder.class);
       }
@@ -2538,7 +2538,7 @@ public final class ErrorHandlingProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_ForeignExceptionMessage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.internal_static_hbase_pb_ForeignExceptionMessage_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage getDefaultInstanceForType() {
@@ -2694,18 +2694,18 @@ public final class ErrorHandlingProtos {
         return this;
       }
 
-      // optional .GenericExceptionMessage generic_exception = 2;
+      // optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage genericException_ = org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.Builder, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessageOrBuilder> genericExceptionBuilder_;
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public boolean hasGenericException() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage getGenericException() {
         if (genericExceptionBuilder_ == null) {
@@ -2715,7 +2715,7 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public Builder setGenericException(org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage value) {
         if (genericExceptionBuilder_ == null) {
@@ -2731,7 +2731,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public Builder setGenericException(
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.Builder builderForValue) {
@@ -2745,7 +2745,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public Builder mergeGenericException(org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage value) {
         if (genericExceptionBuilder_ == null) {
@@ -2764,7 +2764,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public Builder clearGenericException() {
         if (genericExceptionBuilder_ == null) {
@@ -2777,7 +2777,7 @@ public final class ErrorHandlingProtos {
         return this;
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.Builder getGenericExceptionBuilder() {
         bitField0_ |= 0x00000002;
@@ -2785,7 +2785,7 @@ public final class ErrorHandlingProtos {
         return getGenericExceptionFieldBuilder().getBuilder();
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessageOrBuilder getGenericExceptionOrBuilder() {
         if (genericExceptionBuilder_ != null) {
@@ -2795,7 +2795,7 @@ public final class ErrorHandlingProtos {
         }
       }
       /**
-       * optional .GenericExceptionMessage generic_exception = 2;
+       * optional .hbase.pb.GenericExceptionMessage generic_exception = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage.Builder, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessageOrBuilder> 
@@ -2811,7 +2811,7 @@ public final class ErrorHandlingProtos {
         return genericExceptionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ForeignExceptionMessage)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ForeignExceptionMessage)
     }
 
     static {
@@ -2819,24 +2819,24 @@ public final class ErrorHandlingProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ForeignExceptionMessage)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ForeignExceptionMessage)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StackTraceElementMessage_descriptor;
+    internal_static_hbase_pb_StackTraceElementMessage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StackTraceElementMessage_fieldAccessorTable;
+      internal_static_hbase_pb_StackTraceElementMessage_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GenericExceptionMessage_descriptor;
+    internal_static_hbase_pb_GenericExceptionMessage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GenericExceptionMessage_fieldAccessorTable;
+      internal_static_hbase_pb_GenericExceptionMessage_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ForeignExceptionMessage_descriptor;
+    internal_static_hbase_pb_ForeignExceptionMessage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ForeignExceptionMessage_fieldAccessorTable;
+      internal_static_hbase_pb_ForeignExceptionMessage_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2846,40 +2846,41 @@ public final class ErrorHandlingProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023ErrorHandling.proto\"p\n\030StackTraceEleme" +
-      "ntMessage\022\027\n\017declaring_class\030\001 \001(\t\022\023\n\013me" +
-      "thod_name\030\002 \001(\t\022\021\n\tfile_name\030\003 \001(\t\022\023\n\013li" +
-      "ne_number\030\004 \001(\005\"|\n\027GenericExceptionMessa" +
-      "ge\022\022\n\nclass_name\030\001 \001(\t\022\017\n\007message\030\002 \001(\t\022" +
-      "\022\n\nerror_info\030\003 \001(\014\022(\n\005trace\030\004 \003(\0132\031.Sta" +
-      "ckTraceElementMessage\"^\n\027ForeignExceptio" +
-      "nMessage\022\016\n\006source\030\001 \001(\t\0223\n\021generic_exce" +
-      "ption\030\002 \001(\0132\030.GenericExceptionMessageBF\n" +
-      "*org.apache.hadoop.hbase.protobuf.genera",
-      "tedB\023ErrorHandlingProtosH\001\240\001\001"
+      "\n\023ErrorHandling.proto\022\010hbase.pb\"p\n\030Stack" +
+      "TraceElementMessage\022\027\n\017declaring_class\030\001" +
+      " \001(\t\022\023\n\013method_name\030\002 \001(\t\022\021\n\tfile_name\030\003" +
+      " \001(\t\022\023\n\013line_number\030\004 \001(\005\"\205\001\n\027GenericExc" +
+      "eptionMessage\022\022\n\nclass_name\030\001 \001(\t\022\017\n\007mes" +
+      "sage\030\002 \001(\t\022\022\n\nerror_info\030\003 \001(\014\0221\n\005trace\030" +
+      "\004 \003(\0132\".hbase.pb.StackTraceElementMessag" +
+      "e\"g\n\027ForeignExceptionMessage\022\016\n\006source\030\001" +
+      " \001(\t\022<\n\021generic_exception\030\002 \001(\0132!.hbase." +
+      "pb.GenericExceptionMessageBF\n*org.apache",
+      ".hadoop.hbase.protobuf.generatedB\023ErrorH" +
+      "andlingProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_StackTraceElementMessage_descriptor =
+          internal_static_hbase_pb_StackTraceElementMessage_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_StackTraceElementMessage_fieldAccessorTable = new
+          internal_static_hbase_pb_StackTraceElementMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StackTraceElementMessage_descriptor,
+              internal_static_hbase_pb_StackTraceElementMessage_descriptor,
               new java.lang.String[] { "DeclaringClass", "MethodName", "FileName", "LineNumber", });
-          internal_static_GenericExceptionMessage_descriptor =
+          internal_static_hbase_pb_GenericExceptionMessage_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_GenericExceptionMessage_fieldAccessorTable = new
+          internal_static_hbase_pb_GenericExceptionMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GenericExceptionMessage_descriptor,
+              internal_static_hbase_pb_GenericExceptionMessage_descriptor,
               new java.lang.String[] { "ClassName", "Message", "ErrorInfo", "Trace", });
-          internal_static_ForeignExceptionMessage_descriptor =
+          internal_static_hbase_pb_ForeignExceptionMessage_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_ForeignExceptionMessage_fieldAccessorTable = new
+          internal_static_hbase_pb_ForeignExceptionMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ForeignExceptionMessage_descriptor,
+              internal_static_hbase_pb_ForeignExceptionMessage_descriptor,
               new java.lang.String[] { "Source", "GenericException", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FSProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FSProtos.java
index 76226b4cb13..b770f943c58 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FSProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FSProtos.java
@@ -27,7 +27,7 @@ public final class FSProtos {
         getVersionBytes();
   }
   /**
-   * Protobuf type {@code HBaseVersionFileContent}
+   * Protobuf type {@code hbase.pb.HBaseVersionFileContent}
    *
    * 
    **
@@ -101,12 +101,12 @@ public final class FSProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_HBaseVersionFileContent_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_HBaseVersionFileContent_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_HBaseVersionFileContent_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_HBaseVersionFileContent_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.class, org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.Builder.class);
     }
@@ -322,7 +322,7 @@ public final class FSProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code HBaseVersionFileContent}
+     * Protobuf type {@code hbase.pb.HBaseVersionFileContent}
      *
      * 
      **
@@ -334,12 +334,12 @@ public final class FSProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContentOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_HBaseVersionFileContent_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_HBaseVersionFileContent_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_HBaseVersionFileContent_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_HBaseVersionFileContent_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.class, org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent.Builder.class);
       }
@@ -375,7 +375,7 @@ public final class FSProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_HBaseVersionFileContent_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_HBaseVersionFileContent_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FSProtos.HBaseVersionFileContent getDefaultInstanceForType() {
@@ -524,7 +524,7 @@ public final class FSProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:HBaseVersionFileContent)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.HBaseVersionFileContent)
     }
 
     static {
@@ -532,7 +532,7 @@ public final class FSProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:HBaseVersionFileContent)
+    // @@protoc_insertion_point(class_scope:hbase.pb.HBaseVersionFileContent)
   }
 
   public interface ReferenceOrBuilder
@@ -548,18 +548,18 @@ public final class FSProtos {
      */
     com.google.protobuf.ByteString getSplitkey();
 
-    // required .Reference.Range range = 2;
+    // required .hbase.pb.Reference.Range range = 2;
     /**
-     * required .Reference.Range range = 2;
+     * required .hbase.pb.Reference.Range range = 2;
      */
     boolean hasRange();
     /**
-     * required .Reference.Range range = 2;
+     * required .hbase.pb.Reference.Range range = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range getRange();
   }
   /**
-   * Protobuf type {@code Reference}
+   * Protobuf type {@code hbase.pb.Reference}
    *
    * 
    **
@@ -644,12 +644,12 @@ public final class FSProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_Reference_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_Reference_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_Reference_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_Reference_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.class, org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Builder.class);
     }
@@ -670,7 +670,7 @@ public final class FSProtos {
     }
 
     /**
-     * Protobuf enum {@code Reference.Range}
+     * Protobuf enum {@code hbase.pb.Reference.Range}
      */
     public enum Range
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -748,7 +748,7 @@ public final class FSProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:Reference.Range)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.Reference.Range)
     }
 
     private int bitField0_;
@@ -768,17 +768,17 @@ public final class FSProtos {
       return splitkey_;
     }
 
-    // required .Reference.Range range = 2;
+    // required .hbase.pb.Reference.Range range = 2;
     public static final int RANGE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range range_;
     /**
-     * required .Reference.Range range = 2;
+     * required .hbase.pb.Reference.Range range = 2;
      */
     public boolean hasRange() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .Reference.Range range = 2;
+     * required .hbase.pb.Reference.Range range = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range getRange() {
       return range_;
@@ -957,7 +957,7 @@ public final class FSProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Reference}
+     * Protobuf type {@code hbase.pb.Reference}
      *
      * 
      **
@@ -969,12 +969,12 @@ public final class FSProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.FSProtos.ReferenceOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_Reference_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_Reference_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_Reference_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_Reference_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.class, org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Builder.class);
       }
@@ -1012,7 +1012,7 @@ public final class FSProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_Reference_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FSProtos.internal_static_hbase_pb_Reference_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference getDefaultInstanceForType() {
@@ -1132,22 +1132,22 @@ public final class FSProtos {
         return this;
       }
 
-      // required .Reference.Range range = 2;
+      // required .hbase.pb.Reference.Range range = 2;
       private org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range range_ = org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range.TOP;
       /**
-       * required .Reference.Range range = 2;
+       * required .hbase.pb.Reference.Range range = 2;
        */
       public boolean hasRange() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .Reference.Range range = 2;
+       * required .hbase.pb.Reference.Range range = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range getRange() {
         return range_;
       }
       /**
-       * required .Reference.Range range = 2;
+       * required .hbase.pb.Reference.Range range = 2;
        */
       public Builder setRange(org.apache.hadoop.hbase.protobuf.generated.FSProtos.Reference.Range value) {
         if (value == null) {
@@ -1159,7 +1159,7 @@ public final class FSProtos {
         return this;
       }
       /**
-       * required .Reference.Range range = 2;
+       * required .hbase.pb.Reference.Range range = 2;
        */
       public Builder clearRange() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1168,7 +1168,7 @@ public final class FSProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Reference)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Reference)
     }
 
     static {
@@ -1176,19 +1176,19 @@ public final class FSProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Reference)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Reference)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_HBaseVersionFileContent_descriptor;
+    internal_static_hbase_pb_HBaseVersionFileContent_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_HBaseVersionFileContent_fieldAccessorTable;
+      internal_static_hbase_pb_HBaseVersionFileContent_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Reference_descriptor;
+    internal_static_hbase_pb_Reference_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Reference_fieldAccessorTable;
+      internal_static_hbase_pb_Reference_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1198,29 +1198,29 @@ public final class FSProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\010FS.proto\"*\n\027HBaseVersionFileContent\022\017\n" +
-      "\007version\030\001 \002(\t\"\\\n\tReference\022\020\n\010splitkey\030" +
-      "\001 \002(\014\022\037\n\005range\030\002 \002(\0162\020.Reference.Range\"\034" +
-      "\n\005Range\022\007\n\003TOP\020\000\022\n\n\006BOTTOM\020\001B;\n*org.apac" +
-      "he.hadoop.hbase.protobuf.generatedB\010FSPr" +
-      "otosH\001\240\001\001"
+      "\n\010FS.proto\022\010hbase.pb\"*\n\027HBaseVersionFile" +
+      "Content\022\017\n\007version\030\001 \002(\t\"e\n\tReference\022\020\n" +
+      "\010splitkey\030\001 \002(\014\022(\n\005range\030\002 \002(\0162\031.hbase.p" +
+      "b.Reference.Range\"\034\n\005Range\022\007\n\003TOP\020\000\022\n\n\006B" +
+      "OTTOM\020\001B;\n*org.apache.hadoop.hbase.proto" +
+      "buf.generatedB\010FSProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_HBaseVersionFileContent_descriptor =
+          internal_static_hbase_pb_HBaseVersionFileContent_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_HBaseVersionFileContent_fieldAccessorTable = new
+          internal_static_hbase_pb_HBaseVersionFileContent_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_HBaseVersionFileContent_descriptor,
+              internal_static_hbase_pb_HBaseVersionFileContent_descriptor,
               new java.lang.String[] { "Version", });
-          internal_static_Reference_descriptor =
+          internal_static_hbase_pb_Reference_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_Reference_fieldAccessorTable = new
+          internal_static_hbase_pb_Reference_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Reference_descriptor,
+              internal_static_hbase_pb_Reference_descriptor,
               new java.lang.String[] { "Splitkey", "Range", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FilterProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FilterProtos.java
index af1f33d0115..e5583712a9f 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FilterProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FilterProtos.java
@@ -37,7 +37,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getSerializedFilter();
   }
   /**
-   * Protobuf type {@code Filter}
+   * Protobuf type {@code hbase.pb.Filter}
    */
   public static final class Filter extends
       com.google.protobuf.GeneratedMessage
@@ -111,12 +111,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_Filter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_Filter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_Filter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_Filter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder.class);
     }
@@ -365,19 +365,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Filter}
+     * Protobuf type {@code hbase.pb.Filter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_Filter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_Filter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_Filter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_Filter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder.class);
       }
@@ -415,7 +415,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_Filter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_Filter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getDefaultInstanceForType() {
@@ -607,7 +607,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Filter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Filter)
     }
 
     static {
@@ -615,7 +615,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Filter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Filter)
   }
 
   public interface ColumnCountGetFilterOrBuilder
@@ -632,7 +632,7 @@ public final class FilterProtos {
     int getLimit();
   }
   /**
-   * Protobuf type {@code ColumnCountGetFilter}
+   * Protobuf type {@code hbase.pb.ColumnCountGetFilter}
    */
   public static final class ColumnCountGetFilter extends
       com.google.protobuf.GeneratedMessage
@@ -701,12 +701,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnCountGetFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnCountGetFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnCountGetFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnCountGetFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnCountGetFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnCountGetFilter.Builder.class);
     }
@@ -895,19 +895,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ColumnCountGetFilter}
+     * Protobuf type {@code hbase.pb.ColumnCountGetFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnCountGetFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnCountGetFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnCountGetFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnCountGetFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnCountGetFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnCountGetFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnCountGetFilter.Builder.class);
       }
@@ -943,7 +943,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnCountGetFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnCountGetFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnCountGetFilter getDefaultInstanceForType() {
@@ -1049,7 +1049,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ColumnCountGetFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ColumnCountGetFilter)
     }
 
     static {
@@ -1057,7 +1057,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ColumnCountGetFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ColumnCountGetFilter)
   }
 
   public interface ColumnPaginationFilterOrBuilder
@@ -1094,7 +1094,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getColumnOffset();
   }
   /**
-   * Protobuf type {@code ColumnPaginationFilter}
+   * Protobuf type {@code hbase.pb.ColumnPaginationFilter}
    */
   public static final class ColumnPaginationFilter extends
       com.google.protobuf.GeneratedMessage
@@ -1173,12 +1173,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPaginationFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPaginationFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPaginationFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPaginationFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPaginationFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPaginationFilter.Builder.class);
     }
@@ -1433,19 +1433,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ColumnPaginationFilter}
+     * Protobuf type {@code hbase.pb.ColumnPaginationFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPaginationFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPaginationFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPaginationFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPaginationFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPaginationFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPaginationFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPaginationFilter.Builder.class);
       }
@@ -1485,7 +1485,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPaginationFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPaginationFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPaginationFilter getDefaultInstanceForType() {
@@ -1674,7 +1674,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ColumnPaginationFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ColumnPaginationFilter)
     }
 
     static {
@@ -1682,7 +1682,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ColumnPaginationFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ColumnPaginationFilter)
   }
 
   public interface ColumnPrefixFilterOrBuilder
@@ -1699,7 +1699,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getPrefix();
   }
   /**
-   * Protobuf type {@code ColumnPrefixFilter}
+   * Protobuf type {@code hbase.pb.ColumnPrefixFilter}
    */
   public static final class ColumnPrefixFilter extends
       com.google.protobuf.GeneratedMessage
@@ -1768,12 +1768,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPrefixFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPrefixFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPrefixFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPrefixFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPrefixFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPrefixFilter.Builder.class);
     }
@@ -1962,19 +1962,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ColumnPrefixFilter}
+     * Protobuf type {@code hbase.pb.ColumnPrefixFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPrefixFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPrefixFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPrefixFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPrefixFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPrefixFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPrefixFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPrefixFilter.Builder.class);
       }
@@ -2010,7 +2010,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnPrefixFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnPrefixFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnPrefixFilter getDefaultInstanceForType() {
@@ -2119,7 +2119,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ColumnPrefixFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ColumnPrefixFilter)
     }
 
     static {
@@ -2127,7 +2127,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ColumnPrefixFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ColumnPrefixFilter)
   }
 
   public interface ColumnRangeFilterOrBuilder
@@ -2174,7 +2174,7 @@ public final class FilterProtos {
     boolean getMaxColumnInclusive();
   }
   /**
-   * Protobuf type {@code ColumnRangeFilter}
+   * Protobuf type {@code hbase.pb.ColumnRangeFilter}
    */
   public static final class ColumnRangeFilter extends
       com.google.protobuf.GeneratedMessage
@@ -2258,12 +2258,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnRangeFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnRangeFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnRangeFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnRangeFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnRangeFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnRangeFilter.Builder.class);
     }
@@ -2547,19 +2547,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ColumnRangeFilter}
+     * Protobuf type {@code hbase.pb.ColumnRangeFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnRangeFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnRangeFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnRangeFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnRangeFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnRangeFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnRangeFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnRangeFilter.Builder.class);
       }
@@ -2601,7 +2601,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ColumnRangeFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ColumnRangeFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ColumnRangeFilter getDefaultInstanceForType() {
@@ -2829,7 +2829,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ColumnRangeFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ColumnRangeFilter)
     }
 
     static {
@@ -2837,38 +2837,38 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ColumnRangeFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ColumnRangeFilter)
   }
 
   public interface CompareFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .CompareType compare_op = 1;
+    // required .hbase.pb.CompareType compare_op = 1;
     /**
-     * required .CompareType compare_op = 1;
+     * required .hbase.pb.CompareType compare_op = 1;
      */
     boolean hasCompareOp();
     /**
-     * required .CompareType compare_op = 1;
+     * required .hbase.pb.CompareType compare_op = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareOp();
 
-    // optional .Comparator comparator = 2;
+    // optional .hbase.pb.Comparator comparator = 2;
     /**
-     * optional .Comparator comparator = 2;
+     * optional .hbase.pb.Comparator comparator = 2;
      */
     boolean hasComparator();
     /**
-     * optional .Comparator comparator = 2;
+     * optional .hbase.pb.Comparator comparator = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator();
     /**
-     * optional .Comparator comparator = 2;
+     * optional .hbase.pb.Comparator comparator = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder();
   }
   /**
-   * Protobuf type {@code CompareFilter}
+   * Protobuf type {@code hbase.pb.CompareFilter}
    */
   public static final class CompareFilter extends
       com.google.protobuf.GeneratedMessage
@@ -2956,12 +2956,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_CompareFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_CompareFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_CompareFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_CompareFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder.class);
     }
@@ -2982,39 +2982,39 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .CompareType compare_op = 1;
+    // required .hbase.pb.CompareType compare_op = 1;
     public static final int COMPARE_OP_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType compareOp_;
     /**
-     * required .CompareType compare_op = 1;
+     * required .hbase.pb.CompareType compare_op = 1;
      */
     public boolean hasCompareOp() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .CompareType compare_op = 1;
+     * required .hbase.pb.CompareType compare_op = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareOp() {
       return compareOp_;
     }
 
-    // optional .Comparator comparator = 2;
+    // optional .hbase.pb.Comparator comparator = 2;
     public static final int COMPARATOR_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator comparator_;
     /**
-     * optional .Comparator comparator = 2;
+     * optional .hbase.pb.Comparator comparator = 2;
      */
     public boolean hasComparator() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .Comparator comparator = 2;
+     * optional .hbase.pb.Comparator comparator = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator() {
       return comparator_;
     }
     /**
-     * optional .Comparator comparator = 2;
+     * optional .hbase.pb.Comparator comparator = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder() {
       return comparator_;
@@ -3195,19 +3195,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CompareFilter}
+     * Protobuf type {@code hbase.pb.CompareFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_CompareFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_CompareFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_CompareFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_CompareFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder.class);
       }
@@ -3250,7 +3250,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_CompareFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_CompareFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getDefaultInstanceForType() {
@@ -3340,22 +3340,22 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .CompareType compare_op = 1;
+      // required .hbase.pb.CompareType compare_op = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType compareOp_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType.LESS;
       /**
-       * required .CompareType compare_op = 1;
+       * required .hbase.pb.CompareType compare_op = 1;
        */
       public boolean hasCompareOp() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .CompareType compare_op = 1;
+       * required .hbase.pb.CompareType compare_op = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareOp() {
         return compareOp_;
       }
       /**
-       * required .CompareType compare_op = 1;
+       * required .hbase.pb.CompareType compare_op = 1;
        */
       public Builder setCompareOp(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType value) {
         if (value == null) {
@@ -3367,7 +3367,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareType compare_op = 1;
+       * required .hbase.pb.CompareType compare_op = 1;
        */
       public Builder clearCompareOp() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -3376,18 +3376,18 @@ public final class FilterProtos {
         return this;
       }
 
-      // optional .Comparator comparator = 2;
+      // optional .hbase.pb.Comparator comparator = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator comparator_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder> comparatorBuilder_;
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public boolean hasComparator() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator() {
         if (comparatorBuilder_ == null) {
@@ -3397,7 +3397,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public Builder setComparator(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator value) {
         if (comparatorBuilder_ == null) {
@@ -3413,7 +3413,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public Builder setComparator(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder builderForValue) {
@@ -3427,7 +3427,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public Builder mergeComparator(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator value) {
         if (comparatorBuilder_ == null) {
@@ -3446,7 +3446,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public Builder clearComparator() {
         if (comparatorBuilder_ == null) {
@@ -3459,7 +3459,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder getComparatorBuilder() {
         bitField0_ |= 0x00000002;
@@ -3467,7 +3467,7 @@ public final class FilterProtos {
         return getComparatorFieldBuilder().getBuilder();
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder() {
         if (comparatorBuilder_ != null) {
@@ -3477,7 +3477,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * optional .Comparator comparator = 2;
+       * optional .hbase.pb.Comparator comparator = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder> 
@@ -3493,7 +3493,7 @@ public final class FilterProtos {
         return comparatorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CompareFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CompareFilter)
     }
 
     static {
@@ -3501,23 +3501,23 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CompareFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CompareFilter)
   }
 
   public interface DependentColumnFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     boolean hasCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder();
 
@@ -3552,7 +3552,7 @@ public final class FilterProtos {
     boolean getDropDependentColumn();
   }
   /**
-   * Protobuf type {@code DependentColumnFilter}
+   * Protobuf type {@code hbase.pb.DependentColumnFilter}
    */
   public static final class DependentColumnFilter extends
       com.google.protobuf.GeneratedMessage
@@ -3644,12 +3644,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_DependentColumnFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_DependentColumnFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_DependentColumnFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_DependentColumnFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.DependentColumnFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.DependentColumnFilter.Builder.class);
     }
@@ -3670,23 +3670,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     public static final int COMPARE_FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public boolean hasCompareFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
       return compareFilter_;
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
       return compareFilter_;
@@ -3947,19 +3947,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DependentColumnFilter}
+     * Protobuf type {@code hbase.pb.DependentColumnFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.DependentColumnFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_DependentColumnFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_DependentColumnFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_DependentColumnFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_DependentColumnFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.DependentColumnFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.DependentColumnFilter.Builder.class);
       }
@@ -4006,7 +4006,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_DependentColumnFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_DependentColumnFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.DependentColumnFilter getDefaultInstanceForType() {
@@ -4108,18 +4108,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .CompareFilter compare_filter = 1;
+      // required .hbase.pb.CompareFilter compare_filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> compareFilterBuilder_;
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public boolean hasCompareFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -4129,7 +4129,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -4145,7 +4145,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder builderForValue) {
@@ -4159,7 +4159,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder mergeCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -4178,7 +4178,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder clearCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -4191,7 +4191,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder getCompareFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -4199,7 +4199,7 @@ public final class FilterProtos {
         return getCompareFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
         if (compareFilterBuilder_ != null) {
@@ -4209,7 +4209,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> 
@@ -4330,7 +4330,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DependentColumnFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DependentColumnFilter)
     }
 
     static {
@@ -4338,28 +4338,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DependentColumnFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DependentColumnFilter)
   }
 
   public interface FamilyFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     boolean hasCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code FamilyFilter}
+   * Protobuf type {@code hbase.pb.FamilyFilter}
    */
   public static final class FamilyFilter extends
       com.google.protobuf.GeneratedMessage
@@ -4436,12 +4436,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FamilyFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FamilyFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FamilyFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FamilyFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FamilyFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FamilyFilter.Builder.class);
     }
@@ -4462,23 +4462,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     public static final int COMPARE_FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public boolean hasCompareFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
       return compareFilter_;
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
       return compareFilter_;
@@ -4640,19 +4640,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FamilyFilter}
+     * Protobuf type {@code hbase.pb.FamilyFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FamilyFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FamilyFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FamilyFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FamilyFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FamilyFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FamilyFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FamilyFilter.Builder.class);
       }
@@ -4693,7 +4693,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FamilyFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FamilyFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FamilyFilter getDefaultInstanceForType() {
@@ -4774,18 +4774,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .CompareFilter compare_filter = 1;
+      // required .hbase.pb.CompareFilter compare_filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> compareFilterBuilder_;
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public boolean hasCompareFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -4795,7 +4795,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -4811,7 +4811,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder builderForValue) {
@@ -4825,7 +4825,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder mergeCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -4844,7 +4844,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder clearCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -4857,7 +4857,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder getCompareFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -4865,7 +4865,7 @@ public final class FilterProtos {
         return getCompareFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
         if (compareFilterBuilder_ != null) {
@@ -4875,7 +4875,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> 
@@ -4891,7 +4891,7 @@ public final class FilterProtos {
         return compareFilterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:FamilyFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FamilyFilter)
     }
 
     static {
@@ -4899,49 +4899,49 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FamilyFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FamilyFilter)
   }
 
   public interface FilterListOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .FilterList.Operator operator = 1;
+    // required .hbase.pb.FilterList.Operator operator = 1;
     /**
-     * required .FilterList.Operator operator = 1;
+     * required .hbase.pb.FilterList.Operator operator = 1;
      */
     boolean hasOperator();
     /**
-     * required .FilterList.Operator operator = 1;
+     * required .hbase.pb.FilterList.Operator operator = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator getOperator();
 
-    // repeated .Filter filters = 2;
+    // repeated .hbase.pb.Filter filters = 2;
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     java.util.List 
         getFiltersList();
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilters(int index);
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     int getFiltersCount();
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     java.util.List 
         getFiltersOrBuilderList();
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFiltersOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code FilterList}
+   * Protobuf type {@code hbase.pb.FilterList}
    */
   public static final class FilterList extends
       com.google.protobuf.GeneratedMessage
@@ -5027,12 +5027,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterList_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterList_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterList_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterList_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Builder.class);
     }
@@ -5053,7 +5053,7 @@ public final class FilterProtos {
     }
 
     /**
-     * Protobuf enum {@code FilterList.Operator}
+     * Protobuf enum {@code hbase.pb.FilterList.Operator}
      */
     public enum Operator
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -5131,56 +5131,56 @@ public final class FilterProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:FilterList.Operator)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.FilterList.Operator)
     }
 
     private int bitField0_;
-    // required .FilterList.Operator operator = 1;
+    // required .hbase.pb.FilterList.Operator operator = 1;
     public static final int OPERATOR_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator operator_;
     /**
-     * required .FilterList.Operator operator = 1;
+     * required .hbase.pb.FilterList.Operator operator = 1;
      */
     public boolean hasOperator() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .FilterList.Operator operator = 1;
+     * required .hbase.pb.FilterList.Operator operator = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator getOperator() {
       return operator_;
     }
 
-    // repeated .Filter filters = 2;
+    // repeated .hbase.pb.Filter filters = 2;
     public static final int FILTERS_FIELD_NUMBER = 2;
     private java.util.List filters_;
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     public java.util.List getFiltersList() {
       return filters_;
     }
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     public java.util.List 
         getFiltersOrBuilderList() {
       return filters_;
     }
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     public int getFiltersCount() {
       return filters_.size();
     }
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilters(int index) {
       return filters_.get(index);
     }
     /**
-     * repeated .Filter filters = 2;
+     * repeated .hbase.pb.Filter filters = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFiltersOrBuilder(
         int index) {
@@ -5359,19 +5359,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FilterList}
+     * Protobuf type {@code hbase.pb.FilterList}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterListOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterList_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterList_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterList_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterList_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Builder.class);
       }
@@ -5414,7 +5414,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterList_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterList_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList getDefaultInstanceForType() {
@@ -5528,22 +5528,22 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .FilterList.Operator operator = 1;
+      // required .hbase.pb.FilterList.Operator operator = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator operator_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator.MUST_PASS_ALL;
       /**
-       * required .FilterList.Operator operator = 1;
+       * required .hbase.pb.FilterList.Operator operator = 1;
        */
       public boolean hasOperator() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .FilterList.Operator operator = 1;
+       * required .hbase.pb.FilterList.Operator operator = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator getOperator() {
         return operator_;
       }
       /**
-       * required .FilterList.Operator operator = 1;
+       * required .hbase.pb.FilterList.Operator operator = 1;
        */
       public Builder setOperator(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterList.Operator value) {
         if (value == null) {
@@ -5555,7 +5555,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .FilterList.Operator operator = 1;
+       * required .hbase.pb.FilterList.Operator operator = 1;
        */
       public Builder clearOperator() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -5564,7 +5564,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // repeated .Filter filters = 2;
+      // repeated .hbase.pb.Filter filters = 2;
       private java.util.List filters_ =
         java.util.Collections.emptyList();
       private void ensureFiltersIsMutable() {
@@ -5578,7 +5578,7 @@ public final class FilterProtos {
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> filtersBuilder_;
 
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public java.util.List getFiltersList() {
         if (filtersBuilder_ == null) {
@@ -5588,7 +5588,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public int getFiltersCount() {
         if (filtersBuilder_ == null) {
@@ -5598,7 +5598,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilters(int index) {
         if (filtersBuilder_ == null) {
@@ -5608,7 +5608,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder setFilters(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
@@ -5625,7 +5625,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder setFilters(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -5639,7 +5639,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder addFilters(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filtersBuilder_ == null) {
@@ -5655,7 +5655,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder addFilters(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
@@ -5672,7 +5672,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder addFilters(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -5686,7 +5686,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder addFilters(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -5700,7 +5700,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder addAllFilters(
           java.lang.Iterable values) {
@@ -5714,7 +5714,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder clearFilters() {
         if (filtersBuilder_ == null) {
@@ -5727,7 +5727,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public Builder removeFilters(int index) {
         if (filtersBuilder_ == null) {
@@ -5740,14 +5740,14 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder getFiltersBuilder(
           int index) {
         return getFiltersFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFiltersOrBuilder(
           int index) {
@@ -5757,7 +5757,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public java.util.List 
            getFiltersOrBuilderList() {
@@ -5768,14 +5768,14 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder addFiltersBuilder() {
         return getFiltersFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance());
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder addFiltersBuilder(
           int index) {
@@ -5783,7 +5783,7 @@ public final class FilterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance());
       }
       /**
-       * repeated .Filter filters = 2;
+       * repeated .hbase.pb.Filter filters = 2;
        */
       public java.util.List 
            getFiltersBuilderList() {
@@ -5804,7 +5804,7 @@ public final class FilterProtos {
         return filtersBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:FilterList)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FilterList)
     }
 
     static {
@@ -5812,28 +5812,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FilterList)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FilterList)
   }
 
   public interface FilterWrapperOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .Filter filter = 1;
+    // required .hbase.pb.Filter filter = 1;
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     boolean hasFilter();
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter();
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code FilterWrapper}
+   * Protobuf type {@code hbase.pb.FilterWrapper}
    */
   public static final class FilterWrapper extends
       com.google.protobuf.GeneratedMessage
@@ -5910,12 +5910,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterWrapper_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterWrapper_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterWrapper_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterWrapper_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterWrapper.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterWrapper.Builder.class);
     }
@@ -5936,23 +5936,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .Filter filter = 1;
+    // required .hbase.pb.Filter filter = 1;
     public static final int FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_;
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public boolean hasFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
       return filter_;
     }
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
       return filter_;
@@ -6114,19 +6114,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FilterWrapper}
+     * Protobuf type {@code hbase.pb.FilterWrapper}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterWrapperOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterWrapper_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterWrapper_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterWrapper_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterWrapper_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterWrapper.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterWrapper.Builder.class);
       }
@@ -6167,7 +6167,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterWrapper_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterWrapper_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterWrapper getDefaultInstanceForType() {
@@ -6248,18 +6248,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .Filter filter = 1;
+      // required .hbase.pb.Filter filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> filterBuilder_;
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public boolean hasFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
         if (filterBuilder_ == null) {
@@ -6269,7 +6269,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder setFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -6285,7 +6285,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder setFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -6299,7 +6299,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder mergeFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -6318,7 +6318,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder clearFilter() {
         if (filterBuilder_ == null) {
@@ -6331,7 +6331,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder getFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -6339,7 +6339,7 @@ public final class FilterProtos {
         return getFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
         if (filterBuilder_ != null) {
@@ -6349,7 +6349,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> 
@@ -6365,7 +6365,7 @@ public final class FilterProtos {
         return filterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:FilterWrapper)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FilterWrapper)
     }
 
     static {
@@ -6373,14 +6373,14 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FilterWrapper)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FilterWrapper)
   }
 
   public interface FirstKeyOnlyFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code FirstKeyOnlyFilter}
+   * Protobuf type {@code hbase.pb.FirstKeyOnlyFilter}
    */
   public static final class FirstKeyOnlyFilter extends
       com.google.protobuf.GeneratedMessage
@@ -6443,12 +6443,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyOnlyFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyOnlyFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyOnlyFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyOnlyFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyOnlyFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyOnlyFilter.Builder.class);
     }
@@ -6599,19 +6599,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FirstKeyOnlyFilter}
+     * Protobuf type {@code hbase.pb.FirstKeyOnlyFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyOnlyFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyOnlyFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyOnlyFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyOnlyFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyOnlyFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyOnlyFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyOnlyFilter.Builder.class);
       }
@@ -6645,7 +6645,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyOnlyFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyOnlyFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyOnlyFilter getDefaultInstanceForType() {
@@ -6703,7 +6703,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FirstKeyOnlyFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FirstKeyOnlyFilter)
     }
 
     static {
@@ -6711,7 +6711,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FirstKeyOnlyFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FirstKeyOnlyFilter)
   }
 
   public interface FirstKeyValueMatchingQualifiersFilterOrBuilder
@@ -6732,7 +6732,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getQualifiers(int index);
   }
   /**
-   * Protobuf type {@code FirstKeyValueMatchingQualifiersFilter}
+   * Protobuf type {@code hbase.pb.FirstKeyValueMatchingQualifiersFilter}
    */
   public static final class FirstKeyValueMatchingQualifiersFilter extends
       com.google.protobuf.GeneratedMessage
@@ -6807,12 +6807,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyValueMatchingQualifiersFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyValueMatchingQualifiersFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyValueMatchingQualifiersFilter.Builder.class);
     }
@@ -7005,19 +7005,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FirstKeyValueMatchingQualifiersFilter}
+     * Protobuf type {@code hbase.pb.FirstKeyValueMatchingQualifiersFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyValueMatchingQualifiersFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyValueMatchingQualifiersFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyValueMatchingQualifiersFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyValueMatchingQualifiersFilter.Builder.class);
       }
@@ -7053,7 +7053,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FirstKeyValueMatchingQualifiersFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FirstKeyValueMatchingQualifiersFilter getDefaultInstanceForType() {
@@ -7200,7 +7200,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FirstKeyValueMatchingQualifiersFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FirstKeyValueMatchingQualifiersFilter)
     }
 
     static {
@@ -7208,39 +7208,39 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FirstKeyValueMatchingQualifiersFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FirstKeyValueMatchingQualifiersFilter)
   }
 
   public interface FuzzyRowFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .BytesBytesPair fuzzy_keys_data = 1;
+    // repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     java.util.List 
         getFuzzyKeysDataList();
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getFuzzyKeysData(int index);
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     int getFuzzyKeysDataCount();
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     java.util.List 
         getFuzzyKeysDataOrBuilderList();
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getFuzzyKeysDataOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code FuzzyRowFilter}
+   * Protobuf type {@code hbase.pb.FuzzyRowFilter}
    */
   public static final class FuzzyRowFilter extends
       com.google.protobuf.GeneratedMessage
@@ -7315,12 +7315,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FuzzyRowFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FuzzyRowFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FuzzyRowFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FuzzyRowFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FuzzyRowFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FuzzyRowFilter.Builder.class);
     }
@@ -7340,36 +7340,36 @@ public final class FilterProtos {
       return PARSER;
     }
 
-    // repeated .BytesBytesPair fuzzy_keys_data = 1;
+    // repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
     public static final int FUZZY_KEYS_DATA_FIELD_NUMBER = 1;
     private java.util.List fuzzyKeysData_;
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     public java.util.List getFuzzyKeysDataList() {
       return fuzzyKeysData_;
     }
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     public java.util.List 
         getFuzzyKeysDataOrBuilderList() {
       return fuzzyKeysData_;
     }
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     public int getFuzzyKeysDataCount() {
       return fuzzyKeysData_.size();
     }
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getFuzzyKeysData(int index) {
       return fuzzyKeysData_.get(index);
     }
     /**
-     * repeated .BytesBytesPair fuzzy_keys_data = 1;
+     * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getFuzzyKeysDataOrBuilder(
         int index) {
@@ -7527,19 +7527,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FuzzyRowFilter}
+     * Protobuf type {@code hbase.pb.FuzzyRowFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FuzzyRowFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FuzzyRowFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FuzzyRowFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FuzzyRowFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FuzzyRowFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FuzzyRowFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FuzzyRowFilter.Builder.class);
       }
@@ -7580,7 +7580,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FuzzyRowFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FuzzyRowFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FuzzyRowFilter getDefaultInstanceForType() {
@@ -7681,7 +7681,7 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // repeated .BytesBytesPair fuzzy_keys_data = 1;
+      // repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
       private java.util.List fuzzyKeysData_ =
         java.util.Collections.emptyList();
       private void ensureFuzzyKeysDataIsMutable() {
@@ -7695,7 +7695,7 @@ public final class FilterProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder> fuzzyKeysDataBuilder_;
 
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public java.util.List getFuzzyKeysDataList() {
         if (fuzzyKeysDataBuilder_ == null) {
@@ -7705,7 +7705,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public int getFuzzyKeysDataCount() {
         if (fuzzyKeysDataBuilder_ == null) {
@@ -7715,7 +7715,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getFuzzyKeysData(int index) {
         if (fuzzyKeysDataBuilder_ == null) {
@@ -7725,7 +7725,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder setFuzzyKeysData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -7742,7 +7742,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder setFuzzyKeysData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -7756,7 +7756,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder addFuzzyKeysData(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
         if (fuzzyKeysDataBuilder_ == null) {
@@ -7772,7 +7772,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder addFuzzyKeysData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -7789,7 +7789,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder addFuzzyKeysData(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -7803,7 +7803,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder addFuzzyKeysData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -7817,7 +7817,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder addAllFuzzyKeysData(
           java.lang.Iterable values) {
@@ -7831,7 +7831,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder clearFuzzyKeysData() {
         if (fuzzyKeysDataBuilder_ == null) {
@@ -7844,7 +7844,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public Builder removeFuzzyKeysData(int index) {
         if (fuzzyKeysDataBuilder_ == null) {
@@ -7857,14 +7857,14 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder getFuzzyKeysDataBuilder(
           int index) {
         return getFuzzyKeysDataFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getFuzzyKeysDataOrBuilder(
           int index) {
@@ -7874,7 +7874,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public java.util.List 
            getFuzzyKeysDataOrBuilderList() {
@@ -7885,14 +7885,14 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addFuzzyKeysDataBuilder() {
         return getFuzzyKeysDataFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addFuzzyKeysDataBuilder(
           int index) {
@@ -7900,7 +7900,7 @@ public final class FilterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair fuzzy_keys_data = 1;
+       * repeated .hbase.pb.BytesBytesPair fuzzy_keys_data = 1;
        */
       public java.util.List 
            getFuzzyKeysDataBuilderList() {
@@ -7921,7 +7921,7 @@ public final class FilterProtos {
         return fuzzyKeysDataBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:FuzzyRowFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FuzzyRowFilter)
     }
 
     static {
@@ -7929,7 +7929,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FuzzyRowFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FuzzyRowFilter)
   }
 
   public interface InclusiveStopFilterOrBuilder
@@ -7946,7 +7946,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getStopRowKey();
   }
   /**
-   * Protobuf type {@code InclusiveStopFilter}
+   * Protobuf type {@code hbase.pb.InclusiveStopFilter}
    */
   public static final class InclusiveStopFilter extends
       com.google.protobuf.GeneratedMessage
@@ -8015,12 +8015,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_InclusiveStopFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_InclusiveStopFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_InclusiveStopFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_InclusiveStopFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.InclusiveStopFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.InclusiveStopFilter.Builder.class);
     }
@@ -8205,19 +8205,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code InclusiveStopFilter}
+     * Protobuf type {@code hbase.pb.InclusiveStopFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.InclusiveStopFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_InclusiveStopFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_InclusiveStopFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_InclusiveStopFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_InclusiveStopFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.InclusiveStopFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.InclusiveStopFilter.Builder.class);
       }
@@ -8253,7 +8253,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_InclusiveStopFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_InclusiveStopFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.InclusiveStopFilter getDefaultInstanceForType() {
@@ -8358,7 +8358,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:InclusiveStopFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.InclusiveStopFilter)
     }
 
     static {
@@ -8366,7 +8366,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:InclusiveStopFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.InclusiveStopFilter)
   }
 
   public interface KeyOnlyFilterOrBuilder
@@ -8383,7 +8383,7 @@ public final class FilterProtos {
     boolean getLenAsVal();
   }
   /**
-   * Protobuf type {@code KeyOnlyFilter}
+   * Protobuf type {@code hbase.pb.KeyOnlyFilter}
    */
   public static final class KeyOnlyFilter extends
       com.google.protobuf.GeneratedMessage
@@ -8452,12 +8452,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_KeyOnlyFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_KeyOnlyFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_KeyOnlyFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_KeyOnlyFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.KeyOnlyFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.KeyOnlyFilter.Builder.class);
     }
@@ -8646,19 +8646,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code KeyOnlyFilter}
+     * Protobuf type {@code hbase.pb.KeyOnlyFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.KeyOnlyFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_KeyOnlyFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_KeyOnlyFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_KeyOnlyFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_KeyOnlyFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.KeyOnlyFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.KeyOnlyFilter.Builder.class);
       }
@@ -8694,7 +8694,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_KeyOnlyFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_KeyOnlyFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.KeyOnlyFilter getDefaultInstanceForType() {
@@ -8800,7 +8800,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:KeyOnlyFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.KeyOnlyFilter)
     }
 
     static {
@@ -8808,7 +8808,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:KeyOnlyFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.KeyOnlyFilter)
   }
 
   public interface MultipleColumnPrefixFilterOrBuilder
@@ -8829,7 +8829,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getSortedPrefixes(int index);
   }
   /**
-   * Protobuf type {@code MultipleColumnPrefixFilter}
+   * Protobuf type {@code hbase.pb.MultipleColumnPrefixFilter}
    */
   public static final class MultipleColumnPrefixFilter extends
       com.google.protobuf.GeneratedMessage
@@ -8904,12 +8904,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultipleColumnPrefixFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultipleColumnPrefixFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultipleColumnPrefixFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultipleColumnPrefixFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultipleColumnPrefixFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultipleColumnPrefixFilter.Builder.class);
     }
@@ -9102,19 +9102,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultipleColumnPrefixFilter}
+     * Protobuf type {@code hbase.pb.MultipleColumnPrefixFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultipleColumnPrefixFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultipleColumnPrefixFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultipleColumnPrefixFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultipleColumnPrefixFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultipleColumnPrefixFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultipleColumnPrefixFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultipleColumnPrefixFilter.Builder.class);
       }
@@ -9150,7 +9150,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultipleColumnPrefixFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultipleColumnPrefixFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultipleColumnPrefixFilter getDefaultInstanceForType() {
@@ -9297,7 +9297,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultipleColumnPrefixFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultipleColumnPrefixFilter)
     }
 
     static {
@@ -9305,7 +9305,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultipleColumnPrefixFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultipleColumnPrefixFilter)
   }
 
   public interface PageFilterOrBuilder
@@ -9322,7 +9322,7 @@ public final class FilterProtos {
     long getPageSize();
   }
   /**
-   * Protobuf type {@code PageFilter}
+   * Protobuf type {@code hbase.pb.PageFilter}
    */
   public static final class PageFilter extends
       com.google.protobuf.GeneratedMessage
@@ -9391,12 +9391,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PageFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PageFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PageFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PageFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PageFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PageFilter.Builder.class);
     }
@@ -9585,19 +9585,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code PageFilter}
+     * Protobuf type {@code hbase.pb.PageFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PageFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PageFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PageFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PageFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PageFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PageFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PageFilter.Builder.class);
       }
@@ -9633,7 +9633,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PageFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PageFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PageFilter getDefaultInstanceForType() {
@@ -9739,7 +9739,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:PageFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.PageFilter)
     }
 
     static {
@@ -9747,7 +9747,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:PageFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.PageFilter)
   }
 
   public interface PrefixFilterOrBuilder
@@ -9764,7 +9764,7 @@ public final class FilterProtos {
     com.google.protobuf.ByteString getPrefix();
   }
   /**
-   * Protobuf type {@code PrefixFilter}
+   * Protobuf type {@code hbase.pb.PrefixFilter}
    */
   public static final class PrefixFilter extends
       com.google.protobuf.GeneratedMessage
@@ -9833,12 +9833,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PrefixFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PrefixFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PrefixFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PrefixFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PrefixFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PrefixFilter.Builder.class);
     }
@@ -10023,19 +10023,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code PrefixFilter}
+     * Protobuf type {@code hbase.pb.PrefixFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PrefixFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PrefixFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PrefixFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PrefixFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PrefixFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PrefixFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PrefixFilter.Builder.class);
       }
@@ -10071,7 +10071,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_PrefixFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_PrefixFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.PrefixFilter getDefaultInstanceForType() {
@@ -10176,7 +10176,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:PrefixFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.PrefixFilter)
     }
 
     static {
@@ -10184,28 +10184,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:PrefixFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.PrefixFilter)
   }
 
   public interface QualifierFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     boolean hasCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code QualifierFilter}
+   * Protobuf type {@code hbase.pb.QualifierFilter}
    */
   public static final class QualifierFilter extends
       com.google.protobuf.GeneratedMessage
@@ -10282,12 +10282,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_QualifierFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_QualifierFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_QualifierFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_QualifierFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.QualifierFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.QualifierFilter.Builder.class);
     }
@@ -10308,23 +10308,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     public static final int COMPARE_FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public boolean hasCompareFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
       return compareFilter_;
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
       return compareFilter_;
@@ -10486,19 +10486,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code QualifierFilter}
+     * Protobuf type {@code hbase.pb.QualifierFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.QualifierFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_QualifierFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_QualifierFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_QualifierFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_QualifierFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.QualifierFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.QualifierFilter.Builder.class);
       }
@@ -10539,7 +10539,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_QualifierFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_QualifierFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.QualifierFilter getDefaultInstanceForType() {
@@ -10620,18 +10620,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .CompareFilter compare_filter = 1;
+      // required .hbase.pb.CompareFilter compare_filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> compareFilterBuilder_;
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public boolean hasCompareFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -10641,7 +10641,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -10657,7 +10657,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder builderForValue) {
@@ -10671,7 +10671,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder mergeCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -10690,7 +10690,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder clearCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -10703,7 +10703,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder getCompareFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -10711,7 +10711,7 @@ public final class FilterProtos {
         return getCompareFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
         if (compareFilterBuilder_ != null) {
@@ -10721,7 +10721,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> 
@@ -10737,7 +10737,7 @@ public final class FilterProtos {
         return compareFilterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:QualifierFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.QualifierFilter)
     }
 
     static {
@@ -10745,7 +10745,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:QualifierFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.QualifierFilter)
   }
 
   public interface RandomRowFilterOrBuilder
@@ -10762,7 +10762,7 @@ public final class FilterProtos {
     float getChance();
   }
   /**
-   * Protobuf type {@code RandomRowFilter}
+   * Protobuf type {@code hbase.pb.RandomRowFilter}
    */
   public static final class RandomRowFilter extends
       com.google.protobuf.GeneratedMessage
@@ -10831,12 +10831,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RandomRowFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RandomRowFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RandomRowFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RandomRowFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RandomRowFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RandomRowFilter.Builder.class);
     }
@@ -11025,19 +11025,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RandomRowFilter}
+     * Protobuf type {@code hbase.pb.RandomRowFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RandomRowFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RandomRowFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RandomRowFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RandomRowFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RandomRowFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RandomRowFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RandomRowFilter.Builder.class);
       }
@@ -11073,7 +11073,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RandomRowFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RandomRowFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RandomRowFilter getDefaultInstanceForType() {
@@ -11179,7 +11179,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RandomRowFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RandomRowFilter)
     }
 
     static {
@@ -11187,28 +11187,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RandomRowFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RandomRowFilter)
   }
 
   public interface RowFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     boolean hasCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code RowFilter}
+   * Protobuf type {@code hbase.pb.RowFilter}
    */
   public static final class RowFilter extends
       com.google.protobuf.GeneratedMessage
@@ -11285,12 +11285,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowFilter.Builder.class);
     }
@@ -11311,23 +11311,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     public static final int COMPARE_FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public boolean hasCompareFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
       return compareFilter_;
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
       return compareFilter_;
@@ -11489,19 +11489,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RowFilter}
+     * Protobuf type {@code hbase.pb.RowFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowFilter.Builder.class);
       }
@@ -11542,7 +11542,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowFilter getDefaultInstanceForType() {
@@ -11623,18 +11623,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .CompareFilter compare_filter = 1;
+      // required .hbase.pb.CompareFilter compare_filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> compareFilterBuilder_;
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public boolean hasCompareFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -11644,7 +11644,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -11660,7 +11660,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder builderForValue) {
@@ -11674,7 +11674,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder mergeCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -11693,7 +11693,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder clearCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -11706,7 +11706,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder getCompareFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -11714,7 +11714,7 @@ public final class FilterProtos {
         return getCompareFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
         if (compareFilterBuilder_ != null) {
@@ -11724,7 +11724,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> 
@@ -11740,7 +11740,7 @@ public final class FilterProtos {
         return compareFilterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RowFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RowFilter)
     }
 
     static {
@@ -11748,28 +11748,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RowFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RowFilter)
   }
 
   public interface SingleColumnValueExcludeFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .SingleColumnValueFilter single_column_value_filter = 1;
+    // required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
     /**
-     * required .SingleColumnValueFilter single_column_value_filter = 1;
+     * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
      */
     boolean hasSingleColumnValueFilter();
     /**
-     * required .SingleColumnValueFilter single_column_value_filter = 1;
+     * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter getSingleColumnValueFilter();
     /**
-     * required .SingleColumnValueFilter single_column_value_filter = 1;
+     * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilterOrBuilder getSingleColumnValueFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code SingleColumnValueExcludeFilter}
+   * Protobuf type {@code hbase.pb.SingleColumnValueExcludeFilter}
    */
   public static final class SingleColumnValueExcludeFilter extends
       com.google.protobuf.GeneratedMessage
@@ -11846,12 +11846,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueExcludeFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueExcludeFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueExcludeFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueExcludeFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueExcludeFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueExcludeFilter.Builder.class);
     }
@@ -11872,23 +11872,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .SingleColumnValueFilter single_column_value_filter = 1;
+    // required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
     public static final int SINGLE_COLUMN_VALUE_FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter singleColumnValueFilter_;
     /**
-     * required .SingleColumnValueFilter single_column_value_filter = 1;
+     * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
      */
     public boolean hasSingleColumnValueFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .SingleColumnValueFilter single_column_value_filter = 1;
+     * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter getSingleColumnValueFilter() {
       return singleColumnValueFilter_;
     }
     /**
-     * required .SingleColumnValueFilter single_column_value_filter = 1;
+     * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilterOrBuilder getSingleColumnValueFilterOrBuilder() {
       return singleColumnValueFilter_;
@@ -12050,19 +12050,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SingleColumnValueExcludeFilter}
+     * Protobuf type {@code hbase.pb.SingleColumnValueExcludeFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueExcludeFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueExcludeFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueExcludeFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueExcludeFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueExcludeFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueExcludeFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueExcludeFilter.Builder.class);
       }
@@ -12103,7 +12103,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueExcludeFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueExcludeFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueExcludeFilter getDefaultInstanceForType() {
@@ -12184,18 +12184,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .SingleColumnValueFilter single_column_value_filter = 1;
+      // required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter singleColumnValueFilter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilterOrBuilder> singleColumnValueFilterBuilder_;
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public boolean hasSingleColumnValueFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter getSingleColumnValueFilter() {
         if (singleColumnValueFilterBuilder_ == null) {
@@ -12205,7 +12205,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public Builder setSingleColumnValueFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter value) {
         if (singleColumnValueFilterBuilder_ == null) {
@@ -12221,7 +12221,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public Builder setSingleColumnValueFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.Builder builderForValue) {
@@ -12235,7 +12235,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public Builder mergeSingleColumnValueFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter value) {
         if (singleColumnValueFilterBuilder_ == null) {
@@ -12254,7 +12254,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public Builder clearSingleColumnValueFilter() {
         if (singleColumnValueFilterBuilder_ == null) {
@@ -12267,7 +12267,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.Builder getSingleColumnValueFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -12275,7 +12275,7 @@ public final class FilterProtos {
         return getSingleColumnValueFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilterOrBuilder getSingleColumnValueFilterOrBuilder() {
         if (singleColumnValueFilterBuilder_ != null) {
@@ -12285,7 +12285,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .SingleColumnValueFilter single_column_value_filter = 1;
+       * required .hbase.pb.SingleColumnValueFilter single_column_value_filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilterOrBuilder> 
@@ -12301,7 +12301,7 @@ public final class FilterProtos {
         return singleColumnValueFilterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:SingleColumnValueExcludeFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SingleColumnValueExcludeFilter)
     }
 
     static {
@@ -12309,7 +12309,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SingleColumnValueExcludeFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SingleColumnValueExcludeFilter)
   }
 
   public interface SingleColumnValueFilterOrBuilder
@@ -12335,27 +12335,27 @@ public final class FilterProtos {
      */
     com.google.protobuf.ByteString getColumnQualifier();
 
-    // required .CompareType compare_op = 3;
+    // required .hbase.pb.CompareType compare_op = 3;
     /**
-     * required .CompareType compare_op = 3;
+     * required .hbase.pb.CompareType compare_op = 3;
      */
     boolean hasCompareOp();
     /**
-     * required .CompareType compare_op = 3;
+     * required .hbase.pb.CompareType compare_op = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareOp();
 
-    // required .Comparator comparator = 4;
+    // required .hbase.pb.Comparator comparator = 4;
     /**
-     * required .Comparator comparator = 4;
+     * required .hbase.pb.Comparator comparator = 4;
      */
     boolean hasComparator();
     /**
-     * required .Comparator comparator = 4;
+     * required .hbase.pb.Comparator comparator = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator();
     /**
-     * required .Comparator comparator = 4;
+     * required .hbase.pb.Comparator comparator = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder();
 
@@ -12380,7 +12380,7 @@ public final class FilterProtos {
     boolean getLatestVersionOnly();
   }
   /**
-   * Protobuf type {@code SingleColumnValueFilter}
+   * Protobuf type {@code hbase.pb.SingleColumnValueFilter}
    */
   public static final class SingleColumnValueFilter extends
       com.google.protobuf.GeneratedMessage
@@ -12488,12 +12488,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.Builder.class);
     }
@@ -12546,39 +12546,39 @@ public final class FilterProtos {
       return columnQualifier_;
     }
 
-    // required .CompareType compare_op = 3;
+    // required .hbase.pb.CompareType compare_op = 3;
     public static final int COMPARE_OP_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType compareOp_;
     /**
-     * required .CompareType compare_op = 3;
+     * required .hbase.pb.CompareType compare_op = 3;
      */
     public boolean hasCompareOp() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * required .CompareType compare_op = 3;
+     * required .hbase.pb.CompareType compare_op = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareOp() {
       return compareOp_;
     }
 
-    // required .Comparator comparator = 4;
+    // required .hbase.pb.Comparator comparator = 4;
     public static final int COMPARATOR_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator comparator_;
     /**
-     * required .Comparator comparator = 4;
+     * required .hbase.pb.Comparator comparator = 4;
      */
     public boolean hasComparator() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * required .Comparator comparator = 4;
+     * required .hbase.pb.Comparator comparator = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator() {
       return comparator_;
     }
     /**
-     * required .Comparator comparator = 4;
+     * required .hbase.pb.Comparator comparator = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder() {
       return comparator_;
@@ -12861,19 +12861,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SingleColumnValueFilter}
+     * Protobuf type {@code hbase.pb.SingleColumnValueFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter.Builder.class);
       }
@@ -12924,7 +12924,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SingleColumnValueFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SingleColumnValueFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SingleColumnValueFilter getDefaultInstanceForType() {
@@ -13116,22 +13116,22 @@ public final class FilterProtos {
         return this;
       }
 
-      // required .CompareType compare_op = 3;
+      // required .hbase.pb.CompareType compare_op = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType compareOp_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType.LESS;
       /**
-       * required .CompareType compare_op = 3;
+       * required .hbase.pb.CompareType compare_op = 3;
        */
       public boolean hasCompareOp() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .CompareType compare_op = 3;
+       * required .hbase.pb.CompareType compare_op = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType getCompareOp() {
         return compareOp_;
       }
       /**
-       * required .CompareType compare_op = 3;
+       * required .hbase.pb.CompareType compare_op = 3;
        */
       public Builder setCompareOp(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CompareType value) {
         if (value == null) {
@@ -13143,7 +13143,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareType compare_op = 3;
+       * required .hbase.pb.CompareType compare_op = 3;
        */
       public Builder clearCompareOp() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -13152,18 +13152,18 @@ public final class FilterProtos {
         return this;
       }
 
-      // required .Comparator comparator = 4;
+      // required .hbase.pb.Comparator comparator = 4;
       private org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator comparator_ = org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder> comparatorBuilder_;
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public boolean hasComparator() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator getComparator() {
         if (comparatorBuilder_ == null) {
@@ -13173,7 +13173,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public Builder setComparator(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator value) {
         if (comparatorBuilder_ == null) {
@@ -13189,7 +13189,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public Builder setComparator(
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder builderForValue) {
@@ -13203,7 +13203,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public Builder mergeComparator(org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator value) {
         if (comparatorBuilder_ == null) {
@@ -13222,7 +13222,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public Builder clearComparator() {
         if (comparatorBuilder_ == null) {
@@ -13235,7 +13235,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder getComparatorBuilder() {
         bitField0_ |= 0x00000008;
@@ -13243,7 +13243,7 @@ public final class FilterProtos {
         return getComparatorFieldBuilder().getBuilder();
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder getComparatorOrBuilder() {
         if (comparatorBuilder_ != null) {
@@ -13253,7 +13253,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Comparator comparator = 4;
+       * required .hbase.pb.Comparator comparator = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.Comparator.Builder, org.apache.hadoop.hbase.protobuf.generated.ComparatorProtos.ComparatorOrBuilder> 
@@ -13335,7 +13335,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SingleColumnValueFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SingleColumnValueFilter)
     }
 
     static {
@@ -13343,28 +13343,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SingleColumnValueFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SingleColumnValueFilter)
   }
 
   public interface SkipFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .Filter filter = 1;
+    // required .hbase.pb.Filter filter = 1;
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     boolean hasFilter();
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter();
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code SkipFilter}
+   * Protobuf type {@code hbase.pb.SkipFilter}
    */
   public static final class SkipFilter extends
       com.google.protobuf.GeneratedMessage
@@ -13441,12 +13441,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SkipFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SkipFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SkipFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SkipFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SkipFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SkipFilter.Builder.class);
     }
@@ -13467,23 +13467,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .Filter filter = 1;
+    // required .hbase.pb.Filter filter = 1;
     public static final int FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_;
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public boolean hasFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
       return filter_;
     }
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
       return filter_;
@@ -13645,19 +13645,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SkipFilter}
+     * Protobuf type {@code hbase.pb.SkipFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SkipFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SkipFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SkipFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SkipFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SkipFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SkipFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SkipFilter.Builder.class);
       }
@@ -13698,7 +13698,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_SkipFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_SkipFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.SkipFilter getDefaultInstanceForType() {
@@ -13779,18 +13779,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .Filter filter = 1;
+      // required .hbase.pb.Filter filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> filterBuilder_;
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public boolean hasFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
         if (filterBuilder_ == null) {
@@ -13800,7 +13800,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder setFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -13816,7 +13816,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder setFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -13830,7 +13830,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder mergeFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -13849,7 +13849,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder clearFilter() {
         if (filterBuilder_ == null) {
@@ -13862,7 +13862,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder getFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -13870,7 +13870,7 @@ public final class FilterProtos {
         return getFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
         if (filterBuilder_ != null) {
@@ -13880,7 +13880,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> 
@@ -13896,7 +13896,7 @@ public final class FilterProtos {
         return filterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:SkipFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SkipFilter)
     }
 
     static {
@@ -13904,7 +13904,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SkipFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SkipFilter)
   }
 
   public interface TimestampsFilterOrBuilder
@@ -13925,7 +13925,7 @@ public final class FilterProtos {
     long getTimestamps(int index);
   }
   /**
-   * Protobuf type {@code TimestampsFilter}
+   * Protobuf type {@code hbase.pb.TimestampsFilter}
    */
   public static final class TimestampsFilter extends
       com.google.protobuf.GeneratedMessage
@@ -14013,12 +14013,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_TimestampsFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_TimestampsFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_TimestampsFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_TimestampsFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.TimestampsFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.TimestampsFilter.Builder.class);
     }
@@ -14221,19 +14221,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TimestampsFilter}
+     * Protobuf type {@code hbase.pb.TimestampsFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.TimestampsFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_TimestampsFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_TimestampsFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_TimestampsFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_TimestampsFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.TimestampsFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.TimestampsFilter.Builder.class);
       }
@@ -14269,7 +14269,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_TimestampsFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_TimestampsFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.TimestampsFilter getDefaultInstanceForType() {
@@ -14410,7 +14410,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TimestampsFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TimestampsFilter)
     }
 
     static {
@@ -14418,28 +14418,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TimestampsFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TimestampsFilter)
   }
 
   public interface ValueFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     boolean hasCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter();
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code ValueFilter}
+   * Protobuf type {@code hbase.pb.ValueFilter}
    */
   public static final class ValueFilter extends
       com.google.protobuf.GeneratedMessage
@@ -14516,12 +14516,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ValueFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ValueFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ValueFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ValueFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ValueFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ValueFilter.Builder.class);
     }
@@ -14542,23 +14542,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .CompareFilter compare_filter = 1;
+    // required .hbase.pb.CompareFilter compare_filter = 1;
     public static final int COMPARE_FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_;
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public boolean hasCompareFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
       return compareFilter_;
     }
     /**
-     * required .CompareFilter compare_filter = 1;
+     * required .hbase.pb.CompareFilter compare_filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
       return compareFilter_;
@@ -14720,19 +14720,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ValueFilter}
+     * Protobuf type {@code hbase.pb.ValueFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ValueFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ValueFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ValueFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ValueFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ValueFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ValueFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ValueFilter.Builder.class);
       }
@@ -14773,7 +14773,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_ValueFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_ValueFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.ValueFilter getDefaultInstanceForType() {
@@ -14854,18 +14854,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .CompareFilter compare_filter = 1;
+      // required .hbase.pb.CompareFilter compare_filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter compareFilter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> compareFilterBuilder_;
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public boolean hasCompareFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter getCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -14875,7 +14875,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -14891,7 +14891,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder setCompareFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder builderForValue) {
@@ -14905,7 +14905,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder mergeCompareFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter value) {
         if (compareFilterBuilder_ == null) {
@@ -14924,7 +14924,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public Builder clearCompareFilter() {
         if (compareFilterBuilder_ == null) {
@@ -14937,7 +14937,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder getCompareFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -14945,7 +14945,7 @@ public final class FilterProtos {
         return getCompareFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder getCompareFilterOrBuilder() {
         if (compareFilterBuilder_ != null) {
@@ -14955,7 +14955,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .CompareFilter compare_filter = 1;
+       * required .hbase.pb.CompareFilter compare_filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.CompareFilterOrBuilder> 
@@ -14971,7 +14971,7 @@ public final class FilterProtos {
         return compareFilterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ValueFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ValueFilter)
     }
 
     static {
@@ -14979,28 +14979,28 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ValueFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ValueFilter)
   }
 
   public interface WhileMatchFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .Filter filter = 1;
+    // required .hbase.pb.Filter filter = 1;
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     boolean hasFilter();
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter();
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder();
   }
   /**
-   * Protobuf type {@code WhileMatchFilter}
+   * Protobuf type {@code hbase.pb.WhileMatchFilter}
    */
   public static final class WhileMatchFilter extends
       com.google.protobuf.GeneratedMessage
@@ -15077,12 +15077,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_WhileMatchFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_WhileMatchFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_WhileMatchFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_WhileMatchFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.WhileMatchFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.WhileMatchFilter.Builder.class);
     }
@@ -15103,23 +15103,23 @@ public final class FilterProtos {
     }
 
     private int bitField0_;
-    // required .Filter filter = 1;
+    // required .hbase.pb.Filter filter = 1;
     public static final int FILTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_;
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public boolean hasFilter() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
       return filter_;
     }
     /**
-     * required .Filter filter = 1;
+     * required .hbase.pb.Filter filter = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
       return filter_;
@@ -15281,19 +15281,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WhileMatchFilter}
+     * Protobuf type {@code hbase.pb.WhileMatchFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.WhileMatchFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_WhileMatchFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_WhileMatchFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_WhileMatchFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_WhileMatchFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.WhileMatchFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.WhileMatchFilter.Builder.class);
       }
@@ -15334,7 +15334,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_WhileMatchFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_WhileMatchFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.WhileMatchFilter getDefaultInstanceForType() {
@@ -15415,18 +15415,18 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // required .Filter filter = 1;
+      // required .hbase.pb.Filter filter = 1;
       private org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter filter_ = org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> filterBuilder_;
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public boolean hasFilter() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter getFilter() {
         if (filterBuilder_ == null) {
@@ -15436,7 +15436,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder setFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -15452,7 +15452,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder setFilter(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder builderForValue) {
@@ -15466,7 +15466,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder mergeFilter(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter value) {
         if (filterBuilder_ == null) {
@@ -15485,7 +15485,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public Builder clearFilter() {
         if (filterBuilder_ == null) {
@@ -15498,7 +15498,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder getFilterBuilder() {
         bitField0_ |= 0x00000001;
@@ -15506,7 +15506,7 @@ public final class FilterProtos {
         return getFilterFieldBuilder().getBuilder();
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder getFilterOrBuilder() {
         if (filterBuilder_ != null) {
@@ -15516,7 +15516,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * required .Filter filter = 1;
+       * required .hbase.pb.Filter filter = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.Filter.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterOrBuilder> 
@@ -15532,7 +15532,7 @@ public final class FilterProtos {
         return filterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:WhileMatchFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WhileMatchFilter)
     }
 
     static {
@@ -15540,14 +15540,14 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WhileMatchFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WhileMatchFilter)
   }
 
   public interface FilterAllFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code FilterAllFilter}
+   * Protobuf type {@code hbase.pb.FilterAllFilter}
    */
   public static final class FilterAllFilter extends
       com.google.protobuf.GeneratedMessage
@@ -15610,12 +15610,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterAllFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterAllFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterAllFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterAllFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterAllFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterAllFilter.Builder.class);
     }
@@ -15766,19 +15766,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FilterAllFilter}
+     * Protobuf type {@code hbase.pb.FilterAllFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterAllFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterAllFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterAllFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterAllFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterAllFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterAllFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterAllFilter.Builder.class);
       }
@@ -15812,7 +15812,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_FilterAllFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_FilterAllFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.FilterAllFilter getDefaultInstanceForType() {
@@ -15870,7 +15870,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FilterAllFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FilterAllFilter)
     }
 
     static {
@@ -15878,7 +15878,7 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FilterAllFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FilterAllFilter)
   }
 
   public interface RowRangeOrBuilder
@@ -15925,7 +15925,7 @@ public final class FilterProtos {
     boolean getStopRowInclusive();
   }
   /**
-   * Protobuf type {@code RowRange}
+   * Protobuf type {@code hbase.pb.RowRange}
    */
   public static final class RowRange extends
       com.google.protobuf.GeneratedMessage
@@ -16009,12 +16009,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowRange_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowRange_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowRange_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowRange_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder.class);
     }
@@ -16298,19 +16298,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RowRange}
+     * Protobuf type {@code hbase.pb.RowRange}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRangeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowRange_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowRange_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowRange_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowRange_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder.class);
       }
@@ -16352,7 +16352,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_RowRange_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_RowRange_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange getDefaultInstanceForType() {
@@ -16580,7 +16580,7 @@ public final class FilterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RowRange)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RowRange)
     }
 
     static {
@@ -16588,39 +16588,39 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RowRange)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RowRange)
   }
 
   public interface MultiRowRangeFilterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .RowRange row_range_list = 1;
+    // repeated .hbase.pb.RowRange row_range_list = 1;
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     java.util.List 
         getRowRangeListList();
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange getRowRangeList(int index);
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     int getRowRangeListCount();
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     java.util.List 
         getRowRangeListOrBuilderList();
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRangeOrBuilder getRowRangeListOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code MultiRowRangeFilter}
+   * Protobuf type {@code hbase.pb.MultiRowRangeFilter}
    */
   public static final class MultiRowRangeFilter extends
       com.google.protobuf.GeneratedMessage
@@ -16695,12 +16695,12 @@ public final class FilterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultiRowRangeFilter_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultiRowRangeFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultiRowRangeFilter_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultiRowRangeFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultiRowRangeFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultiRowRangeFilter.Builder.class);
     }
@@ -16720,36 +16720,36 @@ public final class FilterProtos {
       return PARSER;
     }
 
-    // repeated .RowRange row_range_list = 1;
+    // repeated .hbase.pb.RowRange row_range_list = 1;
     public static final int ROW_RANGE_LIST_FIELD_NUMBER = 1;
     private java.util.List rowRangeList_;
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     public java.util.List getRowRangeListList() {
       return rowRangeList_;
     }
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     public java.util.List 
         getRowRangeListOrBuilderList() {
       return rowRangeList_;
     }
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     public int getRowRangeListCount() {
       return rowRangeList_.size();
     }
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange getRowRangeList(int index) {
       return rowRangeList_.get(index);
     }
     /**
-     * repeated .RowRange row_range_list = 1;
+     * repeated .hbase.pb.RowRange row_range_list = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRangeOrBuilder getRowRangeListOrBuilder(
         int index) {
@@ -16901,19 +16901,19 @@ public final class FilterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultiRowRangeFilter}
+     * Protobuf type {@code hbase.pb.MultiRowRangeFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultiRowRangeFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultiRowRangeFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultiRowRangeFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultiRowRangeFilter_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultiRowRangeFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultiRowRangeFilter.class, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultiRowRangeFilter.Builder.class);
       }
@@ -16954,7 +16954,7 @@ public final class FilterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_MultiRowRangeFilter_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.FilterProtos.internal_static_hbase_pb_MultiRowRangeFilter_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.MultiRowRangeFilter getDefaultInstanceForType() {
@@ -17049,7 +17049,7 @@ public final class FilterProtos {
       }
       private int bitField0_;
 
-      // repeated .RowRange row_range_list = 1;
+      // repeated .hbase.pb.RowRange row_range_list = 1;
       private java.util.List rowRangeList_ =
         java.util.Collections.emptyList();
       private void ensureRowRangeListIsMutable() {
@@ -17063,7 +17063,7 @@ public final class FilterProtos {
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRangeOrBuilder> rowRangeListBuilder_;
 
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public java.util.List getRowRangeListList() {
         if (rowRangeListBuilder_ == null) {
@@ -17073,7 +17073,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public int getRowRangeListCount() {
         if (rowRangeListBuilder_ == null) {
@@ -17083,7 +17083,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange getRowRangeList(int index) {
         if (rowRangeListBuilder_ == null) {
@@ -17093,7 +17093,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder setRowRangeList(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange value) {
@@ -17110,7 +17110,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder setRowRangeList(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder builderForValue) {
@@ -17124,7 +17124,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder addRowRangeList(org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange value) {
         if (rowRangeListBuilder_ == null) {
@@ -17140,7 +17140,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder addRowRangeList(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange value) {
@@ -17157,7 +17157,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder addRowRangeList(
           org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder builderForValue) {
@@ -17171,7 +17171,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder addRowRangeList(
           int index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder builderForValue) {
@@ -17185,7 +17185,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder addAllRowRangeList(
           java.lang.Iterable values) {
@@ -17199,7 +17199,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder clearRowRangeList() {
         if (rowRangeListBuilder_ == null) {
@@ -17212,7 +17212,7 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public Builder removeRowRangeList(int index) {
         if (rowRangeListBuilder_ == null) {
@@ -17225,14 +17225,14 @@ public final class FilterProtos {
         return this;
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder getRowRangeListBuilder(
           int index) {
         return getRowRangeListFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRangeOrBuilder getRowRangeListOrBuilder(
           int index) {
@@ -17242,7 +17242,7 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public java.util.List 
            getRowRangeListOrBuilderList() {
@@ -17253,14 +17253,14 @@ public final class FilterProtos {
         }
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder addRowRangeListBuilder() {
         return getRowRangeListFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.getDefaultInstance());
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.Builder addRowRangeListBuilder(
           int index) {
@@ -17268,7 +17268,7 @@ public final class FilterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.FilterProtos.RowRange.getDefaultInstance());
       }
       /**
-       * repeated .RowRange row_range_list = 1;
+       * repeated .hbase.pb.RowRange row_range_list = 1;
        */
       public java.util.List 
            getRowRangeListBuilderList() {
@@ -17289,7 +17289,7 @@ public final class FilterProtos {
         return rowRangeListBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultiRowRangeFilter)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultiRowRangeFilter)
     }
 
     static {
@@ -17297,159 +17297,159 @@ public final class FilterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultiRowRangeFilter)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiRowRangeFilter)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Filter_descriptor;
+    internal_static_hbase_pb_Filter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Filter_fieldAccessorTable;
+      internal_static_hbase_pb_Filter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ColumnCountGetFilter_descriptor;
+    internal_static_hbase_pb_ColumnCountGetFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ColumnCountGetFilter_fieldAccessorTable;
+      internal_static_hbase_pb_ColumnCountGetFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ColumnPaginationFilter_descriptor;
+    internal_static_hbase_pb_ColumnPaginationFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ColumnPaginationFilter_fieldAccessorTable;
+      internal_static_hbase_pb_ColumnPaginationFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ColumnPrefixFilter_descriptor;
+    internal_static_hbase_pb_ColumnPrefixFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ColumnPrefixFilter_fieldAccessorTable;
+      internal_static_hbase_pb_ColumnPrefixFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ColumnRangeFilter_descriptor;
+    internal_static_hbase_pb_ColumnRangeFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ColumnRangeFilter_fieldAccessorTable;
+      internal_static_hbase_pb_ColumnRangeFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CompareFilter_descriptor;
+    internal_static_hbase_pb_CompareFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CompareFilter_fieldAccessorTable;
+      internal_static_hbase_pb_CompareFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DependentColumnFilter_descriptor;
+    internal_static_hbase_pb_DependentColumnFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DependentColumnFilter_fieldAccessorTable;
+      internal_static_hbase_pb_DependentColumnFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FamilyFilter_descriptor;
+    internal_static_hbase_pb_FamilyFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FamilyFilter_fieldAccessorTable;
+      internal_static_hbase_pb_FamilyFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FilterList_descriptor;
+    internal_static_hbase_pb_FilterList_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FilterList_fieldAccessorTable;
+      internal_static_hbase_pb_FilterList_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FilterWrapper_descriptor;
+    internal_static_hbase_pb_FilterWrapper_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FilterWrapper_fieldAccessorTable;
+      internal_static_hbase_pb_FilterWrapper_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FirstKeyOnlyFilter_descriptor;
+    internal_static_hbase_pb_FirstKeyOnlyFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FirstKeyOnlyFilter_fieldAccessorTable;
+      internal_static_hbase_pb_FirstKeyOnlyFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FirstKeyValueMatchingQualifiersFilter_descriptor;
+    internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable;
+      internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FuzzyRowFilter_descriptor;
+    internal_static_hbase_pb_FuzzyRowFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FuzzyRowFilter_fieldAccessorTable;
+      internal_static_hbase_pb_FuzzyRowFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_InclusiveStopFilter_descriptor;
+    internal_static_hbase_pb_InclusiveStopFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_InclusiveStopFilter_fieldAccessorTable;
+      internal_static_hbase_pb_InclusiveStopFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_KeyOnlyFilter_descriptor;
+    internal_static_hbase_pb_KeyOnlyFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_KeyOnlyFilter_fieldAccessorTable;
+      internal_static_hbase_pb_KeyOnlyFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultipleColumnPrefixFilter_descriptor;
+    internal_static_hbase_pb_MultipleColumnPrefixFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultipleColumnPrefixFilter_fieldAccessorTable;
+      internal_static_hbase_pb_MultipleColumnPrefixFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_PageFilter_descriptor;
+    internal_static_hbase_pb_PageFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_PageFilter_fieldAccessorTable;
+      internal_static_hbase_pb_PageFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_PrefixFilter_descriptor;
+    internal_static_hbase_pb_PrefixFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_PrefixFilter_fieldAccessorTable;
+      internal_static_hbase_pb_PrefixFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_QualifierFilter_descriptor;
+    internal_static_hbase_pb_QualifierFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_QualifierFilter_fieldAccessorTable;
+      internal_static_hbase_pb_QualifierFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RandomRowFilter_descriptor;
+    internal_static_hbase_pb_RandomRowFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RandomRowFilter_fieldAccessorTable;
+      internal_static_hbase_pb_RandomRowFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RowFilter_descriptor;
+    internal_static_hbase_pb_RowFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RowFilter_fieldAccessorTable;
+      internal_static_hbase_pb_RowFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SingleColumnValueExcludeFilter_descriptor;
+    internal_static_hbase_pb_SingleColumnValueExcludeFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SingleColumnValueExcludeFilter_fieldAccessorTable;
+      internal_static_hbase_pb_SingleColumnValueExcludeFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SingleColumnValueFilter_descriptor;
+    internal_static_hbase_pb_SingleColumnValueFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SingleColumnValueFilter_fieldAccessorTable;
+      internal_static_hbase_pb_SingleColumnValueFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SkipFilter_descriptor;
+    internal_static_hbase_pb_SkipFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SkipFilter_fieldAccessorTable;
+      internal_static_hbase_pb_SkipFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TimestampsFilter_descriptor;
+    internal_static_hbase_pb_TimestampsFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TimestampsFilter_fieldAccessorTable;
+      internal_static_hbase_pb_TimestampsFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ValueFilter_descriptor;
+    internal_static_hbase_pb_ValueFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ValueFilter_fieldAccessorTable;
+      internal_static_hbase_pb_ValueFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WhileMatchFilter_descriptor;
+    internal_static_hbase_pb_WhileMatchFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WhileMatchFilter_fieldAccessorTable;
+      internal_static_hbase_pb_WhileMatchFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FilterAllFilter_descriptor;
+    internal_static_hbase_pb_FilterAllFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FilterAllFilter_fieldAccessorTable;
+      internal_static_hbase_pb_FilterAllFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RowRange_descriptor;
+    internal_static_hbase_pb_RowRange_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RowRange_fieldAccessorTable;
+      internal_static_hbase_pb_RowRange_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultiRowRangeFilter_descriptor;
+    internal_static_hbase_pb_MultiRowRangeFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultiRowRangeFilter_fieldAccessorTable;
+      internal_static_hbase_pb_MultiRowRangeFilter_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -17459,243 +17459,247 @@ public final class FilterProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014Filter.proto\032\013HBase.proto\032\020Comparator." +
-      "proto\"1\n\006Filter\022\014\n\004name\030\001 \002(\t\022\031\n\021seriali" +
-      "zed_filter\030\002 \001(\014\"%\n\024ColumnCountGetFilter" +
-      "\022\r\n\005limit\030\001 \002(\005\"N\n\026ColumnPaginationFilte" +
-      "r\022\r\n\005limit\030\001 \002(\005\022\016\n\006offset\030\002 \001(\005\022\025\n\rcolu" +
-      "mn_offset\030\003 \001(\014\"$\n\022ColumnPrefixFilter\022\016\n" +
-      "\006prefix\030\001 \002(\014\"w\n\021ColumnRangeFilter\022\022\n\nmi" +
-      "n_column\030\001 \001(\014\022\034\n\024min_column_inclusive\030\002" +
-      " \001(\010\022\022\n\nmax_column\030\003 \001(\014\022\034\n\024max_column_i" +
-      "nclusive\030\004 \001(\010\"R\n\rCompareFilter\022 \n\ncompa",
-      "re_op\030\001 \002(\0162\014.CompareType\022\037\n\ncomparator\030" +
-      "\002 \001(\0132\013.Comparator\"\217\001\n\025DependentColumnFi" +
-      "lter\022&\n\016compare_filter\030\001 \002(\0132\016.CompareFi" +
-      "lter\022\025\n\rcolumn_family\030\002 \001(\014\022\030\n\020column_qu" +
-      "alifier\030\003 \001(\014\022\035\n\025drop_dependent_column\030\004" +
-      " \001(\010\"6\n\014FamilyFilter\022&\n\016compare_filter\030\001" +
-      " \002(\0132\016.CompareFilter\"\200\001\n\nFilterList\022&\n\010o" +
-      "perator\030\001 \002(\0162\024.FilterList.Operator\022\030\n\007f" +
-      "ilters\030\002 \003(\0132\007.Filter\"0\n\010Operator\022\021\n\rMUS" +
-      "T_PASS_ALL\020\001\022\021\n\rMUST_PASS_ONE\020\002\"(\n\rFilte",
-      "rWrapper\022\027\n\006filter\030\001 \002(\0132\007.Filter\"\024\n\022Fir" +
-      "stKeyOnlyFilter\";\n%FirstKeyValueMatching" +
-      "QualifiersFilter\022\022\n\nqualifiers\030\001 \003(\014\":\n\016" +
-      "FuzzyRowFilter\022(\n\017fuzzy_keys_data\030\001 \003(\0132" +
-      "\017.BytesBytesPair\"+\n\023InclusiveStopFilter\022" +
-      "\024\n\014stop_row_key\030\001 \001(\014\"#\n\rKeyOnlyFilter\022\022" +
-      "\n\nlen_as_val\030\001 \002(\010\"5\n\032MultipleColumnPref" +
-      "ixFilter\022\027\n\017sorted_prefixes\030\001 \003(\014\"\037\n\nPag" +
-      "eFilter\022\021\n\tpage_size\030\001 \002(\003\"\036\n\014PrefixFilt" +
-      "er\022\016\n\006prefix\030\001 \001(\014\"9\n\017QualifierFilter\022&\n",
-      "\016compare_filter\030\001 \002(\0132\016.CompareFilter\"!\n" +
-      "\017RandomRowFilter\022\016\n\006chance\030\001 \002(\002\"3\n\tRowF" +
-      "ilter\022&\n\016compare_filter\030\001 \002(\0132\016.CompareF" +
-      "ilter\"^\n\036SingleColumnValueExcludeFilter\022" +
-      "<\n\032single_column_value_filter\030\001 \002(\0132\030.Si" +
-      "ngleColumnValueFilter\"\305\001\n\027SingleColumnVa" +
-      "lueFilter\022\025\n\rcolumn_family\030\001 \001(\014\022\030\n\020colu" +
-      "mn_qualifier\030\002 \001(\014\022 \n\ncompare_op\030\003 \002(\0162\014" +
-      ".CompareType\022\037\n\ncomparator\030\004 \002(\0132\013.Compa" +
-      "rator\022\031\n\021filter_if_missing\030\005 \001(\010\022\033\n\023late",
-      "st_version_only\030\006 \001(\010\"%\n\nSkipFilter\022\027\n\006f" +
-      "ilter\030\001 \002(\0132\007.Filter\"*\n\020TimestampsFilter" +
-      "\022\026\n\ntimestamps\030\001 \003(\003B\002\020\001\"5\n\013ValueFilter\022" +
-      "&\n\016compare_filter\030\001 \002(\0132\016.CompareFilter\"" +
-      "+\n\020WhileMatchFilter\022\027\n\006filter\030\001 \002(\0132\007.Fi" +
-      "lter\"\021\n\017FilterAllFilter\"h\n\010RowRange\022\021\n\ts" +
-      "tart_row\030\001 \001(\014\022\033\n\023start_row_inclusive\030\002 " +
-      "\001(\010\022\020\n\010stop_row\030\003 \001(\014\022\032\n\022stop_row_inclus" +
-      "ive\030\004 \001(\010\"8\n\023MultiRowRangeFilter\022!\n\016row_" +
-      "range_list\030\001 \003(\0132\t.RowRangeBB\n*org.apach",
-      "e.hadoop.hbase.protobuf.generatedB\014Filte" +
-      "rProtosH\001\210\001\001\240\001\001"
+      "\n\014Filter.proto\022\010hbase.pb\032\013HBase.proto\032\020C" +
+      "omparator.proto\"1\n\006Filter\022\014\n\004name\030\001 \002(\t\022" +
+      "\031\n\021serialized_filter\030\002 \001(\014\"%\n\024ColumnCoun" +
+      "tGetFilter\022\r\n\005limit\030\001 \002(\005\"N\n\026ColumnPagin" +
+      "ationFilter\022\r\n\005limit\030\001 \002(\005\022\016\n\006offset\030\002 \001" +
+      "(\005\022\025\n\rcolumn_offset\030\003 \001(\014\"$\n\022ColumnPrefi" +
+      "xFilter\022\016\n\006prefix\030\001 \002(\014\"w\n\021ColumnRangeFi" +
+      "lter\022\022\n\nmin_column\030\001 \001(\014\022\034\n\024min_column_i" +
+      "nclusive\030\002 \001(\010\022\022\n\nmax_column\030\003 \001(\014\022\034\n\024ma" +
+      "x_column_inclusive\030\004 \001(\010\"d\n\rCompareFilte",
+      "r\022)\n\ncompare_op\030\001 \002(\0162\025.hbase.pb.Compare" +
+      "Type\022(\n\ncomparator\030\002 \001(\0132\024.hbase.pb.Comp" +
+      "arator\"\230\001\n\025DependentColumnFilter\022/\n\016comp" +
+      "are_filter\030\001 \002(\0132\027.hbase.pb.CompareFilte" +
+      "r\022\025\n\rcolumn_family\030\002 \001(\014\022\030\n\020column_quali" +
+      "fier\030\003 \001(\014\022\035\n\025drop_dependent_column\030\004 \001(" +
+      "\010\"?\n\014FamilyFilter\022/\n\016compare_filter\030\001 \002(" +
+      "\0132\027.hbase.pb.CompareFilter\"\222\001\n\nFilterLis" +
+      "t\022/\n\010operator\030\001 \002(\0162\035.hbase.pb.FilterLis" +
+      "t.Operator\022!\n\007filters\030\002 \003(\0132\020.hbase.pb.F",
+      "ilter\"0\n\010Operator\022\021\n\rMUST_PASS_ALL\020\001\022\021\n\r" +
+      "MUST_PASS_ONE\020\002\"1\n\rFilterWrapper\022 \n\006filt" +
+      "er\030\001 \002(\0132\020.hbase.pb.Filter\"\024\n\022FirstKeyOn" +
+      "lyFilter\";\n%FirstKeyValueMatchingQualifi" +
+      "ersFilter\022\022\n\nqualifiers\030\001 \003(\014\"C\n\016FuzzyRo" +
+      "wFilter\0221\n\017fuzzy_keys_data\030\001 \003(\0132\030.hbase" +
+      ".pb.BytesBytesPair\"+\n\023InclusiveStopFilte" +
+      "r\022\024\n\014stop_row_key\030\001 \001(\014\"#\n\rKeyOnlyFilter" +
+      "\022\022\n\nlen_as_val\030\001 \002(\010\"5\n\032MultipleColumnPr" +
+      "efixFilter\022\027\n\017sorted_prefixes\030\001 \003(\014\"\037\n\nP",
+      "ageFilter\022\021\n\tpage_size\030\001 \002(\003\"\036\n\014PrefixFi" +
+      "lter\022\016\n\006prefix\030\001 \001(\014\"B\n\017QualifierFilter\022" +
+      "/\n\016compare_filter\030\001 \002(\0132\027.hbase.pb.Compa" +
+      "reFilter\"!\n\017RandomRowFilter\022\016\n\006chance\030\001 " +
+      "\002(\002\"<\n\tRowFilter\022/\n\016compare_filter\030\001 \002(\013" +
+      "2\027.hbase.pb.CompareFilter\"g\n\036SingleColum" +
+      "nValueExcludeFilter\022E\n\032single_column_val" +
+      "ue_filter\030\001 \002(\0132!.hbase.pb.SingleColumnV" +
+      "alueFilter\"\327\001\n\027SingleColumnValueFilter\022\025" +
+      "\n\rcolumn_family\030\001 \001(\014\022\030\n\020column_qualifie",
+      "r\030\002 \001(\014\022)\n\ncompare_op\030\003 \002(\0162\025.hbase.pb.C" +
+      "ompareType\022(\n\ncomparator\030\004 \002(\0132\024.hbase.p" +
+      "b.Comparator\022\031\n\021filter_if_missing\030\005 \001(\010\022" +
+      "\033\n\023latest_version_only\030\006 \001(\010\".\n\nSkipFilt" +
+      "er\022 \n\006filter\030\001 \002(\0132\020.hbase.pb.Filter\"*\n\020" +
+      "TimestampsFilter\022\026\n\ntimestamps\030\001 \003(\003B\002\020\001" +
+      "\">\n\013ValueFilter\022/\n\016compare_filter\030\001 \002(\0132" +
+      "\027.hbase.pb.CompareFilter\"4\n\020WhileMatchFi" +
+      "lter\022 \n\006filter\030\001 \002(\0132\020.hbase.pb.Filter\"\021" +
+      "\n\017FilterAllFilter\"h\n\010RowRange\022\021\n\tstart_r",
+      "ow\030\001 \001(\014\022\033\n\023start_row_inclusive\030\002 \001(\010\022\020\n" +
+      "\010stop_row\030\003 \001(\014\022\032\n\022stop_row_inclusive\030\004 " +
+      "\001(\010\"A\n\023MultiRowRangeFilter\022*\n\016row_range_" +
+      "list\030\001 \003(\0132\022.hbase.pb.RowRangeBB\n*org.ap" +
+      "ache.hadoop.hbase.protobuf.generatedB\014Fi" +
+      "lterProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_Filter_descriptor =
+          internal_static_hbase_pb_Filter_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_Filter_fieldAccessorTable = new
+          internal_static_hbase_pb_Filter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Filter_descriptor,
+              internal_static_hbase_pb_Filter_descriptor,
               new java.lang.String[] { "Name", "SerializedFilter", });
-          internal_static_ColumnCountGetFilter_descriptor =
+          internal_static_hbase_pb_ColumnCountGetFilter_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_ColumnCountGetFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_ColumnCountGetFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ColumnCountGetFilter_descriptor,
+              internal_static_hbase_pb_ColumnCountGetFilter_descriptor,
               new java.lang.String[] { "Limit", });
-          internal_static_ColumnPaginationFilter_descriptor =
+          internal_static_hbase_pb_ColumnPaginationFilter_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_ColumnPaginationFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_ColumnPaginationFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ColumnPaginationFilter_descriptor,
+              internal_static_hbase_pb_ColumnPaginationFilter_descriptor,
               new java.lang.String[] { "Limit", "Offset", "ColumnOffset", });
-          internal_static_ColumnPrefixFilter_descriptor =
+          internal_static_hbase_pb_ColumnPrefixFilter_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_ColumnPrefixFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_ColumnPrefixFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ColumnPrefixFilter_descriptor,
+              internal_static_hbase_pb_ColumnPrefixFilter_descriptor,
               new java.lang.String[] { "Prefix", });
-          internal_static_ColumnRangeFilter_descriptor =
+          internal_static_hbase_pb_ColumnRangeFilter_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_ColumnRangeFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_ColumnRangeFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ColumnRangeFilter_descriptor,
+              internal_static_hbase_pb_ColumnRangeFilter_descriptor,
               new java.lang.String[] { "MinColumn", "MinColumnInclusive", "MaxColumn", "MaxColumnInclusive", });
-          internal_static_CompareFilter_descriptor =
+          internal_static_hbase_pb_CompareFilter_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_CompareFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_CompareFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CompareFilter_descriptor,
+              internal_static_hbase_pb_CompareFilter_descriptor,
               new java.lang.String[] { "CompareOp", "Comparator", });
-          internal_static_DependentColumnFilter_descriptor =
+          internal_static_hbase_pb_DependentColumnFilter_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_DependentColumnFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_DependentColumnFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DependentColumnFilter_descriptor,
+              internal_static_hbase_pb_DependentColumnFilter_descriptor,
               new java.lang.String[] { "CompareFilter", "ColumnFamily", "ColumnQualifier", "DropDependentColumn", });
-          internal_static_FamilyFilter_descriptor =
+          internal_static_hbase_pb_FamilyFilter_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_FamilyFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_FamilyFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FamilyFilter_descriptor,
+              internal_static_hbase_pb_FamilyFilter_descriptor,
               new java.lang.String[] { "CompareFilter", });
-          internal_static_FilterList_descriptor =
+          internal_static_hbase_pb_FilterList_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_FilterList_fieldAccessorTable = new
+          internal_static_hbase_pb_FilterList_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FilterList_descriptor,
+              internal_static_hbase_pb_FilterList_descriptor,
               new java.lang.String[] { "Operator", "Filters", });
-          internal_static_FilterWrapper_descriptor =
+          internal_static_hbase_pb_FilterWrapper_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_FilterWrapper_fieldAccessorTable = new
+          internal_static_hbase_pb_FilterWrapper_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FilterWrapper_descriptor,
+              internal_static_hbase_pb_FilterWrapper_descriptor,
               new java.lang.String[] { "Filter", });
-          internal_static_FirstKeyOnlyFilter_descriptor =
+          internal_static_hbase_pb_FirstKeyOnlyFilter_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_FirstKeyOnlyFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_FirstKeyOnlyFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FirstKeyOnlyFilter_descriptor,
+              internal_static_hbase_pb_FirstKeyOnlyFilter_descriptor,
               new java.lang.String[] { });
-          internal_static_FirstKeyValueMatchingQualifiersFilter_descriptor =
+          internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FirstKeyValueMatchingQualifiersFilter_descriptor,
+              internal_static_hbase_pb_FirstKeyValueMatchingQualifiersFilter_descriptor,
               new java.lang.String[] { "Qualifiers", });
-          internal_static_FuzzyRowFilter_descriptor =
+          internal_static_hbase_pb_FuzzyRowFilter_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_FuzzyRowFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_FuzzyRowFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FuzzyRowFilter_descriptor,
+              internal_static_hbase_pb_FuzzyRowFilter_descriptor,
               new java.lang.String[] { "FuzzyKeysData", });
-          internal_static_InclusiveStopFilter_descriptor =
+          internal_static_hbase_pb_InclusiveStopFilter_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_InclusiveStopFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_InclusiveStopFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_InclusiveStopFilter_descriptor,
+              internal_static_hbase_pb_InclusiveStopFilter_descriptor,
               new java.lang.String[] { "StopRowKey", });
-          internal_static_KeyOnlyFilter_descriptor =
+          internal_static_hbase_pb_KeyOnlyFilter_descriptor =
             getDescriptor().getMessageTypes().get(14);
-          internal_static_KeyOnlyFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_KeyOnlyFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_KeyOnlyFilter_descriptor,
+              internal_static_hbase_pb_KeyOnlyFilter_descriptor,
               new java.lang.String[] { "LenAsVal", });
-          internal_static_MultipleColumnPrefixFilter_descriptor =
+          internal_static_hbase_pb_MultipleColumnPrefixFilter_descriptor =
             getDescriptor().getMessageTypes().get(15);
-          internal_static_MultipleColumnPrefixFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_MultipleColumnPrefixFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultipleColumnPrefixFilter_descriptor,
+              internal_static_hbase_pb_MultipleColumnPrefixFilter_descriptor,
               new java.lang.String[] { "SortedPrefixes", });
-          internal_static_PageFilter_descriptor =
+          internal_static_hbase_pb_PageFilter_descriptor =
             getDescriptor().getMessageTypes().get(16);
-          internal_static_PageFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_PageFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_PageFilter_descriptor,
+              internal_static_hbase_pb_PageFilter_descriptor,
               new java.lang.String[] { "PageSize", });
-          internal_static_PrefixFilter_descriptor =
+          internal_static_hbase_pb_PrefixFilter_descriptor =
             getDescriptor().getMessageTypes().get(17);
-          internal_static_PrefixFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_PrefixFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_PrefixFilter_descriptor,
+              internal_static_hbase_pb_PrefixFilter_descriptor,
               new java.lang.String[] { "Prefix", });
-          internal_static_QualifierFilter_descriptor =
+          internal_static_hbase_pb_QualifierFilter_descriptor =
             getDescriptor().getMessageTypes().get(18);
-          internal_static_QualifierFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_QualifierFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_QualifierFilter_descriptor,
+              internal_static_hbase_pb_QualifierFilter_descriptor,
               new java.lang.String[] { "CompareFilter", });
-          internal_static_RandomRowFilter_descriptor =
+          internal_static_hbase_pb_RandomRowFilter_descriptor =
             getDescriptor().getMessageTypes().get(19);
-          internal_static_RandomRowFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_RandomRowFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RandomRowFilter_descriptor,
+              internal_static_hbase_pb_RandomRowFilter_descriptor,
               new java.lang.String[] { "Chance", });
-          internal_static_RowFilter_descriptor =
+          internal_static_hbase_pb_RowFilter_descriptor =
             getDescriptor().getMessageTypes().get(20);
-          internal_static_RowFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_RowFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RowFilter_descriptor,
+              internal_static_hbase_pb_RowFilter_descriptor,
               new java.lang.String[] { "CompareFilter", });
-          internal_static_SingleColumnValueExcludeFilter_descriptor =
+          internal_static_hbase_pb_SingleColumnValueExcludeFilter_descriptor =
             getDescriptor().getMessageTypes().get(21);
-          internal_static_SingleColumnValueExcludeFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_SingleColumnValueExcludeFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SingleColumnValueExcludeFilter_descriptor,
+              internal_static_hbase_pb_SingleColumnValueExcludeFilter_descriptor,
               new java.lang.String[] { "SingleColumnValueFilter", });
-          internal_static_SingleColumnValueFilter_descriptor =
+          internal_static_hbase_pb_SingleColumnValueFilter_descriptor =
             getDescriptor().getMessageTypes().get(22);
-          internal_static_SingleColumnValueFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_SingleColumnValueFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SingleColumnValueFilter_descriptor,
+              internal_static_hbase_pb_SingleColumnValueFilter_descriptor,
               new java.lang.String[] { "ColumnFamily", "ColumnQualifier", "CompareOp", "Comparator", "FilterIfMissing", "LatestVersionOnly", });
-          internal_static_SkipFilter_descriptor =
+          internal_static_hbase_pb_SkipFilter_descriptor =
             getDescriptor().getMessageTypes().get(23);
-          internal_static_SkipFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_SkipFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SkipFilter_descriptor,
+              internal_static_hbase_pb_SkipFilter_descriptor,
               new java.lang.String[] { "Filter", });
-          internal_static_TimestampsFilter_descriptor =
+          internal_static_hbase_pb_TimestampsFilter_descriptor =
             getDescriptor().getMessageTypes().get(24);
-          internal_static_TimestampsFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_TimestampsFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TimestampsFilter_descriptor,
+              internal_static_hbase_pb_TimestampsFilter_descriptor,
               new java.lang.String[] { "Timestamps", });
-          internal_static_ValueFilter_descriptor =
+          internal_static_hbase_pb_ValueFilter_descriptor =
             getDescriptor().getMessageTypes().get(25);
-          internal_static_ValueFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_ValueFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ValueFilter_descriptor,
+              internal_static_hbase_pb_ValueFilter_descriptor,
               new java.lang.String[] { "CompareFilter", });
-          internal_static_WhileMatchFilter_descriptor =
+          internal_static_hbase_pb_WhileMatchFilter_descriptor =
             getDescriptor().getMessageTypes().get(26);
-          internal_static_WhileMatchFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_WhileMatchFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WhileMatchFilter_descriptor,
+              internal_static_hbase_pb_WhileMatchFilter_descriptor,
               new java.lang.String[] { "Filter", });
-          internal_static_FilterAllFilter_descriptor =
+          internal_static_hbase_pb_FilterAllFilter_descriptor =
             getDescriptor().getMessageTypes().get(27);
-          internal_static_FilterAllFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_FilterAllFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FilterAllFilter_descriptor,
+              internal_static_hbase_pb_FilterAllFilter_descriptor,
               new java.lang.String[] { });
-          internal_static_RowRange_descriptor =
+          internal_static_hbase_pb_RowRange_descriptor =
             getDescriptor().getMessageTypes().get(28);
-          internal_static_RowRange_fieldAccessorTable = new
+          internal_static_hbase_pb_RowRange_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RowRange_descriptor,
+              internal_static_hbase_pb_RowRange_descriptor,
               new java.lang.String[] { "StartRow", "StartRowInclusive", "StopRow", "StopRowInclusive", });
-          internal_static_MultiRowRangeFilter_descriptor =
+          internal_static_hbase_pb_MultiRowRangeFilter_descriptor =
             getDescriptor().getMessageTypes().get(29);
-          internal_static_MultiRowRangeFilter_fieldAccessorTable = new
+          internal_static_hbase_pb_MultiRowRangeFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultiRowRangeFilter_descriptor,
+              internal_static_hbase_pb_MultiRowRangeFilter_descriptor,
               new java.lang.String[] { "RowRangeList", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
index 3007d25e47a..bde5403f7aa 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java
@@ -9,7 +9,7 @@ public final class HBaseProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code CompareType}
+   * Protobuf enum {@code hbase.pb.CompareType}
    *
    * 
    * Comparison operators 
@@ -136,11 +136,11 @@ public final class HBaseProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:CompareType)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.CompareType)
   }
 
   /**
-   * Protobuf enum {@code TimeUnit}
+   * Protobuf enum {@code hbase.pb.TimeUnit}
    */
   public enum TimeUnit
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -263,7 +263,7 @@ public final class HBaseProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:TimeUnit)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.TimeUnit)
   }
 
   public interface TableNameOrBuilder
@@ -290,7 +290,7 @@ public final class HBaseProtos {
     com.google.protobuf.ByteString getQualifier();
   }
   /**
-   * Protobuf type {@code TableName}
+   * Protobuf type {@code hbase.pb.TableName}
    *
    * 
    **
@@ -369,12 +369,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableName_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableName_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableName_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableName_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder.class);
     }
@@ -600,7 +600,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TableName}
+     * Protobuf type {@code hbase.pb.TableName}
      *
      * 
      **
@@ -612,12 +612,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableName_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableName_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableName_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableName_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder.class);
       }
@@ -655,7 +655,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableName_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableName_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getDefaultInstanceForType() {
@@ -811,7 +811,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TableName)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TableName)
     }
 
     static {
@@ -819,103 +819,103 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TableName)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TableName)
   }
 
   public interface TableSchemaOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .TableName table_name = 1;
+    // optional .hbase.pb.TableName table_name = 1;
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // repeated .BytesBytesPair attributes = 2;
+    // repeated .hbase.pb.BytesBytesPair attributes = 2;
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     java.util.List 
         getAttributesList();
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getAttributes(int index);
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     int getAttributesCount();
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     java.util.List 
         getAttributesOrBuilderList();
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getAttributesOrBuilder(
         int index);
 
-    // repeated .ColumnFamilySchema column_families = 3;
+    // repeated .hbase.pb.ColumnFamilySchema column_families = 3;
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     java.util.List 
         getColumnFamiliesList();
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies(int index);
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     int getColumnFamiliesCount();
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     java.util.List 
         getColumnFamiliesOrBuilderList();
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder(
         int index);
 
-    // repeated .NameStringPair configuration = 4;
+    // repeated .hbase.pb.NameStringPair configuration = 4;
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     java.util.List 
         getConfigurationList();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index);
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     int getConfigurationCount();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     java.util.List 
         getConfigurationOrBuilderList();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code TableSchema}
+   * Protobuf type {@code hbase.pb.TableSchema}
    *
    * 
    **
@@ -1031,12 +1031,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableSchema_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableSchema_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableSchema_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableSchema_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder.class);
     }
@@ -1057,130 +1057,130 @@ public final class HBaseProtos {
     }
 
     private int bitField0_;
-    // optional .TableName table_name = 1;
+    // optional .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_;
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // repeated .BytesBytesPair attributes = 2;
+    // repeated .hbase.pb.BytesBytesPair attributes = 2;
     public static final int ATTRIBUTES_FIELD_NUMBER = 2;
     private java.util.List attributes_;
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public java.util.List getAttributesList() {
       return attributes_;
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public java.util.List 
         getAttributesOrBuilderList() {
       return attributes_;
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public int getAttributesCount() {
       return attributes_.size();
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getAttributes(int index) {
       return attributes_.get(index);
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getAttributesOrBuilder(
         int index) {
       return attributes_.get(index);
     }
 
-    // repeated .ColumnFamilySchema column_families = 3;
+    // repeated .hbase.pb.ColumnFamilySchema column_families = 3;
     public static final int COLUMN_FAMILIES_FIELD_NUMBER = 3;
     private java.util.List columnFamilies_;
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     public java.util.List getColumnFamiliesList() {
       return columnFamilies_;
     }
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     public java.util.List 
         getColumnFamiliesOrBuilderList() {
       return columnFamilies_;
     }
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     public int getColumnFamiliesCount() {
       return columnFamilies_.size();
     }
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies(int index) {
       return columnFamilies_.get(index);
     }
     /**
-     * repeated .ColumnFamilySchema column_families = 3;
+     * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder(
         int index) {
       return columnFamilies_.get(index);
     }
 
-    // repeated .NameStringPair configuration = 4;
+    // repeated .hbase.pb.NameStringPair configuration = 4;
     public static final int CONFIGURATION_FIELD_NUMBER = 4;
     private java.util.List configuration_;
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public java.util.List getConfigurationList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public java.util.List 
         getConfigurationOrBuilderList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public int getConfigurationCount() {
       return configuration_.size();
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
       return configuration_.get(index);
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index) {
@@ -1401,7 +1401,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TableSchema}
+     * Protobuf type {@code hbase.pb.TableSchema}
      *
      * 
      **
@@ -1414,12 +1414,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableSchema_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableSchema_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableSchema_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableSchema_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder.class);
       }
@@ -1481,7 +1481,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableSchema_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableSchema_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getDefaultInstanceForType() {
@@ -1683,18 +1683,18 @@ public final class HBaseProtos {
       }
       private int bitField0_;
 
-      // optional .TableName table_name = 1;
+      // optional .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 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_;
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -1704,7 +1704,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -1720,7 +1720,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -1734,7 +1734,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -1753,7 +1753,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -1766,7 +1766,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -1774,7 +1774,7 @@ public final class HBaseProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -1784,7 +1784,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -1800,7 +1800,7 @@ public final class HBaseProtos {
         return tableNameBuilder_;
       }
 
-      // repeated .BytesBytesPair attributes = 2;
+      // repeated .hbase.pb.BytesBytesPair attributes = 2;
       private java.util.List attributes_ =
         java.util.Collections.emptyList();
       private void ensureAttributesIsMutable() {
@@ -1814,7 +1814,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder> attributesBuilder_;
 
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public java.util.List getAttributesList() {
         if (attributesBuilder_ == null) {
@@ -1824,7 +1824,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public int getAttributesCount() {
         if (attributesBuilder_ == null) {
@@ -1834,7 +1834,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getAttributes(int index) {
         if (attributesBuilder_ == null) {
@@ -1844,7 +1844,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder setAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -1861,7 +1861,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder setAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -1875,7 +1875,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
         if (attributesBuilder_ == null) {
@@ -1891,7 +1891,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -1908,7 +1908,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -1922,7 +1922,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -1936,7 +1936,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAllAttributes(
           java.lang.Iterable values) {
@@ -1950,7 +1950,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder clearAttributes() {
         if (attributesBuilder_ == null) {
@@ -1963,7 +1963,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder removeAttributes(int index) {
         if (attributesBuilder_ == null) {
@@ -1976,14 +1976,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder getAttributesBuilder(
           int index) {
         return getAttributesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getAttributesOrBuilder(
           int index) {
@@ -1993,7 +1993,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public java.util.List 
            getAttributesOrBuilderList() {
@@ -2004,14 +2004,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addAttributesBuilder() {
         return getAttributesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addAttributesBuilder(
           int index) {
@@ -2019,7 +2019,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public java.util.List 
            getAttributesBuilderList() {
@@ -2040,7 +2040,7 @@ public final class HBaseProtos {
         return attributesBuilder_;
       }
 
-      // repeated .ColumnFamilySchema column_families = 3;
+      // repeated .hbase.pb.ColumnFamilySchema column_families = 3;
       private java.util.List columnFamilies_ =
         java.util.Collections.emptyList();
       private void ensureColumnFamiliesIsMutable() {
@@ -2054,7 +2054,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> columnFamiliesBuilder_;
 
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public java.util.List getColumnFamiliesList() {
         if (columnFamiliesBuilder_ == null) {
@@ -2064,7 +2064,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public int getColumnFamiliesCount() {
         if (columnFamiliesBuilder_ == null) {
@@ -2074,7 +2074,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies(int index) {
         if (columnFamiliesBuilder_ == null) {
@@ -2084,7 +2084,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder setColumnFamilies(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
@@ -2101,7 +2101,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder setColumnFamilies(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -2115,7 +2115,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder addColumnFamilies(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnFamiliesBuilder_ == null) {
@@ -2131,7 +2131,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder addColumnFamilies(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
@@ -2148,7 +2148,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder addColumnFamilies(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -2162,7 +2162,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder addColumnFamilies(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -2176,7 +2176,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder addAllColumnFamilies(
           java.lang.Iterable values) {
@@ -2190,7 +2190,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder clearColumnFamilies() {
         if (columnFamiliesBuilder_ == null) {
@@ -2203,7 +2203,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public Builder removeColumnFamilies(int index) {
         if (columnFamiliesBuilder_ == null) {
@@ -2216,14 +2216,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder getColumnFamiliesBuilder(
           int index) {
         return getColumnFamiliesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder(
           int index) {
@@ -2233,7 +2233,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public java.util.List 
            getColumnFamiliesOrBuilderList() {
@@ -2244,14 +2244,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder addColumnFamiliesBuilder() {
         return getColumnFamiliesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance());
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder addColumnFamiliesBuilder(
           int index) {
@@ -2259,7 +2259,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance());
       }
       /**
-       * repeated .ColumnFamilySchema column_families = 3;
+       * repeated .hbase.pb.ColumnFamilySchema column_families = 3;
        */
       public java.util.List 
            getColumnFamiliesBuilderList() {
@@ -2280,7 +2280,7 @@ public final class HBaseProtos {
         return columnFamiliesBuilder_;
       }
 
-      // repeated .NameStringPair configuration = 4;
+      // repeated .hbase.pb.NameStringPair configuration = 4;
       private java.util.List configuration_ =
         java.util.Collections.emptyList();
       private void ensureConfigurationIsMutable() {
@@ -2294,7 +2294,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder> configurationBuilder_;
 
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List getConfigurationList() {
         if (configurationBuilder_ == null) {
@@ -2304,7 +2304,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public int getConfigurationCount() {
         if (configurationBuilder_ == null) {
@@ -2314,7 +2314,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -2324,7 +2324,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -2341,7 +2341,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -2355,7 +2355,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
         if (configurationBuilder_ == null) {
@@ -2371,7 +2371,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -2388,7 +2388,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -2402,7 +2402,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -2416,7 +2416,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addAllConfiguration(
           java.lang.Iterable values) {
@@ -2430,7 +2430,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder clearConfiguration() {
         if (configurationBuilder_ == null) {
@@ -2443,7 +2443,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder removeConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -2456,14 +2456,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder getConfigurationBuilder(
           int index) {
         return getConfigurationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
           int index) {
@@ -2473,7 +2473,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List 
            getConfigurationOrBuilderList() {
@@ -2484,14 +2484,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder() {
         return getConfigurationFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder(
           int index) {
@@ -2499,7 +2499,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List 
            getConfigurationBuilderList() {
@@ -2520,7 +2520,7 @@ public final class HBaseProtos {
         return configurationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:TableSchema)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TableSchema)
     }
 
     static {
@@ -2528,15 +2528,15 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TableSchema)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TableSchema)
   }
 
   public interface TableStateOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableState.State state = 1;
+    // required .hbase.pb.TableState.State state = 1;
     /**
-     * required .TableState.State state = 1;
+     * required .hbase.pb.TableState.State state = 1;
      *
      * 
      * This is the table's state.
@@ -2544,7 +2544,7 @@ public final class HBaseProtos {
      */
     boolean hasState();
     /**
-     * required .TableState.State state = 1;
+     * required .hbase.pb.TableState.State state = 1;
      *
      * 
      * This is the table's state.
@@ -2553,7 +2553,7 @@ public final class HBaseProtos {
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.State getState();
   }
   /**
-   * Protobuf type {@code TableState}
+   * Protobuf type {@code hbase.pb.TableState}
    *
    * 
    ** Denotes state of the table 
@@ -2632,12 +2632,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableState_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableState_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableState_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.Builder.class);
     }
@@ -2658,7 +2658,7 @@ public final class HBaseProtos {
     }
 
     /**
-     * Protobuf enum {@code TableState.State}
+     * Protobuf enum {@code hbase.pb.TableState.State}
      *
      * 
      * Table's current state
@@ -2758,15 +2758,15 @@ public final class HBaseProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:TableState.State)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.TableState.State)
     }
 
     private int bitField0_;
-    // required .TableState.State state = 1;
+    // required .hbase.pb.TableState.State state = 1;
     public static final int STATE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.State state_;
     /**
-     * required .TableState.State state = 1;
+     * required .hbase.pb.TableState.State state = 1;
      *
      * 
      * This is the table's state.
@@ -2776,7 +2776,7 @@ public final class HBaseProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableState.State state = 1;
+     * required .hbase.pb.TableState.State state = 1;
      *
      * 
      * This is the table's state.
@@ -2938,7 +2938,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TableState}
+     * Protobuf type {@code hbase.pb.TableState}
      *
      * 
      ** Denotes state of the table 
@@ -2949,12 +2949,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableStateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableState_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableState_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.Builder.class);
       }
@@ -2990,7 +2990,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableState_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState getDefaultInstanceForType() {
@@ -3063,10 +3063,10 @@ public final class HBaseProtos {
       }
       private int bitField0_;
 
-      // required .TableState.State state = 1;
+      // required .hbase.pb.TableState.State state = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.State state_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.State.ENABLED;
       /**
-       * required .TableState.State state = 1;
+       * required .hbase.pb.TableState.State state = 1;
        *
        * 
        * This is the table's state.
@@ -3076,7 +3076,7 @@ public final class HBaseProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableState.State state = 1;
+       * required .hbase.pb.TableState.State state = 1;
        *
        * 
        * This is the table's state.
@@ -3086,7 +3086,7 @@ public final class HBaseProtos {
         return state_;
       }
       /**
-       * required .TableState.State state = 1;
+       * required .hbase.pb.TableState.State state = 1;
        *
        * 
        * This is the table's state.
@@ -3102,7 +3102,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableState.State state = 1;
+       * required .hbase.pb.TableState.State state = 1;
        *
        * 
        * This is the table's state.
@@ -3115,7 +3115,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TableState)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TableState)
     }
 
     static {
@@ -3123,28 +3123,28 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TableState)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TableState)
   }
 
   public interface TableDescriptorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableSchema schema = 1;
+    // required .hbase.pb.TableSchema schema = 1;
     /**
-     * required .TableSchema schema = 1;
+     * required .hbase.pb.TableSchema schema = 1;
      */
     boolean hasSchema();
     /**
-     * required .TableSchema schema = 1;
+     * required .hbase.pb.TableSchema schema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getSchema();
     /**
-     * required .TableSchema schema = 1;
+     * required .hbase.pb.TableSchema schema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getSchemaOrBuilder();
   }
   /**
-   * Protobuf type {@code TableDescriptor}
+   * Protobuf type {@code hbase.pb.TableDescriptor}
    *
    * 
    ** On HDFS representation of table state. 
@@ -3225,12 +3225,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableDescriptor.Builder.class);
     }
@@ -3251,23 +3251,23 @@ public final class HBaseProtos {
     }
 
     private int bitField0_;
-    // required .TableSchema schema = 1;
+    // required .hbase.pb.TableSchema schema = 1;
     public static final int SCHEMA_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema schema_;
     /**
-     * required .TableSchema schema = 1;
+     * required .hbase.pb.TableSchema schema = 1;
      */
     public boolean hasSchema() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableSchema schema = 1;
+     * required .hbase.pb.TableSchema schema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getSchema() {
       return schema_;
     }
     /**
-     * required .TableSchema schema = 1;
+     * required .hbase.pb.TableSchema schema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getSchemaOrBuilder() {
       return schema_;
@@ -3429,7 +3429,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TableDescriptor}
+     * Protobuf type {@code hbase.pb.TableDescriptor}
      *
      * 
      ** On HDFS representation of table state. 
@@ -3440,12 +3440,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableDescriptor.Builder.class);
       }
@@ -3486,7 +3486,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TableDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TableDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableDescriptor getDefaultInstanceForType() {
@@ -3567,18 +3567,18 @@ public final class HBaseProtos {
       }
       private int bitField0_;
 
-      // required .TableSchema schema = 1;
+      // required .hbase.pb.TableSchema schema = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema schema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> schemaBuilder_;
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public boolean hasSchema() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getSchema() {
         if (schemaBuilder_ == null) {
@@ -3588,7 +3588,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public Builder setSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (schemaBuilder_ == null) {
@@ -3604,7 +3604,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public Builder setSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -3618,7 +3618,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public Builder mergeSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (schemaBuilder_ == null) {
@@ -3637,7 +3637,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public Builder clearSchema() {
         if (schemaBuilder_ == null) {
@@ -3650,7 +3650,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getSchemaBuilder() {
         bitField0_ |= 0x00000001;
@@ -3658,7 +3658,7 @@ public final class HBaseProtos {
         return getSchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getSchemaOrBuilder() {
         if (schemaBuilder_ != null) {
@@ -3668,7 +3668,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * required .TableSchema schema = 1;
+       * required .hbase.pb.TableSchema schema = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -3684,7 +3684,7 @@ public final class HBaseProtos {
         return schemaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:TableDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TableDescriptor)
     }
 
     static {
@@ -3692,7 +3692,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TableDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TableDescriptor)
   }
 
   public interface ColumnFamilySchemaOrBuilder
@@ -3708,58 +3708,58 @@ public final class HBaseProtos {
      */
     com.google.protobuf.ByteString getName();
 
-    // repeated .BytesBytesPair attributes = 2;
+    // repeated .hbase.pb.BytesBytesPair attributes = 2;
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     java.util.List 
         getAttributesList();
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getAttributes(int index);
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     int getAttributesCount();
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     java.util.List 
         getAttributesOrBuilderList();
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getAttributesOrBuilder(
         int index);
 
-    // repeated .NameStringPair configuration = 3;
+    // repeated .hbase.pb.NameStringPair configuration = 3;
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     java.util.List 
         getConfigurationList();
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index);
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     int getConfigurationCount();
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     java.util.List 
         getConfigurationOrBuilderList();
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ColumnFamilySchema}
+   * Protobuf type {@code hbase.pb.ColumnFamilySchema}
    *
    * 
    **
@@ -3856,12 +3856,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ColumnFamilySchema_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ColumnFamilySchema_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ColumnFamilySchema_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ColumnFamilySchema_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder.class);
     }
@@ -3898,72 +3898,72 @@ public final class HBaseProtos {
       return name_;
     }
 
-    // repeated .BytesBytesPair attributes = 2;
+    // repeated .hbase.pb.BytesBytesPair attributes = 2;
     public static final int ATTRIBUTES_FIELD_NUMBER = 2;
     private java.util.List attributes_;
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public java.util.List getAttributesList() {
       return attributes_;
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public java.util.List 
         getAttributesOrBuilderList() {
       return attributes_;
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public int getAttributesCount() {
       return attributes_.size();
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getAttributes(int index) {
       return attributes_.get(index);
     }
     /**
-     * repeated .BytesBytesPair attributes = 2;
+     * repeated .hbase.pb.BytesBytesPair attributes = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getAttributesOrBuilder(
         int index) {
       return attributes_.get(index);
     }
 
-    // repeated .NameStringPair configuration = 3;
+    // repeated .hbase.pb.NameStringPair configuration = 3;
     public static final int CONFIGURATION_FIELD_NUMBER = 3;
     private java.util.List configuration_;
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     public java.util.List getConfigurationList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     public java.util.List 
         getConfigurationOrBuilderList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     public int getConfigurationCount() {
       return configuration_.size();
     }
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
       return configuration_.get(index);
     }
     /**
-     * repeated .NameStringPair configuration = 3;
+     * repeated .hbase.pb.NameStringPair configuration = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index) {
@@ -4162,7 +4162,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ColumnFamilySchema}
+     * Protobuf type {@code hbase.pb.ColumnFamilySchema}
      *
      * 
      **
@@ -4175,12 +4175,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ColumnFamilySchema_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ColumnFamilySchema_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ColumnFamilySchema_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ColumnFamilySchema_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder.class);
       }
@@ -4230,7 +4230,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ColumnFamilySchema_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ColumnFamilySchema_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getDefaultInstanceForType() {
@@ -4421,7 +4421,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // repeated .BytesBytesPair attributes = 2;
+      // repeated .hbase.pb.BytesBytesPair attributes = 2;
       private java.util.List attributes_ =
         java.util.Collections.emptyList();
       private void ensureAttributesIsMutable() {
@@ -4435,7 +4435,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder> attributesBuilder_;
 
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public java.util.List getAttributesList() {
         if (attributesBuilder_ == null) {
@@ -4445,7 +4445,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public int getAttributesCount() {
         if (attributesBuilder_ == null) {
@@ -4455,7 +4455,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getAttributes(int index) {
         if (attributesBuilder_ == null) {
@@ -4465,7 +4465,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder setAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -4482,7 +4482,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder setAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -4496,7 +4496,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
         if (attributesBuilder_ == null) {
@@ -4512,7 +4512,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -4529,7 +4529,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -4543,7 +4543,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAttributes(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -4557,7 +4557,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder addAllAttributes(
           java.lang.Iterable values) {
@@ -4571,7 +4571,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder clearAttributes() {
         if (attributesBuilder_ == null) {
@@ -4584,7 +4584,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public Builder removeAttributes(int index) {
         if (attributesBuilder_ == null) {
@@ -4597,14 +4597,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder getAttributesBuilder(
           int index) {
         return getAttributesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getAttributesOrBuilder(
           int index) {
@@ -4614,7 +4614,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public java.util.List 
            getAttributesOrBuilderList() {
@@ -4625,14 +4625,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addAttributesBuilder() {
         return getAttributesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addAttributesBuilder(
           int index) {
@@ -4640,7 +4640,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair attributes = 2;
+       * repeated .hbase.pb.BytesBytesPair attributes = 2;
        */
       public java.util.List 
            getAttributesBuilderList() {
@@ -4661,7 +4661,7 @@ public final class HBaseProtos {
         return attributesBuilder_;
       }
 
-      // repeated .NameStringPair configuration = 3;
+      // repeated .hbase.pb.NameStringPair configuration = 3;
       private java.util.List configuration_ =
         java.util.Collections.emptyList();
       private void ensureConfigurationIsMutable() {
@@ -4675,7 +4675,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder> configurationBuilder_;
 
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public java.util.List getConfigurationList() {
         if (configurationBuilder_ == null) {
@@ -4685,7 +4685,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public int getConfigurationCount() {
         if (configurationBuilder_ == null) {
@@ -4695,7 +4695,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -4705,7 +4705,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -4722,7 +4722,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -4736,7 +4736,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder addConfiguration(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
         if (configurationBuilder_ == null) {
@@ -4752,7 +4752,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -4769,7 +4769,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder addConfiguration(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -4783,7 +4783,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -4797,7 +4797,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder addAllConfiguration(
           java.lang.Iterable values) {
@@ -4811,7 +4811,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder clearConfiguration() {
         if (configurationBuilder_ == null) {
@@ -4824,7 +4824,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public Builder removeConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -4837,14 +4837,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder getConfigurationBuilder(
           int index) {
         return getConfigurationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
           int index) {
@@ -4854,7 +4854,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public java.util.List 
            getConfigurationOrBuilderList() {
@@ -4865,14 +4865,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder() {
         return getConfigurationFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder(
           int index) {
@@ -4880,7 +4880,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 3;
+       * repeated .hbase.pb.NameStringPair configuration = 3;
        */
       public java.util.List 
            getConfigurationBuilderList() {
@@ -4901,7 +4901,7 @@ public final class HBaseProtos {
         return configurationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ColumnFamilySchema)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ColumnFamilySchema)
     }
 
     static {
@@ -4909,7 +4909,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ColumnFamilySchema)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ColumnFamilySchema)
   }
 
   public interface RegionInfoOrBuilder
@@ -4925,17 +4925,17 @@ public final class HBaseProtos {
      */
     long getRegionId();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -4990,7 +4990,7 @@ public final class HBaseProtos {
     int getReplicaId();
   }
   /**
-   * Protobuf type {@code RegionInfo}
+   * Protobuf type {@code hbase.pb.RegionInfo}
    *
    * 
    **
@@ -5102,12 +5102,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionInfo_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionInfo_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionInfo_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder.class);
     }
@@ -5144,23 +5144,23 @@ public final class HBaseProtos {
       return regionId_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -5508,7 +5508,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionInfo}
+     * Protobuf type {@code hbase.pb.RegionInfo}
      *
      * 
      **
@@ -5520,12 +5520,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder.class);
       }
@@ -5578,7 +5578,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionInfo_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getDefaultInstanceForType() {
@@ -5738,18 +5738,18 @@ public final class HBaseProtos {
         return this;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -5759,7 +5759,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -5775,7 +5775,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -5789,7 +5789,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -5808,7 +5808,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -5821,7 +5821,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -5829,7 +5829,7 @@ public final class HBaseProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -5839,7 +5839,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -6026,7 +6026,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionInfo)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionInfo)
     }
 
     static {
@@ -6034,39 +6034,39 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionInfo)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionInfo)
   }
 
   public interface FavoredNodesOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .ServerName favored_node = 1;
+    // repeated .hbase.pb.ServerName favored_node = 1;
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     java.util.List 
         getFavoredNodeList();
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNode(int index);
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     int getFavoredNodeCount();
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     java.util.List 
         getFavoredNodeOrBuilderList();
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodeOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code FavoredNodes}
+   * Protobuf type {@code hbase.pb.FavoredNodes}
    *
    * 
    **
@@ -6146,12 +6146,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_FavoredNodes_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_FavoredNodes_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_FavoredNodes_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_FavoredNodes_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.FavoredNodes.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.FavoredNodes.Builder.class);
     }
@@ -6171,36 +6171,36 @@ public final class HBaseProtos {
       return PARSER;
     }
 
-    // repeated .ServerName favored_node = 1;
+    // repeated .hbase.pb.ServerName favored_node = 1;
     public static final int FAVORED_NODE_FIELD_NUMBER = 1;
     private java.util.List favoredNode_;
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     public java.util.List getFavoredNodeList() {
       return favoredNode_;
     }
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     public java.util.List 
         getFavoredNodeOrBuilderList() {
       return favoredNode_;
     }
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     public int getFavoredNodeCount() {
       return favoredNode_.size();
     }
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNode(int index) {
       return favoredNode_.get(index);
     }
     /**
-     * repeated .ServerName favored_node = 1;
+     * repeated .hbase.pb.ServerName favored_node = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodeOrBuilder(
         int index) {
@@ -6358,7 +6358,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FavoredNodes}
+     * Protobuf type {@code hbase.pb.FavoredNodes}
      *
      * 
      **
@@ -6370,12 +6370,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.FavoredNodesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_FavoredNodes_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_FavoredNodes_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_FavoredNodes_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_FavoredNodes_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.FavoredNodes.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.FavoredNodes.Builder.class);
       }
@@ -6416,7 +6416,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_FavoredNodes_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_FavoredNodes_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.FavoredNodes getDefaultInstanceForType() {
@@ -6517,7 +6517,7 @@ public final class HBaseProtos {
       }
       private int bitField0_;
 
-      // repeated .ServerName favored_node = 1;
+      // repeated .hbase.pb.ServerName favored_node = 1;
       private java.util.List favoredNode_ =
         java.util.Collections.emptyList();
       private void ensureFavoredNodeIsMutable() {
@@ -6531,7 +6531,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> favoredNodeBuilder_;
 
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public java.util.List getFavoredNodeList() {
         if (favoredNodeBuilder_ == null) {
@@ -6541,7 +6541,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public int getFavoredNodeCount() {
         if (favoredNodeBuilder_ == null) {
@@ -6551,7 +6551,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getFavoredNode(int index) {
         if (favoredNodeBuilder_ == null) {
@@ -6561,7 +6561,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder setFavoredNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -6578,7 +6578,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder setFavoredNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -6592,7 +6592,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder addFavoredNode(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (favoredNodeBuilder_ == null) {
@@ -6608,7 +6608,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder addFavoredNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
@@ -6625,7 +6625,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder addFavoredNode(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -6639,7 +6639,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder addFavoredNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -6653,7 +6653,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder addAllFavoredNode(
           java.lang.Iterable values) {
@@ -6667,7 +6667,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder clearFavoredNode() {
         if (favoredNodeBuilder_ == null) {
@@ -6680,7 +6680,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public Builder removeFavoredNode(int index) {
         if (favoredNodeBuilder_ == null) {
@@ -6693,14 +6693,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getFavoredNodeBuilder(
           int index) {
         return getFavoredNodeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getFavoredNodeOrBuilder(
           int index) {
@@ -6710,7 +6710,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public java.util.List 
            getFavoredNodeOrBuilderList() {
@@ -6721,14 +6721,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addFavoredNodeBuilder() {
         return getFavoredNodeFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder addFavoredNodeBuilder(
           int index) {
@@ -6736,7 +6736,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance());
       }
       /**
-       * repeated .ServerName favored_node = 1;
+       * repeated .hbase.pb.ServerName favored_node = 1;
        */
       public java.util.List 
            getFavoredNodeBuilderList() {
@@ -6757,7 +6757,7 @@ public final class HBaseProtos {
         return favoredNodeBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:FavoredNodes)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FavoredNodes)
     }
 
     static {
@@ -6765,19 +6765,19 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FavoredNodes)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FavoredNodes)
   }
 
   public interface RegionSpecifierOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier.RegionSpecifierType type = 1;
+    // required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
     /**
-     * required .RegionSpecifier.RegionSpecifierType type = 1;
+     * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
      */
     boolean hasType();
     /**
-     * required .RegionSpecifier.RegionSpecifierType type = 1;
+     * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType getType();
 
@@ -6792,7 +6792,7 @@ public final class HBaseProtos {
     com.google.protobuf.ByteString getValue();
   }
   /**
-   * Protobuf type {@code RegionSpecifier}
+   * Protobuf type {@code hbase.pb.RegionSpecifier}
    *
    * 
    **
@@ -6880,12 +6880,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionSpecifier_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionSpecifier_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionSpecifier_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionSpecifier_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder.class);
     }
@@ -6906,7 +6906,7 @@ public final class HBaseProtos {
     }
 
     /**
-     * Protobuf enum {@code RegionSpecifier.RegionSpecifierType}
+     * Protobuf enum {@code hbase.pb.RegionSpecifier.RegionSpecifierType}
      */
     public enum RegionSpecifierType
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -7000,21 +7000,21 @@ public final class HBaseProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:RegionSpecifier.RegionSpecifierType)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.RegionSpecifier.RegionSpecifierType)
     }
 
     private int bitField0_;
-    // required .RegionSpecifier.RegionSpecifierType type = 1;
+    // required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType type_;
     /**
-     * required .RegionSpecifier.RegionSpecifierType type = 1;
+     * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier.RegionSpecifierType type = 1;
+     * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType getType() {
       return type_;
@@ -7209,7 +7209,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionSpecifier}
+     * Protobuf type {@code hbase.pb.RegionSpecifier}
      *
      * 
      **
@@ -7224,12 +7224,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionSpecifier_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionSpecifier_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionSpecifier_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionSpecifier_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder.class);
       }
@@ -7267,7 +7267,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionSpecifier_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionSpecifier_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getDefaultInstanceForType() {
@@ -7351,22 +7351,22 @@ public final class HBaseProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier.RegionSpecifierType type = 1;
+      // required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType type_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType.REGION_NAME;
       /**
-       * required .RegionSpecifier.RegionSpecifierType type = 1;
+       * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier.RegionSpecifierType type = 1;
+       * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType getType() {
         return type_;
       }
       /**
-       * required .RegionSpecifier.RegionSpecifierType type = 1;
+       * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
        */
       public Builder setType(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType value) {
         if (value == null) {
@@ -7378,7 +7378,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier.RegionSpecifierType type = 1;
+       * required .hbase.pb.RegionSpecifier.RegionSpecifierType type = 1;
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -7423,7 +7423,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionSpecifier)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionSpecifier)
     }
 
     static {
@@ -7431,7 +7431,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionSpecifier)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionSpecifier)
   }
 
   public interface TimeRangeOrBuilder
@@ -7458,7 +7458,7 @@ public final class HBaseProtos {
     long getTo();
   }
   /**
-   * Protobuf type {@code TimeRange}
+   * Protobuf type {@code hbase.pb.TimeRange}
    *
    * 
    **
@@ -7540,12 +7540,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TimeRange_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TimeRange_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TimeRange_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TimeRange_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder.class);
     }
@@ -7763,7 +7763,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TimeRange}
+     * Protobuf type {@code hbase.pb.TimeRange}
      *
      * 
      **
@@ -7778,12 +7778,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRangeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TimeRange_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TimeRange_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TimeRange_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TimeRange_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange.Builder.class);
       }
@@ -7821,7 +7821,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_TimeRange_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_TimeRange_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeRange getDefaultInstanceForType() {
@@ -7963,7 +7963,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TimeRange)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TimeRange)
     }
 
     static {
@@ -7971,7 +7971,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TimeRange)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TimeRange)
   }
 
   public interface ServerNameOrBuilder
@@ -8013,7 +8013,7 @@ public final class HBaseProtos {
     long getStartCode();
   }
   /**
-   * Protobuf type {@code ServerName}
+   * Protobuf type {@code hbase.pb.ServerName}
    *
    * 
    **
@@ -8097,12 +8097,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ServerName_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ServerName_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ServerName_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ServerName_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder.class);
     }
@@ -8384,7 +8384,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ServerName}
+     * Protobuf type {@code hbase.pb.ServerName}
      *
      * 
      **
@@ -8396,12 +8396,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ServerName_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ServerName_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ServerName_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ServerName_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder.class);
       }
@@ -8441,7 +8441,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ServerName_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ServerName_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDefaultInstanceForType() {
@@ -8670,7 +8670,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ServerName)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ServerName)
     }
 
     static {
@@ -8678,7 +8678,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ServerName)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ServerName)
   }
 
   public interface CoprocessorOrBuilder
@@ -8700,7 +8700,7 @@ public final class HBaseProtos {
         getNameBytes();
   }
   /**
-   * Protobuf type {@code Coprocessor}
+   * Protobuf type {@code hbase.pb.Coprocessor}
    */
   public static final class Coprocessor extends
       com.google.protobuf.GeneratedMessage
@@ -8769,12 +8769,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_Coprocessor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_Coprocessor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_Coprocessor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_Coprocessor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder.class);
     }
@@ -8990,19 +8990,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Coprocessor}
+     * Protobuf type {@code hbase.pb.Coprocessor}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.CoprocessorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_Coprocessor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_Coprocessor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_Coprocessor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_Coprocessor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor.Builder.class);
       }
@@ -9038,7 +9038,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_Coprocessor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_Coprocessor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.Coprocessor getDefaultInstanceForType() {
@@ -9187,7 +9187,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Coprocessor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Coprocessor)
     }
 
     static {
@@ -9195,7 +9195,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Coprocessor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Coprocessor)
   }
 
   public interface NameStringPairOrBuilder
@@ -9232,7 +9232,7 @@ public final class HBaseProtos {
         getValueBytes();
   }
   /**
-   * Protobuf type {@code NameStringPair}
+   * Protobuf type {@code hbase.pb.NameStringPair}
    */
   public static final class NameStringPair extends
       com.google.protobuf.GeneratedMessage
@@ -9306,12 +9306,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameStringPair_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameStringPair_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameStringPair_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameStringPair_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder.class);
     }
@@ -9591,19 +9591,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code NameStringPair}
+     * Protobuf type {@code hbase.pb.NameStringPair}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameStringPair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameStringPair_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameStringPair_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameStringPair_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder.class);
       }
@@ -9641,7 +9641,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameStringPair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameStringPair_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getDefaultInstanceForType() {
@@ -9877,7 +9877,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:NameStringPair)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.NameStringPair)
     }
 
     static {
@@ -9885,7 +9885,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:NameStringPair)
+    // @@protoc_insertion_point(class_scope:hbase.pb.NameStringPair)
   }
 
   public interface NameBytesPairOrBuilder
@@ -9917,7 +9917,7 @@ public final class HBaseProtos {
     com.google.protobuf.ByteString getValue();
   }
   /**
-   * Protobuf type {@code NameBytesPair}
+   * Protobuf type {@code hbase.pb.NameBytesPair}
    */
   public static final class NameBytesPair extends
       com.google.protobuf.GeneratedMessage
@@ -9991,12 +9991,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameBytesPair_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameBytesPair_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameBytesPair_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameBytesPair_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder.class);
     }
@@ -10245,19 +10245,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code NameBytesPair}
+     * Protobuf type {@code hbase.pb.NameBytesPair}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPairOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameBytesPair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameBytesPair_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameBytesPair_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameBytesPair_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair.Builder.class);
       }
@@ -10295,7 +10295,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameBytesPair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameBytesPair_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair getDefaultInstanceForType() {
@@ -10487,7 +10487,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:NameBytesPair)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.NameBytesPair)
     }
 
     static {
@@ -10495,7 +10495,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:NameBytesPair)
+    // @@protoc_insertion_point(class_scope:hbase.pb.NameBytesPair)
   }
 
   public interface BytesBytesPairOrBuilder
@@ -10522,7 +10522,7 @@ public final class HBaseProtos {
     com.google.protobuf.ByteString getSecond();
   }
   /**
-   * Protobuf type {@code BytesBytesPair}
+   * Protobuf type {@code hbase.pb.BytesBytesPair}
    */
   public static final class BytesBytesPair extends
       com.google.protobuf.GeneratedMessage
@@ -10596,12 +10596,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BytesBytesPair_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BytesBytesPair_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BytesBytesPair_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BytesBytesPair_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder.class);
     }
@@ -10827,19 +10827,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BytesBytesPair}
+     * Protobuf type {@code hbase.pb.BytesBytesPair}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BytesBytesPair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BytesBytesPair_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BytesBytesPair_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BytesBytesPair_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder.class);
       }
@@ -10877,7 +10877,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BytesBytesPair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BytesBytesPair_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getDefaultInstanceForType() {
@@ -11033,7 +11033,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BytesBytesPair)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BytesBytesPair)
     }
 
     static {
@@ -11041,7 +11041,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BytesBytesPair)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BytesBytesPair)
   }
 
   public interface NameInt64PairOrBuilder
@@ -11073,7 +11073,7 @@ public final class HBaseProtos {
     long getValue();
   }
   /**
-   * Protobuf type {@code NameInt64Pair}
+   * Protobuf type {@code hbase.pb.NameInt64Pair}
    */
   public static final class NameInt64Pair extends
       com.google.protobuf.GeneratedMessage
@@ -11147,12 +11147,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameInt64Pair_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameInt64Pair_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameInt64Pair_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameInt64Pair_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder.class);
     }
@@ -11397,19 +11397,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code NameInt64Pair}
+     * Protobuf type {@code hbase.pb.NameInt64Pair}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64PairOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameInt64Pair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameInt64Pair_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameInt64Pair_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameInt64Pair_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder.class);
       }
@@ -11447,7 +11447,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NameInt64Pair_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NameInt64Pair_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair getDefaultInstanceForType() {
@@ -11632,7 +11632,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:NameInt64Pair)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.NameInt64Pair)
     }
 
     static {
@@ -11640,7 +11640,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:NameInt64Pair)
+    // @@protoc_insertion_point(class_scope:hbase.pb.NameInt64Pair)
   }
 
   public interface SnapshotDescriptionOrBuilder
@@ -11698,13 +11698,13 @@ public final class HBaseProtos {
      */
     long getCreationTime();
 
-    // optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+    // optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
     /**
-     * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+     * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
      */
     boolean hasType();
     /**
-     * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+     * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type getType();
 
@@ -11734,7 +11734,7 @@ public final class HBaseProtos {
         getOwnerBytes();
   }
   /**
-   * Protobuf type {@code SnapshotDescription}
+   * Protobuf type {@code hbase.pb.SnapshotDescription}
    *
    * 
    **
@@ -11839,12 +11839,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_SnapshotDescription_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_SnapshotDescription_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_SnapshotDescription_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_SnapshotDescription_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder.class);
     }
@@ -11865,7 +11865,7 @@ public final class HBaseProtos {
     }
 
     /**
-     * Protobuf enum {@code SnapshotDescription.Type}
+     * Protobuf enum {@code hbase.pb.SnapshotDescription.Type}
      */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -11952,7 +11952,7 @@ public final class HBaseProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:SnapshotDescription.Type)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.SnapshotDescription.Type)
     }
 
     private int bitField0_;
@@ -12070,17 +12070,17 @@ public final class HBaseProtos {
       return creationTime_;
     }
 
-    // optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+    // optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
     public static final int TYPE_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type type_;
     /**
-     * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+     * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+     * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type getType() {
       return type_;
@@ -12382,7 +12382,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SnapshotDescription}
+     * Protobuf type {@code hbase.pb.SnapshotDescription}
      *
      * 
      **
@@ -12394,12 +12394,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_SnapshotDescription_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_SnapshotDescription_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_SnapshotDescription_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_SnapshotDescription_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder.class);
       }
@@ -12445,7 +12445,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_SnapshotDescription_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_SnapshotDescription_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getDefaultInstanceForType() {
@@ -12764,22 +12764,22 @@ public final class HBaseProtos {
         return this;
       }
 
-      // optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+      // optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type type_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type.FLUSH;
       /**
-       * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+       * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+       * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type getType() {
         return type_;
       }
       /**
-       * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+       * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
        */
       public Builder setType(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type value) {
         if (value == null) {
@@ -12791,7 +12791,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription.Type type = 4 [default = FLUSH];
+       * optional .hbase.pb.SnapshotDescription.Type type = 4 [default = FLUSH];
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -12907,7 +12907,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SnapshotDescription)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SnapshotDescription)
     }
 
     static {
@@ -12915,7 +12915,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SnapshotDescription)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SnapshotDescription)
   }
 
   public interface ProcedureDescriptionOrBuilder
@@ -12985,33 +12985,33 @@ public final class HBaseProtos {
      */
     long getCreationTime();
 
-    // repeated .NameStringPair configuration = 4;
+    // repeated .hbase.pb.NameStringPair configuration = 4;
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     java.util.List 
         getConfigurationList();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index);
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     int getConfigurationCount();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     java.util.List 
         getConfigurationOrBuilderList();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ProcedureDescription}
+   * Protobuf type {@code hbase.pb.ProcedureDescription}
    *
    * 
    **
@@ -13106,12 +13106,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ProcedureDescription_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ProcedureDescription_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ProcedureDescription_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ProcedureDescription_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder.class);
     }
@@ -13258,36 +13258,36 @@ public final class HBaseProtos {
       return creationTime_;
     }
 
-    // repeated .NameStringPair configuration = 4;
+    // repeated .hbase.pb.NameStringPair configuration = 4;
     public static final int CONFIGURATION_FIELD_NUMBER = 4;
     private java.util.List configuration_;
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public java.util.List getConfigurationList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public java.util.List 
         getConfigurationOrBuilderList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public int getConfigurationCount() {
       return configuration_.size();
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
       return configuration_.get(index);
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index) {
@@ -13500,7 +13500,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcedureDescription}
+     * Protobuf type {@code hbase.pb.ProcedureDescription}
      *
      * 
      **
@@ -13512,12 +13512,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ProcedureDescription_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ProcedureDescription_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ProcedureDescription_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ProcedureDescription_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder.class);
       }
@@ -13564,7 +13564,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_ProcedureDescription_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_ProcedureDescription_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getDefaultInstanceForType() {
@@ -13925,7 +13925,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // repeated .NameStringPair configuration = 4;
+      // repeated .hbase.pb.NameStringPair configuration = 4;
       private java.util.List configuration_ =
         java.util.Collections.emptyList();
       private void ensureConfigurationIsMutable() {
@@ -13939,7 +13939,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder> configurationBuilder_;
 
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List getConfigurationList() {
         if (configurationBuilder_ == null) {
@@ -13949,7 +13949,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public int getConfigurationCount() {
         if (configurationBuilder_ == null) {
@@ -13959,7 +13959,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -13969,7 +13969,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -13986,7 +13986,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -14000,7 +14000,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
         if (configurationBuilder_ == null) {
@@ -14016,7 +14016,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -14033,7 +14033,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -14047,7 +14047,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -14061,7 +14061,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addAllConfiguration(
           java.lang.Iterable values) {
@@ -14075,7 +14075,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder clearConfiguration() {
         if (configurationBuilder_ == null) {
@@ -14088,7 +14088,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder removeConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -14101,14 +14101,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder getConfigurationBuilder(
           int index) {
         return getConfigurationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
           int index) {
@@ -14118,7 +14118,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List 
            getConfigurationOrBuilderList() {
@@ -14129,14 +14129,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder() {
         return getConfigurationFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder(
           int index) {
@@ -14144,7 +14144,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List 
            getConfigurationBuilderList() {
@@ -14165,7 +14165,7 @@ public final class HBaseProtos {
         return configurationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcedureDescription)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcedureDescription)
     }
 
     static {
@@ -14173,14 +14173,14 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcedureDescription)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcedureDescription)
   }
 
   public interface EmptyMsgOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code EmptyMsg}
+   * Protobuf type {@code hbase.pb.EmptyMsg}
    */
   public static final class EmptyMsg extends
       com.google.protobuf.GeneratedMessage
@@ -14243,12 +14243,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_EmptyMsg_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_EmptyMsg_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_EmptyMsg_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_EmptyMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg.Builder.class);
     }
@@ -14399,19 +14399,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code EmptyMsg}
+     * Protobuf type {@code hbase.pb.EmptyMsg}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_EmptyMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_EmptyMsg_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_EmptyMsg_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_EmptyMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg.Builder.class);
       }
@@ -14445,7 +14445,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_EmptyMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_EmptyMsg_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg getDefaultInstanceForType() {
@@ -14503,7 +14503,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:EmptyMsg)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.EmptyMsg)
     }
 
     static {
@@ -14511,7 +14511,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:EmptyMsg)
+    // @@protoc_insertion_point(class_scope:hbase.pb.EmptyMsg)
   }
 
   public interface LongMsgOrBuilder
@@ -14528,7 +14528,7 @@ public final class HBaseProtos {
     long getLongMsg();
   }
   /**
-   * Protobuf type {@code LongMsg}
+   * Protobuf type {@code hbase.pb.LongMsg}
    */
   public static final class LongMsg extends
       com.google.protobuf.GeneratedMessage
@@ -14597,12 +14597,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_LongMsg_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_LongMsg_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_LongMsg_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_LongMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg.Builder.class);
     }
@@ -14791,19 +14791,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code LongMsg}
+     * Protobuf type {@code hbase.pb.LongMsg}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_LongMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_LongMsg_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_LongMsg_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_LongMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg.Builder.class);
       }
@@ -14839,7 +14839,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_LongMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_LongMsg_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg getDefaultInstanceForType() {
@@ -14945,7 +14945,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:LongMsg)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.LongMsg)
     }
 
     static {
@@ -14953,7 +14953,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:LongMsg)
+    // @@protoc_insertion_point(class_scope:hbase.pb.LongMsg)
   }
 
   public interface DoubleMsgOrBuilder
@@ -14970,7 +14970,7 @@ public final class HBaseProtos {
     double getDoubleMsg();
   }
   /**
-   * Protobuf type {@code DoubleMsg}
+   * Protobuf type {@code hbase.pb.DoubleMsg}
    */
   public static final class DoubleMsg extends
       com.google.protobuf.GeneratedMessage
@@ -15039,12 +15039,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_DoubleMsg_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_DoubleMsg_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_DoubleMsg_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_DoubleMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg.Builder.class);
     }
@@ -15233,19 +15233,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DoubleMsg}
+     * Protobuf type {@code hbase.pb.DoubleMsg}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_DoubleMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_DoubleMsg_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_DoubleMsg_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_DoubleMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg.Builder.class);
       }
@@ -15281,7 +15281,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_DoubleMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_DoubleMsg_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg getDefaultInstanceForType() {
@@ -15387,7 +15387,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DoubleMsg)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DoubleMsg)
     }
 
     static {
@@ -15395,7 +15395,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DoubleMsg)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DoubleMsg)
   }
 
   public interface BigDecimalMsgOrBuilder
@@ -15412,7 +15412,7 @@ public final class HBaseProtos {
     com.google.protobuf.ByteString getBigdecimalMsg();
   }
   /**
-   * Protobuf type {@code BigDecimalMsg}
+   * Protobuf type {@code hbase.pb.BigDecimalMsg}
    */
   public static final class BigDecimalMsg extends
       com.google.protobuf.GeneratedMessage
@@ -15481,12 +15481,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BigDecimalMsg_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BigDecimalMsg_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BigDecimalMsg_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BigDecimalMsg_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg.Builder.class);
     }
@@ -15675,19 +15675,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BigDecimalMsg}
+     * Protobuf type {@code hbase.pb.BigDecimalMsg}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsgOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BigDecimalMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BigDecimalMsg_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BigDecimalMsg_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BigDecimalMsg_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg.Builder.class);
       }
@@ -15723,7 +15723,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_BigDecimalMsg_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_BigDecimalMsg_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg getDefaultInstanceForType() {
@@ -15832,7 +15832,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BigDecimalMsg)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BigDecimalMsg)
     }
 
     static {
@@ -15840,7 +15840,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BigDecimalMsg)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BigDecimalMsg)
   }
 
   public interface UUIDOrBuilder
@@ -15867,7 +15867,7 @@ public final class HBaseProtos {
     long getMostSigBits();
   }
   /**
-   * Protobuf type {@code UUID}
+   * Protobuf type {@code hbase.pb.UUID}
    */
   public static final class UUID extends
       com.google.protobuf.GeneratedMessage
@@ -15941,12 +15941,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_UUID_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_UUID_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_UUID_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_UUID_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.Builder.class);
     }
@@ -16172,19 +16172,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UUID}
+     * Protobuf type {@code hbase.pb.UUID}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUIDOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_UUID_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_UUID_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_UUID_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_UUID_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.Builder.class);
       }
@@ -16222,7 +16222,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_UUID_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_UUID_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID getDefaultInstanceForType() {
@@ -16372,7 +16372,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UUID)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UUID)
     }
 
     static {
@@ -16380,7 +16380,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UUID)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UUID)
   }
 
   public interface NamespaceDescriptorOrBuilder
@@ -16396,33 +16396,33 @@ public final class HBaseProtos {
      */
     com.google.protobuf.ByteString getName();
 
-    // repeated .NameStringPair configuration = 2;
+    // repeated .hbase.pb.NameStringPair configuration = 2;
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     java.util.List 
         getConfigurationList();
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index);
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     int getConfigurationCount();
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     java.util.List 
         getConfigurationOrBuilderList();
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code NamespaceDescriptor}
+   * Protobuf type {@code hbase.pb.NamespaceDescriptor}
    */
   public static final class NamespaceDescriptor extends
       com.google.protobuf.GeneratedMessage
@@ -16502,12 +16502,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NamespaceDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NamespaceDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NamespaceDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NamespaceDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder.class);
     }
@@ -16544,36 +16544,36 @@ public final class HBaseProtos {
       return name_;
     }
 
-    // repeated .NameStringPair configuration = 2;
+    // repeated .hbase.pb.NameStringPair configuration = 2;
     public static final int CONFIGURATION_FIELD_NUMBER = 2;
     private java.util.List configuration_;
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     public java.util.List getConfigurationList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     public java.util.List 
         getConfigurationOrBuilderList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     public int getConfigurationCount() {
       return configuration_.size();
     }
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
       return configuration_.get(index);
     }
     /**
-     * repeated .NameStringPair configuration = 2;
+     * repeated .hbase.pb.NameStringPair configuration = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index) {
@@ -16752,19 +16752,19 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code NamespaceDescriptor}
+     * Protobuf type {@code hbase.pb.NamespaceDescriptor}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NamespaceDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NamespaceDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NamespaceDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NamespaceDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder.class);
       }
@@ -16807,7 +16807,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_NamespaceDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_NamespaceDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getDefaultInstanceForType() {
@@ -16957,7 +16957,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // repeated .NameStringPair configuration = 2;
+      // repeated .hbase.pb.NameStringPair configuration = 2;
       private java.util.List configuration_ =
         java.util.Collections.emptyList();
       private void ensureConfigurationIsMutable() {
@@ -16971,7 +16971,7 @@ public final class HBaseProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder> configurationBuilder_;
 
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public java.util.List getConfigurationList() {
         if (configurationBuilder_ == null) {
@@ -16981,7 +16981,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public int getConfigurationCount() {
         if (configurationBuilder_ == null) {
@@ -16991,7 +16991,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -17001,7 +17001,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -17018,7 +17018,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -17032,7 +17032,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder addConfiguration(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
         if (configurationBuilder_ == null) {
@@ -17048,7 +17048,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -17065,7 +17065,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder addConfiguration(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -17079,7 +17079,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -17093,7 +17093,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder addAllConfiguration(
           java.lang.Iterable values) {
@@ -17107,7 +17107,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder clearConfiguration() {
         if (configurationBuilder_ == null) {
@@ -17120,7 +17120,7 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public Builder removeConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -17133,14 +17133,14 @@ public final class HBaseProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder getConfigurationBuilder(
           int index) {
         return getConfigurationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
           int index) {
@@ -17150,7 +17150,7 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public java.util.List 
            getConfigurationOrBuilderList() {
@@ -17161,14 +17161,14 @@ public final class HBaseProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder() {
         return getConfigurationFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder(
           int index) {
@@ -17176,7 +17176,7 @@ public final class HBaseProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 2;
+       * repeated .hbase.pb.NameStringPair configuration = 2;
        */
       public java.util.List 
            getConfigurationBuilderList() {
@@ -17197,7 +17197,7 @@ public final class HBaseProtos {
         return configurationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:NamespaceDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.NamespaceDescriptor)
     }
 
     static {
@@ -17205,7 +17205,7 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:NamespaceDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.NamespaceDescriptor)
   }
 
   public interface RegionServerInfoOrBuilder
@@ -17222,7 +17222,7 @@ public final class HBaseProtos {
     int getInfoPort();
   }
   /**
-   * Protobuf type {@code RegionServerInfo}
+   * Protobuf type {@code hbase.pb.RegionServerInfo}
    *
    * 
    **
@@ -17296,12 +17296,12 @@ public final class HBaseProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionServerInfo_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionServerInfo_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionServerInfo_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionServerInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfo.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfo.Builder.class);
     }
@@ -17486,7 +17486,7 @@ public final class HBaseProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionServerInfo}
+     * Protobuf type {@code hbase.pb.RegionServerInfo}
      *
      * 
      **
@@ -17498,12 +17498,12 @@ public final class HBaseProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionServerInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionServerInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionServerInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionServerInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfo.class, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfo.Builder.class);
       }
@@ -17539,7 +17539,7 @@ public final class HBaseProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_RegionServerInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.internal_static_hbase_pb_RegionServerInfo_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfo getDefaultInstanceForType() {
@@ -17641,7 +17641,7 @@ public final class HBaseProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionServerInfo)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionServerInfo)
     }
 
     static {
@@ -17649,129 +17649,129 @@ public final class HBaseProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionServerInfo)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionServerInfo)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TableName_descriptor;
+    internal_static_hbase_pb_TableName_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TableName_fieldAccessorTable;
+      internal_static_hbase_pb_TableName_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TableSchema_descriptor;
+    internal_static_hbase_pb_TableSchema_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TableSchema_fieldAccessorTable;
+      internal_static_hbase_pb_TableSchema_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TableState_descriptor;
+    internal_static_hbase_pb_TableState_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TableState_fieldAccessorTable;
+      internal_static_hbase_pb_TableState_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TableDescriptor_descriptor;
+    internal_static_hbase_pb_TableDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TableDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_TableDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ColumnFamilySchema_descriptor;
+    internal_static_hbase_pb_ColumnFamilySchema_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ColumnFamilySchema_fieldAccessorTable;
+      internal_static_hbase_pb_ColumnFamilySchema_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionInfo_descriptor;
+    internal_static_hbase_pb_RegionInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionInfo_fieldAccessorTable;
+      internal_static_hbase_pb_RegionInfo_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FavoredNodes_descriptor;
+    internal_static_hbase_pb_FavoredNodes_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FavoredNodes_fieldAccessorTable;
+      internal_static_hbase_pb_FavoredNodes_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionSpecifier_descriptor;
+    internal_static_hbase_pb_RegionSpecifier_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionSpecifier_fieldAccessorTable;
+      internal_static_hbase_pb_RegionSpecifier_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TimeRange_descriptor;
+    internal_static_hbase_pb_TimeRange_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TimeRange_fieldAccessorTable;
+      internal_static_hbase_pb_TimeRange_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ServerName_descriptor;
+    internal_static_hbase_pb_ServerName_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ServerName_fieldAccessorTable;
+      internal_static_hbase_pb_ServerName_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Coprocessor_descriptor;
+    internal_static_hbase_pb_Coprocessor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Coprocessor_fieldAccessorTable;
+      internal_static_hbase_pb_Coprocessor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_NameStringPair_descriptor;
+    internal_static_hbase_pb_NameStringPair_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_NameStringPair_fieldAccessorTable;
+      internal_static_hbase_pb_NameStringPair_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_NameBytesPair_descriptor;
+    internal_static_hbase_pb_NameBytesPair_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_NameBytesPair_fieldAccessorTable;
+      internal_static_hbase_pb_NameBytesPair_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BytesBytesPair_descriptor;
+    internal_static_hbase_pb_BytesBytesPair_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BytesBytesPair_fieldAccessorTable;
+      internal_static_hbase_pb_BytesBytesPair_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_NameInt64Pair_descriptor;
+    internal_static_hbase_pb_NameInt64Pair_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_NameInt64Pair_fieldAccessorTable;
+      internal_static_hbase_pb_NameInt64Pair_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SnapshotDescription_descriptor;
+    internal_static_hbase_pb_SnapshotDescription_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SnapshotDescription_fieldAccessorTable;
+      internal_static_hbase_pb_SnapshotDescription_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcedureDescription_descriptor;
+    internal_static_hbase_pb_ProcedureDescription_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcedureDescription_fieldAccessorTable;
+      internal_static_hbase_pb_ProcedureDescription_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_EmptyMsg_descriptor;
+    internal_static_hbase_pb_EmptyMsg_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_EmptyMsg_fieldAccessorTable;
+      internal_static_hbase_pb_EmptyMsg_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_LongMsg_descriptor;
+    internal_static_hbase_pb_LongMsg_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_LongMsg_fieldAccessorTable;
+      internal_static_hbase_pb_LongMsg_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DoubleMsg_descriptor;
+    internal_static_hbase_pb_DoubleMsg_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DoubleMsg_fieldAccessorTable;
+      internal_static_hbase_pb_DoubleMsg_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BigDecimalMsg_descriptor;
+    internal_static_hbase_pb_BigDecimalMsg_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BigDecimalMsg_fieldAccessorTable;
+      internal_static_hbase_pb_BigDecimalMsg_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UUID_descriptor;
+    internal_static_hbase_pb_UUID_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UUID_fieldAccessorTable;
+      internal_static_hbase_pb_UUID_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_NamespaceDescriptor_descriptor;
+    internal_static_hbase_pb_NamespaceDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_NamespaceDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_NamespaceDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionServerInfo_descriptor;
+    internal_static_hbase_pb_RegionServerInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionServerInfo_fieldAccessorTable;
+      internal_static_hbase_pb_RegionServerInfo_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -17781,208 +17781,212 @@ public final class HBaseProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013HBase.proto\032\nCell.proto\"1\n\tTableName\022\021" +
-      "\n\tnamespace\030\001 \002(\014\022\021\n\tqualifier\030\002 \002(\014\"\250\001\n" +
-      "\013TableSchema\022\036\n\ntable_name\030\001 \001(\0132\n.Table" +
-      "Name\022#\n\nattributes\030\002 \003(\0132\017.BytesBytesPai" +
-      "r\022,\n\017column_families\030\003 \003(\0132\023.ColumnFamil" +
-      "ySchema\022&\n\rconfiguration\030\004 \003(\0132\017.NameStr" +
-      "ingPair\"o\n\nTableState\022 \n\005state\030\001 \002(\0162\021.T" +
-      "ableState.State\"?\n\005State\022\013\n\007ENABLED\020\000\022\014\n" +
-      "\010DISABLED\020\001\022\r\n\tDISABLING\020\002\022\014\n\010ENABLING\020\003" +
-      "\"/\n\017TableDescriptor\022\034\n\006schema\030\001 \002(\0132\014.Ta",
-      "bleSchema\"o\n\022ColumnFamilySchema\022\014\n\004name\030" +
-      "\001 \002(\014\022#\n\nattributes\030\002 \003(\0132\017.BytesBytesPa" +
-      "ir\022&\n\rconfiguration\030\003 \003(\0132\017.NameStringPa" +
-      "ir\"\232\001\n\nRegionInfo\022\021\n\tregion_id\030\001 \002(\004\022\036\n\n" +
-      "table_name\030\002 \002(\0132\n.TableName\022\021\n\tstart_ke" +
-      "y\030\003 \001(\014\022\017\n\007end_key\030\004 \001(\014\022\017\n\007offline\030\005 \001(" +
-      "\010\022\r\n\005split\030\006 \001(\010\022\025\n\nreplica_id\030\007 \001(\005:\0010\"" +
-      "1\n\014FavoredNodes\022!\n\014favored_node\030\001 \003(\0132\013." +
-      "ServerName\"\225\001\n\017RegionSpecifier\0222\n\004type\030\001" +
-      " \002(\0162$.RegionSpecifier.RegionSpecifierTy",
-      "pe\022\r\n\005value\030\002 \002(\014\"?\n\023RegionSpecifierType" +
-      "\022\017\n\013REGION_NAME\020\001\022\027\n\023ENCODED_REGION_NAME" +
-      "\020\002\"%\n\tTimeRange\022\014\n\004from\030\001 \001(\004\022\n\n\002to\030\002 \001(" +
-      "\004\"A\n\nServerName\022\021\n\thost_name\030\001 \002(\t\022\014\n\004po" +
-      "rt\030\002 \001(\r\022\022\n\nstart_code\030\003 \001(\004\"\033\n\013Coproces" +
-      "sor\022\014\n\004name\030\001 \002(\t\"-\n\016NameStringPair\022\014\n\004n" +
-      "ame\030\001 \002(\t\022\r\n\005value\030\002 \002(\t\",\n\rNameBytesPai" +
-      "r\022\014\n\004name\030\001 \002(\t\022\r\n\005value\030\002 \001(\014\"/\n\016BytesB" +
-      "ytesPair\022\r\n\005first\030\001 \002(\014\022\016\n\006second\030\002 \002(\014\"" +
-      ",\n\rNameInt64Pair\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030",
-      "\002 \001(\003\"\314\001\n\023SnapshotDescription\022\014\n\004name\030\001 " +
-      "\002(\t\022\r\n\005table\030\002 \001(\t\022\030\n\rcreation_time\030\003 \001(" +
-      "\003:\0010\022.\n\004type\030\004 \001(\0162\031.SnapshotDescription" +
-      ".Type:\005FLUSH\022\017\n\007version\030\005 \001(\005\022\r\n\005owner\030\006" +
-      " \001(\t\".\n\004Type\022\014\n\010DISABLED\020\000\022\t\n\005FLUSH\020\001\022\r\n" +
-      "\tSKIPFLUSH\020\002\"}\n\024ProcedureDescription\022\021\n\t" +
-      "signature\030\001 \002(\t\022\020\n\010instance\030\002 \001(\t\022\030\n\rcre" +
-      "ation_time\030\003 \001(\003:\0010\022&\n\rconfiguration\030\004 \003" +
-      "(\0132\017.NameStringPair\"\n\n\010EmptyMsg\"\033\n\007LongM" +
-      "sg\022\020\n\010long_msg\030\001 \002(\003\"\037\n\tDoubleMsg\022\022\n\ndou",
-      "ble_msg\030\001 \002(\001\"\'\n\rBigDecimalMsg\022\026\n\016bigdec" +
-      "imal_msg\030\001 \002(\014\"5\n\004UUID\022\026\n\016least_sig_bits" +
-      "\030\001 \002(\004\022\025\n\rmost_sig_bits\030\002 \002(\004\"K\n\023Namespa" +
-      "ceDescriptor\022\014\n\004name\030\001 \002(\014\022&\n\rconfigurat" +
-      "ion\030\002 \003(\0132\017.NameStringPair\"$\n\020RegionServ" +
-      "erInfo\022\020\n\010infoPort\030\001 \001(\005*r\n\013CompareType\022" +
-      "\010\n\004LESS\020\000\022\021\n\rLESS_OR_EQUAL\020\001\022\t\n\005EQUAL\020\002\022" +
-      "\r\n\tNOT_EQUAL\020\003\022\024\n\020GREATER_OR_EQUAL\020\004\022\013\n\007" +
-      "GREATER\020\005\022\t\n\005NO_OP\020\006*n\n\010TimeUnit\022\017\n\013NANO" +
-      "SECONDS\020\001\022\020\n\014MICROSECONDS\020\002\022\020\n\014MILLISECO",
-      "NDS\020\003\022\013\n\007SECONDS\020\004\022\013\n\007MINUTES\020\005\022\t\n\005HOURS" +
-      "\020\006\022\010\n\004DAYS\020\007B>\n*org.apache.hadoop.hbase." +
-      "protobuf.generatedB\013HBaseProtosH\001\240\001\001"
+      "\n\013HBase.proto\022\010hbase.pb\032\nCell.proto\"1\n\tT" +
+      "ableName\022\021\n\tnamespace\030\001 \002(\014\022\021\n\tqualifier" +
+      "\030\002 \002(\014\"\314\001\n\013TableSchema\022\'\n\ntable_name\030\001 \001" +
+      "(\0132\023.hbase.pb.TableName\022,\n\nattributes\030\002 " +
+      "\003(\0132\030.hbase.pb.BytesBytesPair\0225\n\017column_" +
+      "families\030\003 \003(\0132\034.hbase.pb.ColumnFamilySc" +
+      "hema\022/\n\rconfiguration\030\004 \003(\0132\030.hbase.pb.N" +
+      "ameStringPair\"x\n\nTableState\022)\n\005state\030\001 \002" +
+      "(\0162\032.hbase.pb.TableState.State\"?\n\005State\022" +
+      "\013\n\007ENABLED\020\000\022\014\n\010DISABLED\020\001\022\r\n\tDISABLING\020",
+      "\002\022\014\n\010ENABLING\020\003\"8\n\017TableDescriptor\022%\n\006sc" +
+      "hema\030\001 \002(\0132\025.hbase.pb.TableSchema\"\201\001\n\022Co" +
+      "lumnFamilySchema\022\014\n\004name\030\001 \002(\014\022,\n\nattrib" +
+      "utes\030\002 \003(\0132\030.hbase.pb.BytesBytesPair\022/\n\r" +
+      "configuration\030\003 \003(\0132\030.hbase.pb.NameStrin" +
+      "gPair\"\243\001\n\nRegionInfo\022\021\n\tregion_id\030\001 \002(\004\022" +
+      "\'\n\ntable_name\030\002 \002(\0132\023.hbase.pb.TableName" +
+      "\022\021\n\tstart_key\030\003 \001(\014\022\017\n\007end_key\030\004 \001(\014\022\017\n\007" +
+      "offline\030\005 \001(\010\022\r\n\005split\030\006 \001(\010\022\025\n\nreplica_" +
+      "id\030\007 \001(\005:\0010\":\n\014FavoredNodes\022*\n\014favored_n",
+      "ode\030\001 \003(\0132\024.hbase.pb.ServerName\"\236\001\n\017Regi" +
+      "onSpecifier\022;\n\004type\030\001 \002(\0162-.hbase.pb.Reg" +
+      "ionSpecifier.RegionSpecifierType\022\r\n\005valu" +
+      "e\030\002 \002(\014\"?\n\023RegionSpecifierType\022\017\n\013REGION" +
+      "_NAME\020\001\022\027\n\023ENCODED_REGION_NAME\020\002\"%\n\tTime" +
+      "Range\022\014\n\004from\030\001 \001(\004\022\n\n\002to\030\002 \001(\004\"A\n\nServe" +
+      "rName\022\021\n\thost_name\030\001 \002(\t\022\014\n\004port\030\002 \001(\r\022\022" +
+      "\n\nstart_code\030\003 \001(\004\"\033\n\013Coprocessor\022\014\n\004nam" +
+      "e\030\001 \002(\t\"-\n\016NameStringPair\022\014\n\004name\030\001 \002(\t\022" +
+      "\r\n\005value\030\002 \002(\t\",\n\rNameBytesPair\022\014\n\004name\030",
+      "\001 \002(\t\022\r\n\005value\030\002 \001(\014\"/\n\016BytesBytesPair\022\r" +
+      "\n\005first\030\001 \002(\014\022\016\n\006second\030\002 \002(\014\",\n\rNameInt" +
+      "64Pair\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\003\"\325\001\n\023" +
+      "SnapshotDescription\022\014\n\004name\030\001 \002(\t\022\r\n\005tab" +
+      "le\030\002 \001(\t\022\030\n\rcreation_time\030\003 \001(\003:\0010\0227\n\004ty" +
+      "pe\030\004 \001(\0162\".hbase.pb.SnapshotDescription." +
+      "Type:\005FLUSH\022\017\n\007version\030\005 \001(\005\022\r\n\005owner\030\006 " +
+      "\001(\t\".\n\004Type\022\014\n\010DISABLED\020\000\022\t\n\005FLUSH\020\001\022\r\n\t" +
+      "SKIPFLUSH\020\002\"\206\001\n\024ProcedureDescription\022\021\n\t" +
+      "signature\030\001 \002(\t\022\020\n\010instance\030\002 \001(\t\022\030\n\rcre",
+      "ation_time\030\003 \001(\003:\0010\022/\n\rconfiguration\030\004 \003" +
+      "(\0132\030.hbase.pb.NameStringPair\"\n\n\010EmptyMsg" +
+      "\"\033\n\007LongMsg\022\020\n\010long_msg\030\001 \002(\003\"\037\n\tDoubleM" +
+      "sg\022\022\n\ndouble_msg\030\001 \002(\001\"\'\n\rBigDecimalMsg\022" +
+      "\026\n\016bigdecimal_msg\030\001 \002(\014\"5\n\004UUID\022\026\n\016least" +
+      "_sig_bits\030\001 \002(\004\022\025\n\rmost_sig_bits\030\002 \002(\004\"T" +
+      "\n\023NamespaceDescriptor\022\014\n\004name\030\001 \002(\014\022/\n\rc" +
+      "onfiguration\030\002 \003(\0132\030.hbase.pb.NameString" +
+      "Pair\"$\n\020RegionServerInfo\022\020\n\010infoPort\030\001 \001" +
+      "(\005*r\n\013CompareType\022\010\n\004LESS\020\000\022\021\n\rLESS_OR_E",
+      "QUAL\020\001\022\t\n\005EQUAL\020\002\022\r\n\tNOT_EQUAL\020\003\022\024\n\020GREA" +
+      "TER_OR_EQUAL\020\004\022\013\n\007GREATER\020\005\022\t\n\005NO_OP\020\006*n" +
+      "\n\010TimeUnit\022\017\n\013NANOSECONDS\020\001\022\020\n\014MICROSECO" +
+      "NDS\020\002\022\020\n\014MILLISECONDS\020\003\022\013\n\007SECONDS\020\004\022\013\n\007" +
+      "MINUTES\020\005\022\t\n\005HOURS\020\006\022\010\n\004DAYS\020\007B>\n*org.ap" +
+      "ache.hadoop.hbase.protobuf.generatedB\013HB" +
+      "aseProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_TableName_descriptor =
+          internal_static_hbase_pb_TableName_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_TableName_fieldAccessorTable = new
+          internal_static_hbase_pb_TableName_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TableName_descriptor,
+              internal_static_hbase_pb_TableName_descriptor,
               new java.lang.String[] { "Namespace", "Qualifier", });
-          internal_static_TableSchema_descriptor =
+          internal_static_hbase_pb_TableSchema_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_TableSchema_fieldAccessorTable = new
+          internal_static_hbase_pb_TableSchema_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TableSchema_descriptor,
+              internal_static_hbase_pb_TableSchema_descriptor,
               new java.lang.String[] { "TableName", "Attributes", "ColumnFamilies", "Configuration", });
-          internal_static_TableState_descriptor =
+          internal_static_hbase_pb_TableState_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_TableState_fieldAccessorTable = new
+          internal_static_hbase_pb_TableState_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TableState_descriptor,
+              internal_static_hbase_pb_TableState_descriptor,
               new java.lang.String[] { "State", });
-          internal_static_TableDescriptor_descriptor =
+          internal_static_hbase_pb_TableDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_TableDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_TableDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TableDescriptor_descriptor,
+              internal_static_hbase_pb_TableDescriptor_descriptor,
               new java.lang.String[] { "Schema", });
-          internal_static_ColumnFamilySchema_descriptor =
+          internal_static_hbase_pb_ColumnFamilySchema_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_ColumnFamilySchema_fieldAccessorTable = new
+          internal_static_hbase_pb_ColumnFamilySchema_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ColumnFamilySchema_descriptor,
+              internal_static_hbase_pb_ColumnFamilySchema_descriptor,
               new java.lang.String[] { "Name", "Attributes", "Configuration", });
-          internal_static_RegionInfo_descriptor =
+          internal_static_hbase_pb_RegionInfo_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_RegionInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionInfo_descriptor,
+              internal_static_hbase_pb_RegionInfo_descriptor,
               new java.lang.String[] { "RegionId", "TableName", "StartKey", "EndKey", "Offline", "Split", "ReplicaId", });
-          internal_static_FavoredNodes_descriptor =
+          internal_static_hbase_pb_FavoredNodes_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_FavoredNodes_fieldAccessorTable = new
+          internal_static_hbase_pb_FavoredNodes_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FavoredNodes_descriptor,
+              internal_static_hbase_pb_FavoredNodes_descriptor,
               new java.lang.String[] { "FavoredNode", });
-          internal_static_RegionSpecifier_descriptor =
+          internal_static_hbase_pb_RegionSpecifier_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_RegionSpecifier_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionSpecifier_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionSpecifier_descriptor,
+              internal_static_hbase_pb_RegionSpecifier_descriptor,
               new java.lang.String[] { "Type", "Value", });
-          internal_static_TimeRange_descriptor =
+          internal_static_hbase_pb_TimeRange_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_TimeRange_fieldAccessorTable = new
+          internal_static_hbase_pb_TimeRange_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TimeRange_descriptor,
+              internal_static_hbase_pb_TimeRange_descriptor,
               new java.lang.String[] { "From", "To", });
-          internal_static_ServerName_descriptor =
+          internal_static_hbase_pb_ServerName_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_ServerName_fieldAccessorTable = new
+          internal_static_hbase_pb_ServerName_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ServerName_descriptor,
+              internal_static_hbase_pb_ServerName_descriptor,
               new java.lang.String[] { "HostName", "Port", "StartCode", });
-          internal_static_Coprocessor_descriptor =
+          internal_static_hbase_pb_Coprocessor_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_Coprocessor_fieldAccessorTable = new
+          internal_static_hbase_pb_Coprocessor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Coprocessor_descriptor,
+              internal_static_hbase_pb_Coprocessor_descriptor,
               new java.lang.String[] { "Name", });
-          internal_static_NameStringPair_descriptor =
+          internal_static_hbase_pb_NameStringPair_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_NameStringPair_fieldAccessorTable = new
+          internal_static_hbase_pb_NameStringPair_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_NameStringPair_descriptor,
+              internal_static_hbase_pb_NameStringPair_descriptor,
               new java.lang.String[] { "Name", "Value", });
-          internal_static_NameBytesPair_descriptor =
+          internal_static_hbase_pb_NameBytesPair_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_NameBytesPair_fieldAccessorTable = new
+          internal_static_hbase_pb_NameBytesPair_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_NameBytesPair_descriptor,
+              internal_static_hbase_pb_NameBytesPair_descriptor,
               new java.lang.String[] { "Name", "Value", });
-          internal_static_BytesBytesPair_descriptor =
+          internal_static_hbase_pb_BytesBytesPair_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_BytesBytesPair_fieldAccessorTable = new
+          internal_static_hbase_pb_BytesBytesPair_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BytesBytesPair_descriptor,
+              internal_static_hbase_pb_BytesBytesPair_descriptor,
               new java.lang.String[] { "First", "Second", });
-          internal_static_NameInt64Pair_descriptor =
+          internal_static_hbase_pb_NameInt64Pair_descriptor =
             getDescriptor().getMessageTypes().get(14);
-          internal_static_NameInt64Pair_fieldAccessorTable = new
+          internal_static_hbase_pb_NameInt64Pair_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_NameInt64Pair_descriptor,
+              internal_static_hbase_pb_NameInt64Pair_descriptor,
               new java.lang.String[] { "Name", "Value", });
-          internal_static_SnapshotDescription_descriptor =
+          internal_static_hbase_pb_SnapshotDescription_descriptor =
             getDescriptor().getMessageTypes().get(15);
-          internal_static_SnapshotDescription_fieldAccessorTable = new
+          internal_static_hbase_pb_SnapshotDescription_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SnapshotDescription_descriptor,
+              internal_static_hbase_pb_SnapshotDescription_descriptor,
               new java.lang.String[] { "Name", "Table", "CreationTime", "Type", "Version", "Owner", });
-          internal_static_ProcedureDescription_descriptor =
+          internal_static_hbase_pb_ProcedureDescription_descriptor =
             getDescriptor().getMessageTypes().get(16);
-          internal_static_ProcedureDescription_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcedureDescription_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcedureDescription_descriptor,
+              internal_static_hbase_pb_ProcedureDescription_descriptor,
               new java.lang.String[] { "Signature", "Instance", "CreationTime", "Configuration", });
-          internal_static_EmptyMsg_descriptor =
+          internal_static_hbase_pb_EmptyMsg_descriptor =
             getDescriptor().getMessageTypes().get(17);
-          internal_static_EmptyMsg_fieldAccessorTable = new
+          internal_static_hbase_pb_EmptyMsg_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_EmptyMsg_descriptor,
+              internal_static_hbase_pb_EmptyMsg_descriptor,
               new java.lang.String[] { });
-          internal_static_LongMsg_descriptor =
+          internal_static_hbase_pb_LongMsg_descriptor =
             getDescriptor().getMessageTypes().get(18);
-          internal_static_LongMsg_fieldAccessorTable = new
+          internal_static_hbase_pb_LongMsg_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_LongMsg_descriptor,
+              internal_static_hbase_pb_LongMsg_descriptor,
               new java.lang.String[] { "LongMsg", });
-          internal_static_DoubleMsg_descriptor =
+          internal_static_hbase_pb_DoubleMsg_descriptor =
             getDescriptor().getMessageTypes().get(19);
-          internal_static_DoubleMsg_fieldAccessorTable = new
+          internal_static_hbase_pb_DoubleMsg_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DoubleMsg_descriptor,
+              internal_static_hbase_pb_DoubleMsg_descriptor,
               new java.lang.String[] { "DoubleMsg", });
-          internal_static_BigDecimalMsg_descriptor =
+          internal_static_hbase_pb_BigDecimalMsg_descriptor =
             getDescriptor().getMessageTypes().get(20);
-          internal_static_BigDecimalMsg_fieldAccessorTable = new
+          internal_static_hbase_pb_BigDecimalMsg_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BigDecimalMsg_descriptor,
+              internal_static_hbase_pb_BigDecimalMsg_descriptor,
               new java.lang.String[] { "BigdecimalMsg", });
-          internal_static_UUID_descriptor =
+          internal_static_hbase_pb_UUID_descriptor =
             getDescriptor().getMessageTypes().get(21);
-          internal_static_UUID_fieldAccessorTable = new
+          internal_static_hbase_pb_UUID_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UUID_descriptor,
+              internal_static_hbase_pb_UUID_descriptor,
               new java.lang.String[] { "LeastSigBits", "MostSigBits", });
-          internal_static_NamespaceDescriptor_descriptor =
+          internal_static_hbase_pb_NamespaceDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(22);
-          internal_static_NamespaceDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_NamespaceDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_NamespaceDescriptor_descriptor,
+              internal_static_hbase_pb_NamespaceDescriptor_descriptor,
               new java.lang.String[] { "Name", "Configuration", });
-          internal_static_RegionServerInfo_descriptor =
+          internal_static_hbase_pb_RegionServerInfo_descriptor =
             getDescriptor().getMessageTypes().get(23);
-          internal_static_RegionServerInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionServerInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionServerInfo_descriptor,
+              internal_static_hbase_pb_RegionServerInfo_descriptor,
               new java.lang.String[] { "InfoPort", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HFileProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HFileProtos.java
index 5ed3747b2a8..5b6f2f40261 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HFileProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HFileProtos.java
@@ -11,33 +11,33 @@ public final class HFileProtos {
   public interface FileInfoProtoOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .BytesBytesPair map_entry = 1;
+    // repeated .hbase.pb.BytesBytesPair map_entry = 1;
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     java.util.List 
         getMapEntryList();
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getMapEntry(int index);
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     int getMapEntryCount();
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     java.util.List 
         getMapEntryOrBuilderList();
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getMapEntryOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code FileInfoProto}
+   * Protobuf type {@code hbase.pb.FileInfoProto}
    *
    * 
    * Map of name/values
@@ -116,12 +116,12 @@ public final class HFileProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileInfoProto_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileInfoProto_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileInfoProto_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileInfoProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileInfoProto.class, org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileInfoProto.Builder.class);
     }
@@ -141,36 +141,36 @@ public final class HFileProtos {
       return PARSER;
     }
 
-    // repeated .BytesBytesPair map_entry = 1;
+    // repeated .hbase.pb.BytesBytesPair map_entry = 1;
     public static final int MAP_ENTRY_FIELD_NUMBER = 1;
     private java.util.List mapEntry_;
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     public java.util.List getMapEntryList() {
       return mapEntry_;
     }
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     public java.util.List 
         getMapEntryOrBuilderList() {
       return mapEntry_;
     }
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     public int getMapEntryCount() {
       return mapEntry_.size();
     }
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getMapEntry(int index) {
       return mapEntry_.get(index);
     }
     /**
-     * repeated .BytesBytesPair map_entry = 1;
+     * repeated .hbase.pb.BytesBytesPair map_entry = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getMapEntryOrBuilder(
         int index) {
@@ -328,7 +328,7 @@ public final class HFileProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FileInfoProto}
+     * Protobuf type {@code hbase.pb.FileInfoProto}
      *
      * 
      * Map of name/values
@@ -339,12 +339,12 @@ public final class HFileProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileInfoProtoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileInfoProto_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileInfoProto_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileInfoProto_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileInfoProto_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileInfoProto.class, org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileInfoProto.Builder.class);
       }
@@ -385,7 +385,7 @@ public final class HFileProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileInfoProto_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileInfoProto_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileInfoProto getDefaultInstanceForType() {
@@ -486,7 +486,7 @@ public final class HFileProtos {
       }
       private int bitField0_;
 
-      // repeated .BytesBytesPair map_entry = 1;
+      // repeated .hbase.pb.BytesBytesPair map_entry = 1;
       private java.util.List mapEntry_ =
         java.util.Collections.emptyList();
       private void ensureMapEntryIsMutable() {
@@ -500,7 +500,7 @@ public final class HFileProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder> mapEntryBuilder_;
 
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public java.util.List getMapEntryList() {
         if (mapEntryBuilder_ == null) {
@@ -510,7 +510,7 @@ public final class HFileProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public int getMapEntryCount() {
         if (mapEntryBuilder_ == null) {
@@ -520,7 +520,7 @@ public final class HFileProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getMapEntry(int index) {
         if (mapEntryBuilder_ == null) {
@@ -530,7 +530,7 @@ public final class HFileProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder setMapEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -547,7 +547,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder setMapEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -561,7 +561,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder addMapEntry(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
         if (mapEntryBuilder_ == null) {
@@ -577,7 +577,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder addMapEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -594,7 +594,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder addMapEntry(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -608,7 +608,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder addMapEntry(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -622,7 +622,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder addAllMapEntry(
           java.lang.Iterable values) {
@@ -636,7 +636,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder clearMapEntry() {
         if (mapEntryBuilder_ == null) {
@@ -649,7 +649,7 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public Builder removeMapEntry(int index) {
         if (mapEntryBuilder_ == null) {
@@ -662,14 +662,14 @@ public final class HFileProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder getMapEntryBuilder(
           int index) {
         return getMapEntryFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getMapEntryOrBuilder(
           int index) {
@@ -679,7 +679,7 @@ public final class HFileProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public java.util.List 
            getMapEntryOrBuilderList() {
@@ -690,14 +690,14 @@ public final class HFileProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addMapEntryBuilder() {
         return getMapEntryFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addMapEntryBuilder(
           int index) {
@@ -705,7 +705,7 @@ public final class HFileProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair map_entry = 1;
+       * repeated .hbase.pb.BytesBytesPair map_entry = 1;
        */
       public java.util.List 
            getMapEntryBuilderList() {
@@ -726,7 +726,7 @@ public final class HFileProtos {
         return mapEntryBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:FileInfoProto)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FileInfoProto)
     }
 
     static {
@@ -734,7 +734,7 @@ public final class HFileProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FileInfoProto)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FileInfoProto)
   }
 
   public interface FileTrailerProtoOrBuilder
@@ -876,7 +876,7 @@ public final class HFileProtos {
     com.google.protobuf.ByteString getEncryptionKey();
   }
   /**
-   * Protobuf type {@code FileTrailerProto}
+   * Protobuf type {@code hbase.pb.FileTrailerProto}
    *
    * 
    * HFile file trailer
@@ -1009,12 +1009,12 @@ public final class HFileProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileTrailerProto_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileTrailerProto_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileTrailerProto_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileTrailerProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileTrailerProto.class, org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileTrailerProto.Builder.class);
     }
@@ -1622,7 +1622,7 @@ public final class HFileProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FileTrailerProto}
+     * Protobuf type {@code hbase.pb.FileTrailerProto}
      *
      * 
      * HFile file trailer
@@ -1633,12 +1633,12 @@ public final class HFileProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileTrailerProtoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileTrailerProto_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileTrailerProto_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileTrailerProto_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileTrailerProto_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileTrailerProto.class, org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileTrailerProto.Builder.class);
       }
@@ -1698,7 +1698,7 @@ public final class HFileProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_FileTrailerProto_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.HFileProtos.internal_static_hbase_pb_FileTrailerProto_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.HFileProtos.FileTrailerProto getDefaultInstanceForType() {
@@ -2326,7 +2326,7 @@ public final class HFileProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FileTrailerProto)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FileTrailerProto)
     }
 
     static {
@@ -2334,19 +2334,19 @@ public final class HFileProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FileTrailerProto)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FileTrailerProto)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FileInfoProto_descriptor;
+    internal_static_hbase_pb_FileInfoProto_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FileInfoProto_fieldAccessorTable;
+      internal_static_hbase_pb_FileInfoProto_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FileTrailerProto_descriptor;
+    internal_static_hbase_pb_FileTrailerProto_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FileTrailerProto_fieldAccessorTable;
+      internal_static_hbase_pb_FileTrailerProto_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2356,37 +2356,38 @@ public final class HFileProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013HFile.proto\032\013HBase.proto\"3\n\rFileInfoPr" +
-      "oto\022\"\n\tmap_entry\030\001 \003(\0132\017.BytesBytesPair\"" +
-      "\221\003\n\020FileTrailerProto\022\030\n\020file_info_offset" +
-      "\030\001 \001(\004\022 \n\030load_on_open_data_offset\030\002 \001(\004" +
-      "\022$\n\034uncompressed_data_index_size\030\003 \001(\004\022 " +
-      "\n\030total_uncompressed_bytes\030\004 \001(\004\022\030\n\020data" +
-      "_index_count\030\005 \001(\r\022\030\n\020meta_index_count\030\006" +
-      " \001(\r\022\023\n\013entry_count\030\007 \001(\004\022\035\n\025num_data_in" +
-      "dex_levels\030\010 \001(\r\022\037\n\027first_data_block_off" +
-      "set\030\t \001(\004\022\036\n\026last_data_block_offset\030\n \001(",
-      "\004\022\035\n\025comparator_class_name\030\013 \001(\t\022\031\n\021comp" +
-      "ression_codec\030\014 \001(\r\022\026\n\016encryption_key\030\r " +
-      "\001(\014BA\n*org.apache.hadoop.hbase.protobuf." +
-      "generatedB\013HFileProtosH\001\210\001\001\240\001\001"
+      "\n\013HFile.proto\022\010hbase.pb\032\013HBase.proto\"<\n\r" +
+      "FileInfoProto\022+\n\tmap_entry\030\001 \003(\0132\030.hbase" +
+      ".pb.BytesBytesPair\"\221\003\n\020FileTrailerProto\022" +
+      "\030\n\020file_info_offset\030\001 \001(\004\022 \n\030load_on_ope" +
+      "n_data_offset\030\002 \001(\004\022$\n\034uncompressed_data" +
+      "_index_size\030\003 \001(\004\022 \n\030total_uncompressed_" +
+      "bytes\030\004 \001(\004\022\030\n\020data_index_count\030\005 \001(\r\022\030\n" +
+      "\020meta_index_count\030\006 \001(\r\022\023\n\013entry_count\030\007" +
+      " \001(\004\022\035\n\025num_data_index_levels\030\010 \001(\r\022\037\n\027f" +
+      "irst_data_block_offset\030\t \001(\004\022\036\n\026last_dat",
+      "a_block_offset\030\n \001(\004\022\035\n\025comparator_class" +
+      "_name\030\013 \001(\t\022\031\n\021compression_codec\030\014 \001(\r\022\026" +
+      "\n\016encryption_key\030\r \001(\014BA\n*org.apache.had" +
+      "oop.hbase.protobuf.generatedB\013HFileProto" +
+      "sH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_FileInfoProto_descriptor =
+          internal_static_hbase_pb_FileInfoProto_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_FileInfoProto_fieldAccessorTable = new
+          internal_static_hbase_pb_FileInfoProto_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FileInfoProto_descriptor,
+              internal_static_hbase_pb_FileInfoProto_descriptor,
               new java.lang.String[] { "MapEntry", });
-          internal_static_FileTrailerProto_descriptor =
+          internal_static_hbase_pb_FileTrailerProto_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_FileTrailerProto_fieldAccessorTable = new
+          internal_static_hbase_pb_FileTrailerProto_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FileTrailerProto_descriptor,
+              internal_static_hbase_pb_FileTrailerProto_descriptor,
               new java.lang.String[] { "FileInfoOffset", "LoadOnOpenDataOffset", "UncompressedDataIndexSize", "TotalUncompressedBytes", "DataIndexCount", "MetaIndexCount", "EntryCount", "NumDataIndexLevels", "FirstDataBlockOffset", "LastDataBlockOffset", "ComparatorClassName", "CompressionCodec", "EncryptionKey", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/LoadBalancerProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/LoadBalancerProtos.java
index e777bd514b3..56ff35605ee 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/LoadBalancerProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/LoadBalancerProtos.java
@@ -22,7 +22,7 @@ public final class LoadBalancerProtos {
     boolean getBalancerOn();
   }
   /**
-   * Protobuf type {@code LoadBalancerState}
+   * Protobuf type {@code hbase.pb.LoadBalancerState}
    */
   public static final class LoadBalancerState extends
       com.google.protobuf.GeneratedMessage
@@ -91,12 +91,12 @@ public final class LoadBalancerProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_LoadBalancerState_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_hbase_pb_LoadBalancerState_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_LoadBalancerState_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_hbase_pb_LoadBalancerState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.LoadBalancerState.class, org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.LoadBalancerState.Builder.class);
     }
@@ -281,19 +281,19 @@ public final class LoadBalancerProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code LoadBalancerState}
+     * Protobuf type {@code hbase.pb.LoadBalancerState}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.LoadBalancerStateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_LoadBalancerState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_hbase_pb_LoadBalancerState_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_LoadBalancerState_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_hbase_pb_LoadBalancerState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.LoadBalancerState.class, org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.LoadBalancerState.Builder.class);
       }
@@ -329,7 +329,7 @@ public final class LoadBalancerProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_LoadBalancerState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.internal_static_hbase_pb_LoadBalancerState_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.LoadBalancerProtos.LoadBalancerState getDefaultInstanceForType() {
@@ -431,7 +431,7 @@ public final class LoadBalancerProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:LoadBalancerState)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.LoadBalancerState)
     }
 
     static {
@@ -439,14 +439,14 @@ public final class LoadBalancerProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:LoadBalancerState)
+    // @@protoc_insertion_point(class_scope:hbase.pb.LoadBalancerState)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_LoadBalancerState_descriptor;
+    internal_static_hbase_pb_LoadBalancerState_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_LoadBalancerState_fieldAccessorTable;
+      internal_static_hbase_pb_LoadBalancerState_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -456,21 +456,21 @@ public final class LoadBalancerProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022LoadBalancer.proto\"(\n\021LoadBalancerStat" +
-      "e\022\023\n\013balancer_on\030\001 \001(\010BE\n*org.apache.had" +
-      "oop.hbase.protobuf.generatedB\022LoadBalanc" +
-      "erProtosH\001\240\001\001"
+      "\n\022LoadBalancer.proto\022\010hbase.pb\"(\n\021LoadBa" +
+      "lancerState\022\023\n\013balancer_on\030\001 \001(\010BE\n*org." +
+      "apache.hadoop.hbase.protobuf.generatedB\022" +
+      "LoadBalancerProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_LoadBalancerState_descriptor =
+          internal_static_hbase_pb_LoadBalancerState_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_LoadBalancerState_fieldAccessorTable = new
+          internal_static_hbase_pb_LoadBalancerState_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_LoadBalancerState_descriptor,
+              internal_static_hbase_pb_LoadBalancerState_descriptor,
               new java.lang.String[] { "BalancerOn", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
index eeab45c6e20..5d07808baf3 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java
@@ -11,33 +11,33 @@ public final class MapReduceProtos {
   public interface ScanMetricsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .NameInt64Pair metrics = 1;
+    // repeated .hbase.pb.NameInt64Pair metrics = 1;
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     java.util.List 
         getMetricsList();
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair getMetrics(int index);
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     int getMetricsCount();
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     java.util.List 
         getMetricsOrBuilderList();
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64PairOrBuilder getMetricsOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ScanMetrics}
+   * Protobuf type {@code hbase.pb.ScanMetrics}
    */
   public static final class ScanMetrics extends
       com.google.protobuf.GeneratedMessage
@@ -112,12 +112,12 @@ public final class MapReduceProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_ScanMetrics_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_ScanMetrics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_ScanMetrics_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_ScanMetrics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics.class, org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics.Builder.class);
     }
@@ -137,36 +137,36 @@ public final class MapReduceProtos {
       return PARSER;
     }
 
-    // repeated .NameInt64Pair metrics = 1;
+    // repeated .hbase.pb.NameInt64Pair metrics = 1;
     public static final int METRICS_FIELD_NUMBER = 1;
     private java.util.List metrics_;
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     public java.util.List getMetricsList() {
       return metrics_;
     }
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     public java.util.List 
         getMetricsOrBuilderList() {
       return metrics_;
     }
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     public int getMetricsCount() {
       return metrics_.size();
     }
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair getMetrics(int index) {
       return metrics_.get(index);
     }
     /**
-     * repeated .NameInt64Pair metrics = 1;
+     * repeated .hbase.pb.NameInt64Pair metrics = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64PairOrBuilder getMetricsOrBuilder(
         int index) {
@@ -318,19 +318,19 @@ public final class MapReduceProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ScanMetrics}
+     * Protobuf type {@code hbase.pb.ScanMetrics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetricsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_ScanMetrics_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_ScanMetrics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_ScanMetrics_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_ScanMetrics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics.class, org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics.Builder.class);
       }
@@ -371,7 +371,7 @@ public final class MapReduceProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_ScanMetrics_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_ScanMetrics_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.ScanMetrics getDefaultInstanceForType() {
@@ -466,7 +466,7 @@ public final class MapReduceProtos {
       }
       private int bitField0_;
 
-      // repeated .NameInt64Pair metrics = 1;
+      // repeated .hbase.pb.NameInt64Pair metrics = 1;
       private java.util.List metrics_ =
         java.util.Collections.emptyList();
       private void ensureMetricsIsMutable() {
@@ -480,7 +480,7 @@ public final class MapReduceProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64PairOrBuilder> metricsBuilder_;
 
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public java.util.List getMetricsList() {
         if (metricsBuilder_ == null) {
@@ -490,7 +490,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public int getMetricsCount() {
         if (metricsBuilder_ == null) {
@@ -500,7 +500,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair getMetrics(int index) {
         if (metricsBuilder_ == null) {
@@ -510,7 +510,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder setMetrics(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair value) {
@@ -527,7 +527,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder setMetrics(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder builderForValue) {
@@ -541,7 +541,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder addMetrics(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair value) {
         if (metricsBuilder_ == null) {
@@ -557,7 +557,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder addMetrics(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair value) {
@@ -574,7 +574,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder addMetrics(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder builderForValue) {
@@ -588,7 +588,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder addMetrics(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder builderForValue) {
@@ -602,7 +602,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder addAllMetrics(
           java.lang.Iterable values) {
@@ -616,7 +616,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder clearMetrics() {
         if (metricsBuilder_ == null) {
@@ -629,7 +629,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public Builder removeMetrics(int index) {
         if (metricsBuilder_ == null) {
@@ -642,14 +642,14 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder getMetricsBuilder(
           int index) {
         return getMetricsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64PairOrBuilder getMetricsOrBuilder(
           int index) {
@@ -659,7 +659,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public java.util.List 
            getMetricsOrBuilderList() {
@@ -670,14 +670,14 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder addMetricsBuilder() {
         return getMetricsFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.getDefaultInstance());
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.Builder addMetricsBuilder(
           int index) {
@@ -685,7 +685,7 @@ public final class MapReduceProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameInt64Pair.getDefaultInstance());
       }
       /**
-       * repeated .NameInt64Pair metrics = 1;
+       * repeated .hbase.pb.NameInt64Pair metrics = 1;
        */
       public java.util.List 
            getMetricsBuilderList() {
@@ -706,7 +706,7 @@ public final class MapReduceProtos {
         return metricsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ScanMetrics)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ScanMetrics)
     }
 
     static {
@@ -714,7 +714,7 @@ public final class MapReduceProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ScanMetrics)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ScanMetrics)
   }
 
   public interface TableSnapshotRegionSplitOrBuilder
@@ -740,36 +740,36 @@ public final class MapReduceProtos {
     com.google.protobuf.ByteString
         getLocationsBytes(int index);
 
-    // optional .TableSchema table = 3;
+    // optional .hbase.pb.TableSchema table = 3;
     /**
-     * optional .TableSchema table = 3;
+     * optional .hbase.pb.TableSchema table = 3;
      */
     boolean hasTable();
     /**
-     * optional .TableSchema table = 3;
+     * optional .hbase.pb.TableSchema table = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTable();
     /**
-     * optional .TableSchema table = 3;
+     * optional .hbase.pb.TableSchema table = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableOrBuilder();
 
-    // optional .RegionInfo region = 4;
+    // optional .hbase.pb.RegionInfo region = 4;
     /**
-     * optional .RegionInfo region = 4;
+     * optional .hbase.pb.RegionInfo region = 4;
      */
     boolean hasRegion();
     /**
-     * optional .RegionInfo region = 4;
+     * optional .hbase.pb.RegionInfo region = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion();
     /**
-     * optional .RegionInfo region = 4;
+     * optional .hbase.pb.RegionInfo region = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder();
   }
   /**
-   * Protobuf type {@code TableSnapshotRegionSplit}
+   * Protobuf type {@code hbase.pb.TableSnapshotRegionSplit}
    */
   public static final class TableSnapshotRegionSplit extends
       com.google.protobuf.GeneratedMessage
@@ -870,12 +870,12 @@ public final class MapReduceProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_TableSnapshotRegionSplit_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_TableSnapshotRegionSplit_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_TableSnapshotRegionSplit_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_TableSnapshotRegionSplit_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.TableSnapshotRegionSplit.class, org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.TableSnapshotRegionSplit.Builder.class);
     }
@@ -926,45 +926,45 @@ public final class MapReduceProtos {
       return locations_.getByteString(index);
     }
 
-    // optional .TableSchema table = 3;
+    // optional .hbase.pb.TableSchema table = 3;
     public static final int TABLE_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema table_;
     /**
-     * optional .TableSchema table = 3;
+     * optional .hbase.pb.TableSchema table = 3;
      */
     public boolean hasTable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .TableSchema table = 3;
+     * optional .hbase.pb.TableSchema table = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTable() {
       return table_;
     }
     /**
-     * optional .TableSchema table = 3;
+     * optional .hbase.pb.TableSchema table = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableOrBuilder() {
       return table_;
     }
 
-    // optional .RegionInfo region = 4;
+    // optional .hbase.pb.RegionInfo region = 4;
     public static final int REGION_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo region_;
     /**
-     * optional .RegionInfo region = 4;
+     * optional .hbase.pb.RegionInfo region = 4;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .RegionInfo region = 4;
+     * optional .hbase.pb.RegionInfo region = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion() {
       return region_;
     }
     /**
-     * optional .RegionInfo region = 4;
+     * optional .hbase.pb.RegionInfo region = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder() {
       return region_;
@@ -1166,19 +1166,19 @@ public final class MapReduceProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TableSnapshotRegionSplit}
+     * Protobuf type {@code hbase.pb.TableSnapshotRegionSplit}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.TableSnapshotRegionSplitOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_TableSnapshotRegionSplit_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_TableSnapshotRegionSplit_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_TableSnapshotRegionSplit_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_TableSnapshotRegionSplit_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.TableSnapshotRegionSplit.class, org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.TableSnapshotRegionSplit.Builder.class);
       }
@@ -1228,7 +1228,7 @@ public final class MapReduceProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_TableSnapshotRegionSplit_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.internal_static_hbase_pb_TableSnapshotRegionSplit_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MapReduceProtos.TableSnapshotRegionSplit getDefaultInstanceForType() {
@@ -1433,18 +1433,18 @@ public final class MapReduceProtos {
         return this;
       }
 
-      // optional .TableSchema table = 3;
+      // optional .hbase.pb.TableSchema table = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema table_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableBuilder_;
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public boolean hasTable() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTable() {
         if (tableBuilder_ == null) {
@@ -1454,7 +1454,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public Builder setTable(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableBuilder_ == null) {
@@ -1470,7 +1470,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public Builder setTable(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -1484,7 +1484,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public Builder mergeTable(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableBuilder_ == null) {
@@ -1503,7 +1503,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public Builder clearTable() {
         if (tableBuilder_ == null) {
@@ -1516,7 +1516,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableBuilder() {
         bitField0_ |= 0x00000002;
@@ -1524,7 +1524,7 @@ public final class MapReduceProtos {
         return getTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableOrBuilder() {
         if (tableBuilder_ != null) {
@@ -1534,7 +1534,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * optional .TableSchema table = 3;
+       * optional .hbase.pb.TableSchema table = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -1550,18 +1550,18 @@ public final class MapReduceProtos {
         return tableBuilder_;
       }
 
-      // optional .RegionInfo region = 4;
+      // optional .hbase.pb.RegionInfo region = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionBuilder_;
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegion() {
         if (regionBuilder_ == null) {
@@ -1571,7 +1571,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionBuilder_ == null) {
@@ -1587,7 +1587,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -1601,7 +1601,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionBuilder_ == null) {
@@ -1620,7 +1620,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -1633,7 +1633,7 @@ public final class MapReduceProtos {
         return this;
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionBuilder() {
         bitField0_ |= 0x00000004;
@@ -1641,7 +1641,7 @@ public final class MapReduceProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -1651,7 +1651,7 @@ public final class MapReduceProtos {
         }
       }
       /**
-       * optional .RegionInfo region = 4;
+       * optional .hbase.pb.RegionInfo region = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> 
@@ -1667,7 +1667,7 @@ public final class MapReduceProtos {
         return regionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:TableSnapshotRegionSplit)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TableSnapshotRegionSplit)
     }
 
     static {
@@ -1675,19 +1675,19 @@ public final class MapReduceProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TableSnapshotRegionSplit)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TableSnapshotRegionSplit)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ScanMetrics_descriptor;
+    internal_static_hbase_pb_ScanMetrics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ScanMetrics_fieldAccessorTable;
+      internal_static_hbase_pb_ScanMetrics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TableSnapshotRegionSplit_descriptor;
+    internal_static_hbase_pb_TableSnapshotRegionSplit_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TableSnapshotRegionSplit_fieldAccessorTable;
+      internal_static_hbase_pb_TableSnapshotRegionSplit_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1697,30 +1697,31 @@ public final class MapReduceProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017MapReduce.proto\032\013HBase.proto\".\n\013ScanMe" +
-      "trics\022\037\n\007metrics\030\001 \003(\0132\016.NameInt64Pair\"g" +
-      "\n\030TableSnapshotRegionSplit\022\021\n\tlocations\030" +
-      "\002 \003(\t\022\033\n\005table\030\003 \001(\0132\014.TableSchema\022\033\n\006re" +
-      "gion\030\004 \001(\0132\013.RegionInfoBB\n*org.apache.ha" +
-      "doop.hbase.protobuf.generatedB\017MapReduce" +
-      "ProtosH\001\240\001\001"
+      "\n\017MapReduce.proto\022\010hbase.pb\032\013HBase.proto" +
+      "\"7\n\013ScanMetrics\022(\n\007metrics\030\001 \003(\0132\027.hbase" +
+      ".pb.NameInt64Pair\"y\n\030TableSnapshotRegion" +
+      "Split\022\021\n\tlocations\030\002 \003(\t\022$\n\005table\030\003 \001(\0132" +
+      "\025.hbase.pb.TableSchema\022$\n\006region\030\004 \001(\0132\024" +
+      ".hbase.pb.RegionInfoBB\n*org.apache.hadoo" +
+      "p.hbase.protobuf.generatedB\017MapReducePro" +
+      "tosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_ScanMetrics_descriptor =
+          internal_static_hbase_pb_ScanMetrics_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_ScanMetrics_fieldAccessorTable = new
+          internal_static_hbase_pb_ScanMetrics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ScanMetrics_descriptor,
+              internal_static_hbase_pb_ScanMetrics_descriptor,
               new java.lang.String[] { "Metrics", });
-          internal_static_TableSnapshotRegionSplit_descriptor =
+          internal_static_hbase_pb_TableSnapshotRegionSplit_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_TableSnapshotRegionSplit_fieldAccessorTable = new
+          internal_static_hbase_pb_TableSnapshotRegionSplit_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TableSnapshotRegionSplit_descriptor,
+              internal_static_hbase_pb_TableSnapshotRegionSplit_descriptor,
               new java.lang.String[] { "Locations", "Table", "Region", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProcedureProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProcedureProtos.java
index 3da37973703..9bf4c989569 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProcedureProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProcedureProtos.java
@@ -9,7 +9,7 @@ public final class MasterProcedureProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code CreateTableState}
+   * Protobuf enum {@code hbase.pb.CreateTableState}
    */
   public enum CreateTableState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -123,11 +123,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:CreateTableState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.CreateTableState)
   }
 
   /**
-   * Protobuf enum {@code ModifyTableState}
+   * Protobuf enum {@code hbase.pb.ModifyTableState}
    */
   public enum ModifyTableState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -250,11 +250,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:ModifyTableState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.ModifyTableState)
   }
 
   /**
-   * Protobuf enum {@code TruncateTableState}
+   * Protobuf enum {@code hbase.pb.TruncateTableState}
    */
   public enum TruncateTableState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -377,11 +377,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:TruncateTableState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.TruncateTableState)
   }
 
   /**
-   * Protobuf enum {@code DeleteTableState}
+   * Protobuf enum {@code hbase.pb.DeleteTableState}
    */
   public enum DeleteTableState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -495,11 +495,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:DeleteTableState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.DeleteTableState)
   }
 
   /**
-   * Protobuf enum {@code AddColumnFamilyState}
+   * Protobuf enum {@code hbase.pb.AddColumnFamilyState}
    */
   public enum AddColumnFamilyState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -604,11 +604,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:AddColumnFamilyState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.AddColumnFamilyState)
   }
 
   /**
-   * Protobuf enum {@code ModifyColumnFamilyState}
+   * Protobuf enum {@code hbase.pb.ModifyColumnFamilyState}
    */
   public enum ModifyColumnFamilyState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -713,11 +713,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:ModifyColumnFamilyState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.ModifyColumnFamilyState)
   }
 
   /**
-   * Protobuf enum {@code DeleteColumnFamilyState}
+   * Protobuf enum {@code hbase.pb.DeleteColumnFamilyState}
    */
   public enum DeleteColumnFamilyState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -831,11 +831,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:DeleteColumnFamilyState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.DeleteColumnFamilyState)
   }
 
   /**
-   * Protobuf enum {@code EnableTableState}
+   * Protobuf enum {@code hbase.pb.EnableTableState}
    */
   public enum EnableTableState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -949,11 +949,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:EnableTableState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.EnableTableState)
   }
 
   /**
-   * Protobuf enum {@code DisableTableState}
+   * Protobuf enum {@code hbase.pb.DisableTableState}
    */
   public enum DisableTableState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -1067,11 +1067,11 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:DisableTableState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.DisableTableState)
   }
 
   /**
-   * Protobuf enum {@code ServerCrashState}
+   * Protobuf enum {@code hbase.pb.ServerCrashState}
    */
   public enum ServerCrashState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -1220,67 +1220,67 @@ public final class MasterProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:ServerCrashState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.ServerCrashState)
   }
 
   public interface CreateTableStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableSchema table_schema = 2;
+    // required .hbase.pb.TableSchema table_schema = 2;
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     boolean hasTableSchema();
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema();
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder();
 
-    // repeated .RegionInfo region_info = 3;
+    // repeated .hbase.pb.RegionInfo region_info = 3;
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     java.util.List 
         getRegionInfoList();
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index);
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     int getRegionInfoCount();
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     java.util.List 
         getRegionInfoOrBuilderList();
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code CreateTableStateData}
+   * Protobuf type {@code hbase.pb.CreateTableStateData}
    */
   public static final class CreateTableStateData extends
       com.google.protobuf.GeneratedMessage
@@ -1381,12 +1381,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_CreateTableStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_CreateTableStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_CreateTableStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_CreateTableStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.CreateTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.CreateTableStateData.Builder.class);
     }
@@ -1407,80 +1407,80 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableSchema table_schema = 2;
+    // required .hbase.pb.TableSchema table_schema = 2;
     public static final int TABLE_SCHEMA_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_;
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     public boolean hasTableSchema() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
       return tableSchema_;
     }
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
       return tableSchema_;
     }
 
-    // repeated .RegionInfo region_info = 3;
+    // repeated .hbase.pb.RegionInfo region_info = 3;
     public static final int REGION_INFO_FIELD_NUMBER = 3;
     private java.util.List regionInfo_;
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public java.util.List getRegionInfoList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public java.util.List 
         getRegionInfoOrBuilderList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public int getRegionInfoCount() {
       return regionInfo_.size();
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
       return regionInfo_.get(index);
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index) {
@@ -1688,19 +1688,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CreateTableStateData}
+     * Protobuf type {@code hbase.pb.CreateTableStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.CreateTableStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_CreateTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_CreateTableStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_CreateTableStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_CreateTableStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.CreateTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.CreateTableStateData.Builder.class);
       }
@@ -1755,7 +1755,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_CreateTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_CreateTableStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.CreateTableStateData getDefaultInstanceForType() {
@@ -1896,18 +1896,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -1917,7 +1917,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -1933,7 +1933,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -1947,7 +1947,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -1966,7 +1966,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -1979,7 +1979,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -1987,7 +1987,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -1997,7 +1997,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -2013,18 +2013,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableSchema table_schema = 2;
+      // required .hbase.pb.TableSchema table_schema = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableSchemaBuilder_;
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public boolean hasTableSchema() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -2034,7 +2034,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder setTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -2050,7 +2050,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder setTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -2064,7 +2064,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder mergeTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -2083,7 +2083,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder clearTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -2096,7 +2096,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableSchemaBuilder() {
         bitField0_ |= 0x00000002;
@@ -2104,7 +2104,7 @@ public final class MasterProcedureProtos {
         return getTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
         if (tableSchemaBuilder_ != null) {
@@ -2114,7 +2114,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -2130,7 +2130,7 @@ public final class MasterProcedureProtos {
         return tableSchemaBuilder_;
       }
 
-      // repeated .RegionInfo region_info = 3;
+      // repeated .hbase.pb.RegionInfo region_info = 3;
       private java.util.List regionInfo_ =
         java.util.Collections.emptyList();
       private void ensureRegionInfoIsMutable() {
@@ -2144,7 +2144,7 @@ public final class MasterProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
 
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public java.util.List getRegionInfoList() {
         if (regionInfoBuilder_ == null) {
@@ -2154,7 +2154,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public int getRegionInfoCount() {
         if (regionInfoBuilder_ == null) {
@@ -2164,7 +2164,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -2174,7 +2174,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -2191,7 +2191,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -2205,7 +2205,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -2221,7 +2221,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -2238,7 +2238,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -2252,7 +2252,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -2266,7 +2266,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addAllRegionInfo(
           java.lang.Iterable values) {
@@ -2280,7 +2280,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -2293,7 +2293,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder removeRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -2306,14 +2306,14 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder(
           int index) {
         return getRegionInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
           int index) {
@@ -2323,7 +2323,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public java.util.List 
            getRegionInfoOrBuilderList() {
@@ -2334,14 +2334,14 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder() {
         return getRegionInfoFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder(
           int index) {
@@ -2349,7 +2349,7 @@ public final class MasterProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public java.util.List 
            getRegionInfoBuilderList() {
@@ -2370,7 +2370,7 @@ public final class MasterProcedureProtos {
         return regionInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CreateTableStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CreateTableStateData)
     }
 
     static {
@@ -2378,51 +2378,51 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CreateTableStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CreateTableStateData)
   }
 
   public interface ModifyTableStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // optional .TableSchema unmodified_table_schema = 2;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 2;
     /**
-     * optional .TableSchema unmodified_table_schema = 2;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
      */
     boolean hasUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 2;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 2;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder();
 
-    // required .TableSchema modified_table_schema = 3;
+    // required .hbase.pb.TableSchema modified_table_schema = 3;
     /**
-     * required .TableSchema modified_table_schema = 3;
+     * required .hbase.pb.TableSchema modified_table_schema = 3;
      */
     boolean hasModifiedTableSchema();
     /**
-     * required .TableSchema modified_table_schema = 3;
+     * required .hbase.pb.TableSchema modified_table_schema = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getModifiedTableSchema();
     /**
-     * required .TableSchema modified_table_schema = 3;
+     * required .hbase.pb.TableSchema modified_table_schema = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getModifiedTableSchemaOrBuilder();
 
@@ -2437,7 +2437,7 @@ public final class MasterProcedureProtos {
     boolean getDeleteColumnFamilyInModify();
   }
   /**
-   * Protobuf type {@code ModifyTableStateData}
+   * Protobuf type {@code hbase.pb.ModifyTableStateData}
    */
   public static final class ModifyTableStateData extends
       com.google.protobuf.GeneratedMessage
@@ -2545,12 +2545,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyTableStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyTableStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyTableStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyTableStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyTableStateData.Builder.class);
     }
@@ -2571,67 +2571,67 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // optional .TableSchema unmodified_table_schema = 2;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 2;
     public static final int UNMODIFIED_TABLE_SCHEMA_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_;
     /**
-     * optional .TableSchema unmodified_table_schema = 2;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
      */
     public boolean hasUnmodifiedTableSchema() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 2;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
       return unmodifiedTableSchema_;
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 2;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
       return unmodifiedTableSchema_;
     }
 
-    // required .TableSchema modified_table_schema = 3;
+    // required .hbase.pb.TableSchema modified_table_schema = 3;
     public static final int MODIFIED_TABLE_SCHEMA_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema modifiedTableSchema_;
     /**
-     * required .TableSchema modified_table_schema = 3;
+     * required .hbase.pb.TableSchema modified_table_schema = 3;
      */
     public boolean hasModifiedTableSchema() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * required .TableSchema modified_table_schema = 3;
+     * required .hbase.pb.TableSchema modified_table_schema = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getModifiedTableSchema() {
       return modifiedTableSchema_;
     }
     /**
-     * required .TableSchema modified_table_schema = 3;
+     * required .hbase.pb.TableSchema modified_table_schema = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getModifiedTableSchemaOrBuilder() {
       return modifiedTableSchema_;
@@ -2878,19 +2878,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyTableStateData}
+     * Protobuf type {@code hbase.pb.ModifyTableStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyTableStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyTableStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyTableStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyTableStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyTableStateData.Builder.class);
       }
@@ -2947,7 +2947,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyTableStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyTableStateData getDefaultInstanceForType() {
@@ -3075,18 +3075,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -3096,7 +3096,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -3112,7 +3112,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -3126,7 +3126,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -3145,7 +3145,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -3158,7 +3158,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -3166,7 +3166,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -3176,7 +3176,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -3192,18 +3192,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // optional .TableSchema unmodified_table_schema = 2;
+      // optional .hbase.pb.TableSchema unmodified_table_schema = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> unmodifiedTableSchemaBuilder_;
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public boolean hasUnmodifiedTableSchema() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -3213,7 +3213,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public Builder setUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -3229,7 +3229,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public Builder setUnmodifiedTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -3243,7 +3243,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public Builder mergeUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -3262,7 +3262,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public Builder clearUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -3275,7 +3275,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getUnmodifiedTableSchemaBuilder() {
         bitField0_ |= 0x00000002;
@@ -3283,7 +3283,7 @@ public final class MasterProcedureProtos {
         return getUnmodifiedTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
         if (unmodifiedTableSchemaBuilder_ != null) {
@@ -3293,7 +3293,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 2;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -3309,18 +3309,18 @@ public final class MasterProcedureProtos {
         return unmodifiedTableSchemaBuilder_;
       }
 
-      // required .TableSchema modified_table_schema = 3;
+      // required .hbase.pb.TableSchema modified_table_schema = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema modifiedTableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> modifiedTableSchemaBuilder_;
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public boolean hasModifiedTableSchema() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getModifiedTableSchema() {
         if (modifiedTableSchemaBuilder_ == null) {
@@ -3330,7 +3330,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public Builder setModifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (modifiedTableSchemaBuilder_ == null) {
@@ -3346,7 +3346,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public Builder setModifiedTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -3360,7 +3360,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public Builder mergeModifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (modifiedTableSchemaBuilder_ == null) {
@@ -3379,7 +3379,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public Builder clearModifiedTableSchema() {
         if (modifiedTableSchemaBuilder_ == null) {
@@ -3392,7 +3392,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getModifiedTableSchemaBuilder() {
         bitField0_ |= 0x00000004;
@@ -3400,7 +3400,7 @@ public final class MasterProcedureProtos {
         return getModifiedTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getModifiedTableSchemaOrBuilder() {
         if (modifiedTableSchemaBuilder_ != null) {
@@ -3410,7 +3410,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableSchema modified_table_schema = 3;
+       * required .hbase.pb.TableSchema modified_table_schema = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -3459,7 +3459,7 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyTableStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyTableStateData)
     }
 
     static {
@@ -3467,23 +3467,23 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyTableStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyTableStateData)
   }
 
   public interface TruncateTableStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
@@ -3497,61 +3497,61 @@ public final class MasterProcedureProtos {
      */
     boolean getPreserveSplits();
 
-    // optional .TableName table_name = 3;
+    // optional .hbase.pb.TableName table_name = 3;
     /**
-     * optional .TableName table_name = 3;
+     * optional .hbase.pb.TableName table_name = 3;
      */
     boolean hasTableName();
     /**
-     * optional .TableName table_name = 3;
+     * optional .hbase.pb.TableName table_name = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * optional .TableName table_name = 3;
+     * optional .hbase.pb.TableName table_name = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // optional .TableSchema table_schema = 4;
+    // optional .hbase.pb.TableSchema table_schema = 4;
     /**
-     * optional .TableSchema table_schema = 4;
+     * optional .hbase.pb.TableSchema table_schema = 4;
      */
     boolean hasTableSchema();
     /**
-     * optional .TableSchema table_schema = 4;
+     * optional .hbase.pb.TableSchema table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema();
     /**
-     * optional .TableSchema table_schema = 4;
+     * optional .hbase.pb.TableSchema table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder();
 
-    // repeated .RegionInfo region_info = 5;
+    // repeated .hbase.pb.RegionInfo region_info = 5;
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     java.util.List 
         getRegionInfoList();
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index);
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     int getRegionInfoCount();
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     java.util.List 
         getRegionInfoOrBuilderList();
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code TruncateTableStateData}
+   * Protobuf type {@code hbase.pb.TruncateTableStateData}
    */
   public static final class TruncateTableStateData extends
       com.google.protobuf.GeneratedMessage
@@ -3670,12 +3670,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_TruncateTableStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_TruncateTableStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_TruncateTableStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_TruncateTableStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.TruncateTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.TruncateTableStateData.Builder.class);
     }
@@ -3696,23 +3696,23 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
@@ -3734,80 +3734,80 @@ public final class MasterProcedureProtos {
       return preserveSplits_;
     }
 
-    // optional .TableName table_name = 3;
+    // optional .hbase.pb.TableName table_name = 3;
     public static final int TABLE_NAME_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * optional .TableName table_name = 3;
+     * optional .hbase.pb.TableName table_name = 3;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .TableName table_name = 3;
+     * optional .hbase.pb.TableName table_name = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * optional .TableName table_name = 3;
+     * optional .hbase.pb.TableName table_name = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // optional .TableSchema table_schema = 4;
+    // optional .hbase.pb.TableSchema table_schema = 4;
     public static final int TABLE_SCHEMA_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_;
     /**
-     * optional .TableSchema table_schema = 4;
+     * optional .hbase.pb.TableSchema table_schema = 4;
      */
     public boolean hasTableSchema() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TableSchema table_schema = 4;
+     * optional .hbase.pb.TableSchema table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
       return tableSchema_;
     }
     /**
-     * optional .TableSchema table_schema = 4;
+     * optional .hbase.pb.TableSchema table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
       return tableSchema_;
     }
 
-    // repeated .RegionInfo region_info = 5;
+    // repeated .hbase.pb.RegionInfo region_info = 5;
     public static final int REGION_INFO_FIELD_NUMBER = 5;
     private java.util.List regionInfo_;
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     public java.util.List getRegionInfoList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     public java.util.List 
         getRegionInfoOrBuilderList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     public int getRegionInfoCount() {
       return regionInfo_.size();
     }
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
       return regionInfo_.get(index);
     }
     /**
-     * repeated .RegionInfo region_info = 5;
+     * repeated .hbase.pb.RegionInfo region_info = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index) {
@@ -4057,19 +4057,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TruncateTableStateData}
+     * Protobuf type {@code hbase.pb.TruncateTableStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.TruncateTableStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_TruncateTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_TruncateTableStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_TruncateTableStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_TruncateTableStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.TruncateTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.TruncateTableStateData.Builder.class);
       }
@@ -4133,7 +4133,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_TruncateTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_TruncateTableStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.TruncateTableStateData getDefaultInstanceForType() {
@@ -4300,18 +4300,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -4321,7 +4321,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -4337,7 +4337,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -4351,7 +4351,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -4370,7 +4370,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -4383,7 +4383,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -4391,7 +4391,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -4401,7 +4401,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -4450,18 +4450,18 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // optional .TableName table_name = 3;
+      // optional .hbase.pb.TableName table_name = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -4471,7 +4471,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -4487,7 +4487,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -4501,7 +4501,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -4520,7 +4520,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -4533,7 +4533,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000004;
@@ -4541,7 +4541,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -4551,7 +4551,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableName table_name = 3;
+       * optional .hbase.pb.TableName table_name = 3;
        */
       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> 
@@ -4567,18 +4567,18 @@ public final class MasterProcedureProtos {
         return tableNameBuilder_;
       }
 
-      // optional .TableSchema table_schema = 4;
+      // optional .hbase.pb.TableSchema table_schema = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableSchemaBuilder_;
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public boolean hasTableSchema() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -4588,7 +4588,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public Builder setTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -4604,7 +4604,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public Builder setTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -4618,7 +4618,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public Builder mergeTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -4637,7 +4637,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public Builder clearTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -4650,7 +4650,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableSchemaBuilder() {
         bitField0_ |= 0x00000008;
@@ -4658,7 +4658,7 @@ public final class MasterProcedureProtos {
         return getTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
         if (tableSchemaBuilder_ != null) {
@@ -4668,7 +4668,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema table_schema = 4;
+       * optional .hbase.pb.TableSchema table_schema = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -4684,7 +4684,7 @@ public final class MasterProcedureProtos {
         return tableSchemaBuilder_;
       }
 
-      // repeated .RegionInfo region_info = 5;
+      // repeated .hbase.pb.RegionInfo region_info = 5;
       private java.util.List regionInfo_ =
         java.util.Collections.emptyList();
       private void ensureRegionInfoIsMutable() {
@@ -4698,7 +4698,7 @@ public final class MasterProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
 
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public java.util.List getRegionInfoList() {
         if (regionInfoBuilder_ == null) {
@@ -4708,7 +4708,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public int getRegionInfoCount() {
         if (regionInfoBuilder_ == null) {
@@ -4718,7 +4718,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -4728,7 +4728,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -4745,7 +4745,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -4759,7 +4759,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder addRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -4775,7 +4775,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -4792,7 +4792,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder addRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -4806,7 +4806,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -4820,7 +4820,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder addAllRegionInfo(
           java.lang.Iterable values) {
@@ -4834,7 +4834,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -4847,7 +4847,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public Builder removeRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -4860,14 +4860,14 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder(
           int index) {
         return getRegionInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
           int index) {
@@ -4877,7 +4877,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public java.util.List 
            getRegionInfoOrBuilderList() {
@@ -4888,14 +4888,14 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder() {
         return getRegionInfoFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder(
           int index) {
@@ -4903,7 +4903,7 @@ public final class MasterProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 5;
+       * repeated .hbase.pb.RegionInfo region_info = 5;
        */
       public java.util.List 
            getRegionInfoBuilderList() {
@@ -4924,7 +4924,7 @@ public final class MasterProcedureProtos {
         return regionInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:TruncateTableStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TruncateTableStateData)
     }
 
     static {
@@ -4932,67 +4932,67 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TruncateTableStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TruncateTableStateData)
   }
 
   public interface DeleteTableStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // repeated .RegionInfo region_info = 3;
+    // repeated .hbase.pb.RegionInfo region_info = 3;
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     java.util.List 
         getRegionInfoList();
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index);
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     int getRegionInfoCount();
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     java.util.List 
         getRegionInfoOrBuilderList();
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code DeleteTableStateData}
+   * Protobuf type {@code hbase.pb.DeleteTableStateData}
    */
   public static final class DeleteTableStateData extends
       com.google.protobuf.GeneratedMessage
@@ -5093,12 +5093,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteTableStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteTableStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteTableStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteTableStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteTableStateData.Builder.class);
     }
@@ -5119,80 +5119,80 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // repeated .RegionInfo region_info = 3;
+    // repeated .hbase.pb.RegionInfo region_info = 3;
     public static final int REGION_INFO_FIELD_NUMBER = 3;
     private java.util.List regionInfo_;
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public java.util.List getRegionInfoList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public java.util.List 
         getRegionInfoOrBuilderList() {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public int getRegionInfoCount() {
       return regionInfo_.size();
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
       return regionInfo_.get(index);
     }
     /**
-     * repeated .RegionInfo region_info = 3;
+     * repeated .hbase.pb.RegionInfo region_info = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
         int index) {
@@ -5400,19 +5400,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteTableStateData}
+     * Protobuf type {@code hbase.pb.DeleteTableStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteTableStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteTableStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteTableStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteTableStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteTableStateData.Builder.class);
       }
@@ -5467,7 +5467,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteTableStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteTableStateData getDefaultInstanceForType() {
@@ -5608,18 +5608,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -5629,7 +5629,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -5645,7 +5645,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -5659,7 +5659,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -5678,7 +5678,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -5691,7 +5691,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -5699,7 +5699,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -5709,7 +5709,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -5725,18 +5725,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -5746,7 +5746,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -5762,7 +5762,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -5776,7 +5776,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -5795,7 +5795,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -5808,7 +5808,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -5816,7 +5816,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -5826,7 +5826,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -5842,7 +5842,7 @@ public final class MasterProcedureProtos {
         return tableNameBuilder_;
       }
 
-      // repeated .RegionInfo region_info = 3;
+      // repeated .hbase.pb.RegionInfo region_info = 3;
       private java.util.List regionInfo_ =
         java.util.Collections.emptyList();
       private void ensureRegionInfoIsMutable() {
@@ -5856,7 +5856,7 @@ public final class MasterProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
 
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public java.util.List getRegionInfoList() {
         if (regionInfoBuilder_ == null) {
@@ -5866,7 +5866,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public int getRegionInfoCount() {
         if (regionInfoBuilder_ == null) {
@@ -5876,7 +5876,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -5886,7 +5886,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -5903,7 +5903,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder setRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -5917,7 +5917,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionInfoBuilder_ == null) {
@@ -5933,7 +5933,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -5950,7 +5950,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -5964,7 +5964,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addRegionInfo(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -5978,7 +5978,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder addAllRegionInfo(
           java.lang.Iterable values) {
@@ -5992,7 +5992,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder clearRegionInfo() {
         if (regionInfoBuilder_ == null) {
@@ -6005,7 +6005,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public Builder removeRegionInfo(int index) {
         if (regionInfoBuilder_ == null) {
@@ -6018,14 +6018,14 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionInfoBuilder(
           int index) {
         return getRegionInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionInfoOrBuilder(
           int index) {
@@ -6035,7 +6035,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public java.util.List 
            getRegionInfoOrBuilderList() {
@@ -6046,14 +6046,14 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder() {
         return getRegionInfoFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionInfoBuilder(
           int index) {
@@ -6061,7 +6061,7 @@ public final class MasterProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 3;
+       * repeated .hbase.pb.RegionInfo region_info = 3;
        */
       public java.util.List 
            getRegionInfoBuilderList() {
@@ -6082,7 +6082,7 @@ public final class MasterProcedureProtos {
         return regionInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteTableStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteTableStateData)
     }
 
     static {
@@ -6090,70 +6090,70 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteTableStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteTableStateData)
   }
 
   public interface AddColumnFamilyStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // required .ColumnFamilySchema columnfamily_schema = 3;
+    // required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     boolean hasColumnfamilySchema();
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnfamilySchema();
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnfamilySchemaOrBuilder();
 
-    // optional .TableSchema unmodified_table_schema = 4;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     boolean hasUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder();
   }
   /**
-   * Protobuf type {@code AddColumnFamilyStateData}
+   * Protobuf type {@code hbase.pb.AddColumnFamilyStateData}
    */
   public static final class AddColumnFamilyStateData extends
       com.google.protobuf.GeneratedMessage
@@ -6269,12 +6269,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_AddColumnFamilyStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_AddColumnFamilyStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_AddColumnFamilyStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_AddColumnFamilyStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStateData.Builder.class);
     }
@@ -6295,89 +6295,89 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // required .ColumnFamilySchema columnfamily_schema = 3;
+    // required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
     public static final int COLUMNFAMILY_SCHEMA_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnfamilySchema_;
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     public boolean hasColumnfamilySchema() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnfamilySchema() {
       return columnfamilySchema_;
     }
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnfamilySchemaOrBuilder() {
       return columnfamilySchema_;
     }
 
-    // optional .TableSchema unmodified_table_schema = 4;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
     public static final int UNMODIFIED_TABLE_SCHEMA_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_;
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public boolean hasUnmodifiedTableSchema() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
       return unmodifiedTableSchema_;
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
       return unmodifiedTableSchema_;
@@ -6612,19 +6612,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AddColumnFamilyStateData}
+     * Protobuf type {@code hbase.pb.AddColumnFamilyStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_AddColumnFamilyStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_AddColumnFamilyStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_AddColumnFamilyStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_AddColumnFamilyStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStateData.Builder.class);
       }
@@ -6686,7 +6686,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_AddColumnFamilyStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_AddColumnFamilyStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyStateData getDefaultInstanceForType() {
@@ -6822,18 +6822,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -6843,7 +6843,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -6859,7 +6859,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -6873,7 +6873,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -6892,7 +6892,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -6905,7 +6905,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -6913,7 +6913,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -6923,7 +6923,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -6939,18 +6939,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -6960,7 +6960,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -6976,7 +6976,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -6990,7 +6990,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -7009,7 +7009,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -7022,7 +7022,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -7030,7 +7030,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -7040,7 +7040,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -7056,18 +7056,18 @@ public final class MasterProcedureProtos {
         return tableNameBuilder_;
       }
 
-      // required .ColumnFamilySchema columnfamily_schema = 3;
+      // required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnfamilySchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> columnfamilySchemaBuilder_;
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public boolean hasColumnfamilySchema() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnfamilySchema() {
         if (columnfamilySchemaBuilder_ == null) {
@@ -7077,7 +7077,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder setColumnfamilySchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnfamilySchemaBuilder_ == null) {
@@ -7093,7 +7093,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder setColumnfamilySchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -7107,7 +7107,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder mergeColumnfamilySchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnfamilySchemaBuilder_ == null) {
@@ -7126,7 +7126,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder clearColumnfamilySchema() {
         if (columnfamilySchemaBuilder_ == null) {
@@ -7139,7 +7139,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder getColumnfamilySchemaBuilder() {
         bitField0_ |= 0x00000004;
@@ -7147,7 +7147,7 @@ public final class MasterProcedureProtos {
         return getColumnfamilySchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnfamilySchemaOrBuilder() {
         if (columnfamilySchemaBuilder_ != null) {
@@ -7157,7 +7157,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> 
@@ -7173,18 +7173,18 @@ public final class MasterProcedureProtos {
         return columnfamilySchemaBuilder_;
       }
 
-      // optional .TableSchema unmodified_table_schema = 4;
+      // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> unmodifiedTableSchemaBuilder_;
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public boolean hasUnmodifiedTableSchema() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -7194,7 +7194,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder setUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -7210,7 +7210,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder setUnmodifiedTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -7224,7 +7224,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder mergeUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -7243,7 +7243,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder clearUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -7256,7 +7256,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getUnmodifiedTableSchemaBuilder() {
         bitField0_ |= 0x00000008;
@@ -7264,7 +7264,7 @@ public final class MasterProcedureProtos {
         return getUnmodifiedTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
         if (unmodifiedTableSchemaBuilder_ != null) {
@@ -7274,7 +7274,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -7290,7 +7290,7 @@ public final class MasterProcedureProtos {
         return unmodifiedTableSchemaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:AddColumnFamilyStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AddColumnFamilyStateData)
     }
 
     static {
@@ -7298,70 +7298,70 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AddColumnFamilyStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AddColumnFamilyStateData)
   }
 
   public interface ModifyColumnFamilyStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // required .ColumnFamilySchema columnfamily_schema = 3;
+    // required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     boolean hasColumnfamilySchema();
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnfamilySchema();
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnfamilySchemaOrBuilder();
 
-    // optional .TableSchema unmodified_table_schema = 4;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     boolean hasUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder();
   }
   /**
-   * Protobuf type {@code ModifyColumnFamilyStateData}
+   * Protobuf type {@code hbase.pb.ModifyColumnFamilyStateData}
    */
   public static final class ModifyColumnFamilyStateData extends
       com.google.protobuf.GeneratedMessage
@@ -7477,12 +7477,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyColumnFamilyStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyColumnFamilyStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyColumnFamilyStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyColumnFamilyStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStateData.Builder.class);
     }
@@ -7503,89 +7503,89 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // required .ColumnFamilySchema columnfamily_schema = 3;
+    // required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
     public static final int COLUMNFAMILY_SCHEMA_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnfamilySchema_;
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     public boolean hasColumnfamilySchema() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnfamilySchema() {
       return columnfamilySchema_;
     }
     /**
-     * required .ColumnFamilySchema columnfamily_schema = 3;
+     * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnfamilySchemaOrBuilder() {
       return columnfamilySchema_;
     }
 
-    // optional .TableSchema unmodified_table_schema = 4;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
     public static final int UNMODIFIED_TABLE_SCHEMA_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_;
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public boolean hasUnmodifiedTableSchema() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
       return unmodifiedTableSchema_;
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
       return unmodifiedTableSchema_;
@@ -7820,19 +7820,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyColumnFamilyStateData}
+     * Protobuf type {@code hbase.pb.ModifyColumnFamilyStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyColumnFamilyStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyColumnFamilyStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyColumnFamilyStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyColumnFamilyStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStateData.Builder.class);
       }
@@ -7894,7 +7894,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ModifyColumnFamilyStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ModifyColumnFamilyStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ModifyColumnFamilyStateData getDefaultInstanceForType() {
@@ -8030,18 +8030,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -8051,7 +8051,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -8067,7 +8067,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -8081,7 +8081,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -8100,7 +8100,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -8113,7 +8113,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -8121,7 +8121,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -8131,7 +8131,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -8147,18 +8147,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -8168,7 +8168,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -8184,7 +8184,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -8198,7 +8198,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -8217,7 +8217,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -8230,7 +8230,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -8238,7 +8238,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -8248,7 +8248,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -8264,18 +8264,18 @@ public final class MasterProcedureProtos {
         return tableNameBuilder_;
       }
 
-      // required .ColumnFamilySchema columnfamily_schema = 3;
+      // required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnfamilySchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> columnfamilySchemaBuilder_;
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public boolean hasColumnfamilySchema() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnfamilySchema() {
         if (columnfamilySchemaBuilder_ == null) {
@@ -8285,7 +8285,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder setColumnfamilySchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnfamilySchemaBuilder_ == null) {
@@ -8301,7 +8301,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder setColumnfamilySchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -8315,7 +8315,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder mergeColumnfamilySchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnfamilySchemaBuilder_ == null) {
@@ -8334,7 +8334,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public Builder clearColumnfamilySchema() {
         if (columnfamilySchemaBuilder_ == null) {
@@ -8347,7 +8347,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder getColumnfamilySchemaBuilder() {
         bitField0_ |= 0x00000004;
@@ -8355,7 +8355,7 @@ public final class MasterProcedureProtos {
         return getColumnfamilySchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnfamilySchemaOrBuilder() {
         if (columnfamilySchemaBuilder_ != null) {
@@ -8365,7 +8365,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema columnfamily_schema = 3;
+       * required .hbase.pb.ColumnFamilySchema columnfamily_schema = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> 
@@ -8381,18 +8381,18 @@ public final class MasterProcedureProtos {
         return columnfamilySchemaBuilder_;
       }
 
-      // optional .TableSchema unmodified_table_schema = 4;
+      // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> unmodifiedTableSchemaBuilder_;
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public boolean hasUnmodifiedTableSchema() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -8402,7 +8402,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder setUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -8418,7 +8418,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder setUnmodifiedTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -8432,7 +8432,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder mergeUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -8451,7 +8451,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder clearUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -8464,7 +8464,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getUnmodifiedTableSchemaBuilder() {
         bitField0_ |= 0x00000008;
@@ -8472,7 +8472,7 @@ public final class MasterProcedureProtos {
         return getUnmodifiedTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
         if (unmodifiedTableSchemaBuilder_ != null) {
@@ -8482,7 +8482,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -8498,7 +8498,7 @@ public final class MasterProcedureProtos {
         return unmodifiedTableSchemaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyColumnFamilyStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyColumnFamilyStateData)
     }
 
     static {
@@ -8506,37 +8506,37 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyColumnFamilyStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyColumnFamilyStateData)
   }
 
   public interface DeleteColumnFamilyStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -8550,22 +8550,22 @@ public final class MasterProcedureProtos {
      */
     com.google.protobuf.ByteString getColumnfamilyName();
 
-    // optional .TableSchema unmodified_table_schema = 4;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     boolean hasUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema();
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder();
   }
   /**
-   * Protobuf type {@code DeleteColumnFamilyStateData}
+   * Protobuf type {@code hbase.pb.DeleteColumnFamilyStateData}
    */
   public static final class DeleteColumnFamilyStateData extends
       com.google.protobuf.GeneratedMessage
@@ -8673,12 +8673,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteColumnFamilyStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteColumnFamilyStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteColumnFamilyStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteColumnFamilyStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStateData.Builder.class);
     }
@@ -8699,45 +8699,45 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -8759,23 +8759,23 @@ public final class MasterProcedureProtos {
       return columnfamilyName_;
     }
 
-    // optional .TableSchema unmodified_table_schema = 4;
+    // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
     public static final int UNMODIFIED_TABLE_SCHEMA_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_;
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public boolean hasUnmodifiedTableSchema() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
       return unmodifiedTableSchema_;
     }
     /**
-     * optional .TableSchema unmodified_table_schema = 4;
+     * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
       return unmodifiedTableSchema_;
@@ -9006,19 +9006,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteColumnFamilyStateData}
+     * Protobuf type {@code hbase.pb.DeleteColumnFamilyStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteColumnFamilyStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteColumnFamilyStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteColumnFamilyStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteColumnFamilyStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStateData.Builder.class);
       }
@@ -9075,7 +9075,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DeleteColumnFamilyStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DeleteColumnFamilyStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DeleteColumnFamilyStateData getDefaultInstanceForType() {
@@ -9203,18 +9203,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -9224,7 +9224,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -9240,7 +9240,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -9254,7 +9254,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -9273,7 +9273,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -9286,7 +9286,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -9294,7 +9294,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -9304,7 +9304,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -9320,18 +9320,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -9341,7 +9341,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -9357,7 +9357,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -9371,7 +9371,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -9390,7 +9390,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -9403,7 +9403,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -9411,7 +9411,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -9421,7 +9421,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -9473,18 +9473,18 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // optional .TableSchema unmodified_table_schema = 4;
+      // optional .hbase.pb.TableSchema unmodified_table_schema = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema unmodifiedTableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> unmodifiedTableSchemaBuilder_;
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public boolean hasUnmodifiedTableSchema() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -9494,7 +9494,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder setUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -9510,7 +9510,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder setUnmodifiedTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -9524,7 +9524,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder mergeUnmodifiedTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -9543,7 +9543,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public Builder clearUnmodifiedTableSchema() {
         if (unmodifiedTableSchemaBuilder_ == null) {
@@ -9556,7 +9556,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getUnmodifiedTableSchemaBuilder() {
         bitField0_ |= 0x00000008;
@@ -9564,7 +9564,7 @@ public final class MasterProcedureProtos {
         return getUnmodifiedTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getUnmodifiedTableSchemaOrBuilder() {
         if (unmodifiedTableSchemaBuilder_ != null) {
@@ -9574,7 +9574,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * optional .TableSchema unmodified_table_schema = 4;
+       * optional .hbase.pb.TableSchema unmodified_table_schema = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -9590,7 +9590,7 @@ public final class MasterProcedureProtos {
         return unmodifiedTableSchemaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteColumnFamilyStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteColumnFamilyStateData)
     }
 
     static {
@@ -9598,37 +9598,37 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteColumnFamilyStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteColumnFamilyStateData)
   }
 
   public interface EnableTableStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -9643,7 +9643,7 @@ public final class MasterProcedureProtos {
     boolean getSkipTableStateCheck();
   }
   /**
-   * Protobuf type {@code EnableTableStateData}
+   * Protobuf type {@code hbase.pb.EnableTableStateData}
    */
   public static final class EnableTableStateData extends
       com.google.protobuf.GeneratedMessage
@@ -9738,12 +9738,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_EnableTableStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_EnableTableStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_EnableTableStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_EnableTableStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.EnableTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.EnableTableStateData.Builder.class);
     }
@@ -9764,45 +9764,45 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -10026,19 +10026,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code EnableTableStateData}
+     * Protobuf type {@code hbase.pb.EnableTableStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.EnableTableStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_EnableTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_EnableTableStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_EnableTableStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_EnableTableStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.EnableTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.EnableTableStateData.Builder.class);
       }
@@ -10088,7 +10088,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_EnableTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_EnableTableStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.EnableTableStateData getDefaultInstanceForType() {
@@ -10199,18 +10199,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -10220,7 +10220,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -10236,7 +10236,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -10250,7 +10250,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -10269,7 +10269,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -10282,7 +10282,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -10290,7 +10290,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -10300,7 +10300,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -10316,18 +10316,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -10337,7 +10337,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -10353,7 +10353,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -10367,7 +10367,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -10386,7 +10386,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -10399,7 +10399,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -10407,7 +10407,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -10417,7 +10417,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -10466,7 +10466,7 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:EnableTableStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.EnableTableStateData)
     }
 
     static {
@@ -10474,37 +10474,37 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:EnableTableStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.EnableTableStateData)
   }
 
   public interface DisableTableStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -10519,7 +10519,7 @@ public final class MasterProcedureProtos {
     boolean getSkipTableStateCheck();
   }
   /**
-   * Protobuf type {@code DisableTableStateData}
+   * Protobuf type {@code hbase.pb.DisableTableStateData}
    */
   public static final class DisableTableStateData extends
       com.google.protobuf.GeneratedMessage
@@ -10614,12 +10614,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DisableTableStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DisableTableStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DisableTableStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DisableTableStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DisableTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DisableTableStateData.Builder.class);
     }
@@ -10640,45 +10640,45 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .UserInformation user_info = 1;
+    // required .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * required .UserInformation user_info = 1;
+     * required .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
     }
 
-    // required .TableName table_name = 2;
+    // required .hbase.pb.TableName table_name = 2;
     public static final int TABLE_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 2;
+     * required .hbase.pb.TableName table_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -10902,19 +10902,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DisableTableStateData}
+     * Protobuf type {@code hbase.pb.DisableTableStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DisableTableStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DisableTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DisableTableStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DisableTableStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DisableTableStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DisableTableStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DisableTableStateData.Builder.class);
       }
@@ -10964,7 +10964,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_DisableTableStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_DisableTableStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.DisableTableStateData getDefaultInstanceForType() {
@@ -11075,18 +11075,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .UserInformation user_info = 1;
+      // required .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -11096,7 +11096,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -11112,7 +11112,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -11126,7 +11126,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -11145,7 +11145,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -11158,7 +11158,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -11166,7 +11166,7 @@ public final class MasterProcedureProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -11176,7 +11176,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .UserInformation user_info = 1;
+       * required .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -11192,18 +11192,18 @@ public final class MasterProcedureProtos {
         return userInfoBuilder_;
       }
 
-      // required .TableName table_name = 2;
+      // required .hbase.pb.TableName table_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -11213,7 +11213,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -11229,7 +11229,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -11243,7 +11243,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -11262,7 +11262,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -11275,7 +11275,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -11283,7 +11283,7 @@ public final class MasterProcedureProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -11293,7 +11293,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .TableName table_name = 2;
+       * required .hbase.pb.TableName table_name = 2;
        */
       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> 
@@ -11342,7 +11342,7 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DisableTableStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DisableTableStateData)
     }
 
     static {
@@ -11350,23 +11350,23 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DisableTableStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DisableTableStateData)
   }
 
   public interface ServerCrashStateDataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server_name = 1;
+    // required .hbase.pb.ServerName server_name = 1;
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     boolean hasServerName();
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName();
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder();
 
@@ -11380,52 +11380,52 @@ public final class MasterProcedureProtos {
      */
     boolean getDistributedLogReplay();
 
-    // repeated .RegionInfo regions_on_crashed_server = 3;
+    // repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     java.util.List 
         getRegionsOnCrashedServerList();
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionsOnCrashedServer(int index);
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     int getRegionsOnCrashedServerCount();
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     java.util.List 
         getRegionsOnCrashedServerOrBuilderList();
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionsOnCrashedServerOrBuilder(
         int index);
 
-    // repeated .RegionInfo regions_assigned = 4;
+    // repeated .hbase.pb.RegionInfo regions_assigned = 4;
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     java.util.List 
         getRegionsAssignedList();
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionsAssigned(int index);
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     int getRegionsAssignedCount();
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     java.util.List 
         getRegionsAssignedOrBuilderList();
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionsAssignedOrBuilder(
         int index);
@@ -11451,7 +11451,7 @@ public final class MasterProcedureProtos {
     boolean getShouldSplitWal();
   }
   /**
-   * Protobuf type {@code ServerCrashStateData}
+   * Protobuf type {@code hbase.pb.ServerCrashStateData}
    */
   public static final class ServerCrashStateData extends
       com.google.protobuf.GeneratedMessage
@@ -11565,12 +11565,12 @@ public final class MasterProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ServerCrashStateData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ServerCrashStateData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ServerCrashStateData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ServerCrashStateData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ServerCrashStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ServerCrashStateData.Builder.class);
     }
@@ -11591,23 +11591,23 @@ public final class MasterProcedureProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server_name = 1;
+    // required .hbase.pb.ServerName server_name = 1;
     public static final int SERVER_NAME_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName serverName_;
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     public boolean hasServerName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName() {
       return serverName_;
     }
     /**
-     * required .ServerName server_name = 1;
+     * required .hbase.pb.ServerName server_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder() {
       return serverName_;
@@ -11629,72 +11629,72 @@ public final class MasterProcedureProtos {
       return distributedLogReplay_;
     }
 
-    // repeated .RegionInfo regions_on_crashed_server = 3;
+    // repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
     public static final int REGIONS_ON_CRASHED_SERVER_FIELD_NUMBER = 3;
     private java.util.List regionsOnCrashedServer_;
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     public java.util.List getRegionsOnCrashedServerList() {
       return regionsOnCrashedServer_;
     }
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     public java.util.List 
         getRegionsOnCrashedServerOrBuilderList() {
       return regionsOnCrashedServer_;
     }
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     public int getRegionsOnCrashedServerCount() {
       return regionsOnCrashedServer_.size();
     }
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionsOnCrashedServer(int index) {
       return regionsOnCrashedServer_.get(index);
     }
     /**
-     * repeated .RegionInfo regions_on_crashed_server = 3;
+     * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionsOnCrashedServerOrBuilder(
         int index) {
       return regionsOnCrashedServer_.get(index);
     }
 
-    // repeated .RegionInfo regions_assigned = 4;
+    // repeated .hbase.pb.RegionInfo regions_assigned = 4;
     public static final int REGIONS_ASSIGNED_FIELD_NUMBER = 4;
     private java.util.List regionsAssigned_;
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     public java.util.List getRegionsAssignedList() {
       return regionsAssigned_;
     }
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     public java.util.List 
         getRegionsAssignedOrBuilderList() {
       return regionsAssigned_;
     }
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     public int getRegionsAssignedCount() {
       return regionsAssigned_.size();
     }
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionsAssigned(int index) {
       return regionsAssigned_.get(index);
     }
     /**
-     * repeated .RegionInfo regions_assigned = 4;
+     * repeated .hbase.pb.RegionInfo regions_assigned = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionsAssignedOrBuilder(
         int index) {
@@ -11980,19 +11980,19 @@ public final class MasterProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ServerCrashStateData}
+     * Protobuf type {@code hbase.pb.ServerCrashStateData}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ServerCrashStateDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ServerCrashStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ServerCrashStateData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ServerCrashStateData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ServerCrashStateData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ServerCrashStateData.class, org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ServerCrashStateData.Builder.class);
       }
@@ -12053,7 +12053,7 @@ public final class MasterProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_ServerCrashStateData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.internal_static_hbase_pb_ServerCrashStateData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.ServerCrashStateData getDefaultInstanceForType() {
@@ -12237,18 +12237,18 @@ public final class MasterProcedureProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server_name = 1;
+      // required .hbase.pb.ServerName server_name = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName serverName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverNameBuilder_;
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public boolean hasServerName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName() {
         if (serverNameBuilder_ == null) {
@@ -12258,7 +12258,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder setServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverNameBuilder_ == null) {
@@ -12274,7 +12274,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder setServerName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -12288,7 +12288,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder mergeServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverNameBuilder_ == null) {
@@ -12307,7 +12307,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public Builder clearServerName() {
         if (serverNameBuilder_ == null) {
@@ -12320,7 +12320,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getServerNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -12328,7 +12328,7 @@ public final class MasterProcedureProtos {
         return getServerNameFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder() {
         if (serverNameBuilder_ != null) {
@@ -12338,7 +12338,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * required .ServerName server_name = 1;
+       * required .hbase.pb.ServerName server_name = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -12387,7 +12387,7 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // repeated .RegionInfo regions_on_crashed_server = 3;
+      // repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
       private java.util.List regionsOnCrashedServer_ =
         java.util.Collections.emptyList();
       private void ensureRegionsOnCrashedServerIsMutable() {
@@ -12401,7 +12401,7 @@ public final class MasterProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionsOnCrashedServerBuilder_;
 
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public java.util.List getRegionsOnCrashedServerList() {
         if (regionsOnCrashedServerBuilder_ == null) {
@@ -12411,7 +12411,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public int getRegionsOnCrashedServerCount() {
         if (regionsOnCrashedServerBuilder_ == null) {
@@ -12421,7 +12421,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionsOnCrashedServer(int index) {
         if (regionsOnCrashedServerBuilder_ == null) {
@@ -12431,7 +12431,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder setRegionsOnCrashedServer(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -12448,7 +12448,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder setRegionsOnCrashedServer(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -12462,7 +12462,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder addRegionsOnCrashedServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionsOnCrashedServerBuilder_ == null) {
@@ -12478,7 +12478,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder addRegionsOnCrashedServer(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -12495,7 +12495,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder addRegionsOnCrashedServer(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -12509,7 +12509,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder addRegionsOnCrashedServer(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -12523,7 +12523,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder addAllRegionsOnCrashedServer(
           java.lang.Iterable values) {
@@ -12537,7 +12537,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder clearRegionsOnCrashedServer() {
         if (regionsOnCrashedServerBuilder_ == null) {
@@ -12550,7 +12550,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public Builder removeRegionsOnCrashedServer(int index) {
         if (regionsOnCrashedServerBuilder_ == null) {
@@ -12563,14 +12563,14 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionsOnCrashedServerBuilder(
           int index) {
         return getRegionsOnCrashedServerFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionsOnCrashedServerOrBuilder(
           int index) {
@@ -12580,7 +12580,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public java.util.List 
            getRegionsOnCrashedServerOrBuilderList() {
@@ -12591,14 +12591,14 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionsOnCrashedServerBuilder() {
         return getRegionsOnCrashedServerFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionsOnCrashedServerBuilder(
           int index) {
@@ -12606,7 +12606,7 @@ public final class MasterProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo regions_on_crashed_server = 3;
+       * repeated .hbase.pb.RegionInfo regions_on_crashed_server = 3;
        */
       public java.util.List 
            getRegionsOnCrashedServerBuilderList() {
@@ -12627,7 +12627,7 @@ public final class MasterProcedureProtos {
         return regionsOnCrashedServerBuilder_;
       }
 
-      // repeated .RegionInfo regions_assigned = 4;
+      // repeated .hbase.pb.RegionInfo regions_assigned = 4;
       private java.util.List regionsAssigned_ =
         java.util.Collections.emptyList();
       private void ensureRegionsAssignedIsMutable() {
@@ -12641,7 +12641,7 @@ public final class MasterProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionsAssignedBuilder_;
 
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public java.util.List getRegionsAssignedList() {
         if (regionsAssignedBuilder_ == null) {
@@ -12651,7 +12651,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public int getRegionsAssignedCount() {
         if (regionsAssignedBuilder_ == null) {
@@ -12661,7 +12661,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionsAssigned(int index) {
         if (regionsAssignedBuilder_ == null) {
@@ -12671,7 +12671,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder setRegionsAssigned(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -12688,7 +12688,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder setRegionsAssigned(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -12702,7 +12702,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder addRegionsAssigned(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
         if (regionsAssignedBuilder_ == null) {
@@ -12718,7 +12718,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder addRegionsAssigned(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo value) {
@@ -12735,7 +12735,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder addRegionsAssigned(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -12749,7 +12749,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder addRegionsAssigned(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder builderForValue) {
@@ -12763,7 +12763,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder addAllRegionsAssigned(
           java.lang.Iterable values) {
@@ -12777,7 +12777,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder clearRegionsAssigned() {
         if (regionsAssignedBuilder_ == null) {
@@ -12790,7 +12790,7 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public Builder removeRegionsAssigned(int index) {
         if (regionsAssignedBuilder_ == null) {
@@ -12803,14 +12803,14 @@ public final class MasterProcedureProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder getRegionsAssignedBuilder(
           int index) {
         return getRegionsAssignedFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder getRegionsAssignedOrBuilder(
           int index) {
@@ -12820,7 +12820,7 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public java.util.List 
            getRegionsAssignedOrBuilderList() {
@@ -12831,14 +12831,14 @@ public final class MasterProcedureProtos {
         }
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionsAssignedBuilder() {
         return getRegionsAssignedFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder addRegionsAssignedBuilder(
           int index) {
@@ -12846,7 +12846,7 @@ public final class MasterProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo regions_assigned = 4;
+       * repeated .hbase.pb.RegionInfo regions_assigned = 4;
        */
       public java.util.List 
            getRegionsAssignedBuilderList() {
@@ -12933,7 +12933,7 @@ public final class MasterProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ServerCrashStateData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ServerCrashStateData)
     }
 
     static {
@@ -12941,59 +12941,59 @@ public final class MasterProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ServerCrashStateData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ServerCrashStateData)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CreateTableStateData_descriptor;
+    internal_static_hbase_pb_CreateTableStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CreateTableStateData_fieldAccessorTable;
+      internal_static_hbase_pb_CreateTableStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyTableStateData_descriptor;
+    internal_static_hbase_pb_ModifyTableStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyTableStateData_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyTableStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TruncateTableStateData_descriptor;
+    internal_static_hbase_pb_TruncateTableStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TruncateTableStateData_fieldAccessorTable;
+      internal_static_hbase_pb_TruncateTableStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteTableStateData_descriptor;
+    internal_static_hbase_pb_DeleteTableStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteTableStateData_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteTableStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AddColumnFamilyStateData_descriptor;
+    internal_static_hbase_pb_AddColumnFamilyStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AddColumnFamilyStateData_fieldAccessorTable;
+      internal_static_hbase_pb_AddColumnFamilyStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyColumnFamilyStateData_descriptor;
+    internal_static_hbase_pb_ModifyColumnFamilyStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyColumnFamilyStateData_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyColumnFamilyStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteColumnFamilyStateData_descriptor;
+    internal_static_hbase_pb_DeleteColumnFamilyStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteColumnFamilyStateData_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteColumnFamilyStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_EnableTableStateData_descriptor;
+    internal_static_hbase_pb_EnableTableStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_EnableTableStateData_fieldAccessorTable;
+      internal_static_hbase_pb_EnableTableStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DisableTableStateData_descriptor;
+    internal_static_hbase_pb_DisableTableStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DisableTableStateData_fieldAccessorTable;
+      internal_static_hbase_pb_DisableTableStateData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ServerCrashStateData_descriptor;
+    internal_static_hbase_pb_ServerCrashStateData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ServerCrashStateData_fieldAccessorTable;
+      internal_static_hbase_pb_ServerCrashStateData_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -13003,179 +13003,186 @@ public final class MasterProcedureProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025MasterProcedure.proto\032\013HBase.proto\032\tRP" +
-      "C.proto\"\201\001\n\024CreateTableStateData\022#\n\tuser" +
-      "_info\030\001 \002(\0132\020.UserInformation\022\"\n\014table_s" +
-      "chema\030\002 \002(\0132\014.TableSchema\022 \n\013region_info" +
-      "\030\003 \003(\0132\013.RegionInfo\"\277\001\n\024ModifyTableState" +
-      "Data\022#\n\tuser_info\030\001 \002(\0132\020.UserInformatio" +
-      "n\022-\n\027unmodified_table_schema\030\002 \001(\0132\014.Tab" +
-      "leSchema\022+\n\025modified_table_schema\030\003 \002(\0132" +
-      "\014.TableSchema\022&\n\036delete_column_family_in" +
-      "_modify\030\004 \002(\010\"\274\001\n\026TruncateTableStateData",
-      "\022#\n\tuser_info\030\001 \002(\0132\020.UserInformation\022\027\n" +
-      "\017preserve_splits\030\002 \002(\010\022\036\n\ntable_name\030\003 \001" +
-      "(\0132\n.TableName\022\"\n\014table_schema\030\004 \001(\0132\014.T" +
-      "ableSchema\022 \n\013region_info\030\005 \003(\0132\013.Region" +
-      "Info\"}\n\024DeleteTableStateData\022#\n\tuser_inf" +
-      "o\030\001 \002(\0132\020.UserInformation\022\036\n\ntable_name\030" +
-      "\002 \002(\0132\n.TableName\022 \n\013region_info\030\003 \003(\0132\013" +
-      ".RegionInfo\"\300\001\n\030AddColumnFamilyStateData" +
-      "\022#\n\tuser_info\030\001 \002(\0132\020.UserInformation\022\036\n" +
-      "\ntable_name\030\002 \002(\0132\n.TableName\0220\n\023columnf",
-      "amily_schema\030\003 \002(\0132\023.ColumnFamilySchema\022" +
-      "-\n\027unmodified_table_schema\030\004 \001(\0132\014.Table" +
-      "Schema\"\303\001\n\033ModifyColumnFamilyStateData\022#" +
-      "\n\tuser_info\030\001 \002(\0132\020.UserInformation\022\036\n\nt" +
-      "able_name\030\002 \002(\0132\n.TableName\0220\n\023columnfam" +
-      "ily_schema\030\003 \002(\0132\023.ColumnFamilySchema\022-\n" +
-      "\027unmodified_table_schema\030\004 \001(\0132\014.TableSc" +
-      "hema\"\254\001\n\033DeleteColumnFamilyStateData\022#\n\t" +
-      "user_info\030\001 \002(\0132\020.UserInformation\022\036\n\ntab" +
-      "le_name\030\002 \002(\0132\n.TableName\022\031\n\021columnfamil",
-      "y_name\030\003 \002(\014\022-\n\027unmodified_table_schema\030" +
-      "\004 \001(\0132\014.TableSchema\"{\n\024EnableTableStateD" +
-      "ata\022#\n\tuser_info\030\001 \002(\0132\020.UserInformation" +
-      "\022\036\n\ntable_name\030\002 \002(\0132\n.TableName\022\036\n\026skip" +
-      "_table_state_check\030\003 \002(\010\"|\n\025DisableTable" +
-      "StateData\022#\n\tuser_info\030\001 \002(\0132\020.UserInfor" +
-      "mation\022\036\n\ntable_name\030\002 \002(\0132\n.TableName\022\036" +
-      "\n\026skip_table_state_check\030\003 \002(\010\"\346\001\n\024Serve" +
-      "rCrashStateData\022 \n\013server_name\030\001 \002(\0132\013.S" +
-      "erverName\022\036\n\026distributed_log_replay\030\002 \001(",
-      "\010\022.\n\031regions_on_crashed_server\030\003 \003(\0132\013.R" +
-      "egionInfo\022%\n\020regions_assigned\030\004 \003(\0132\013.Re" +
-      "gionInfo\022\025\n\rcarrying_meta\030\005 \001(\010\022\036\n\020shoul" +
-      "d_split_wal\030\006 \001(\010:\004true*\330\001\n\020CreateTableS" +
-      "tate\022\036\n\032CREATE_TABLE_PRE_OPERATION\020\001\022 \n\034" +
-      "CREATE_TABLE_WRITE_FS_LAYOUT\020\002\022\034\n\030CREATE" +
-      "_TABLE_ADD_TO_META\020\003\022\037\n\033CREATE_TABLE_ASS" +
-      "IGN_REGIONS\020\004\022\"\n\036CREATE_TABLE_UPDATE_DES" +
-      "C_CACHE\020\005\022\037\n\033CREATE_TABLE_POST_OPERATION" +
-      "\020\006*\207\002\n\020ModifyTableState\022\030\n\024MODIFY_TABLE_",
-      "PREPARE\020\001\022\036\n\032MODIFY_TABLE_PRE_OPERATION\020" +
-      "\002\022(\n$MODIFY_TABLE_UPDATE_TABLE_DESCRIPTO" +
-      "R\020\003\022&\n\"MODIFY_TABLE_REMOVE_REPLICA_COLUM" +
-      "N\020\004\022!\n\035MODIFY_TABLE_DELETE_FS_LAYOUT\020\005\022\037" +
-      "\n\033MODIFY_TABLE_POST_OPERATION\020\006\022#\n\037MODIF" +
-      "Y_TABLE_REOPEN_ALL_REGIONS\020\007*\212\002\n\022Truncat" +
-      "eTableState\022 \n\034TRUNCATE_TABLE_PRE_OPERAT" +
-      "ION\020\001\022#\n\037TRUNCATE_TABLE_REMOVE_FROM_META" +
-      "\020\002\022\"\n\036TRUNCATE_TABLE_CLEAR_FS_LAYOUT\020\003\022#" +
-      "\n\037TRUNCATE_TABLE_CREATE_FS_LAYOUT\020\004\022\036\n\032T",
-      "RUNCATE_TABLE_ADD_TO_META\020\005\022!\n\035TRUNCATE_" +
-      "TABLE_ASSIGN_REGIONS\020\006\022!\n\035TRUNCATE_TABLE" +
-      "_POST_OPERATION\020\007*\337\001\n\020DeleteTableState\022\036" +
-      "\n\032DELETE_TABLE_PRE_OPERATION\020\001\022!\n\035DELETE" +
-      "_TABLE_REMOVE_FROM_META\020\002\022 \n\034DELETE_TABL" +
-      "E_CLEAR_FS_LAYOUT\020\003\022\"\n\036DELETE_TABLE_UPDA" +
-      "TE_DESC_CACHE\020\004\022!\n\035DELETE_TABLE_UNASSIGN" +
-      "_REGIONS\020\005\022\037\n\033DELETE_TABLE_POST_OPERATIO" +
-      "N\020\006*\331\001\n\024AddColumnFamilyState\022\035\n\031ADD_COLU" +
-      "MN_FAMILY_PREPARE\020\001\022#\n\037ADD_COLUMN_FAMILY",
-      "_PRE_OPERATION\020\002\022-\n)ADD_COLUMN_FAMILY_UP" +
-      "DATE_TABLE_DESCRIPTOR\020\003\022$\n ADD_COLUMN_FA" +
-      "MILY_POST_OPERATION\020\004\022(\n$ADD_COLUMN_FAMI" +
-      "LY_REOPEN_ALL_REGIONS\020\005*\353\001\n\027ModifyColumn" +
-      "FamilyState\022 \n\034MODIFY_COLUMN_FAMILY_PREP" +
-      "ARE\020\001\022&\n\"MODIFY_COLUMN_FAMILY_PRE_OPERAT" +
-      "ION\020\002\0220\n,MODIFY_COLUMN_FAMILY_UPDATE_TAB" +
-      "LE_DESCRIPTOR\020\003\022\'\n#MODIFY_COLUMN_FAMILY_" +
-      "POST_OPERATION\020\004\022+\n\'MODIFY_COLUMN_FAMILY" +
-      "_REOPEN_ALL_REGIONS\020\005*\226\002\n\027DeleteColumnFa",
-      "milyState\022 \n\034DELETE_COLUMN_FAMILY_PREPAR" +
-      "E\020\001\022&\n\"DELETE_COLUMN_FAMILY_PRE_OPERATIO" +
-      "N\020\002\0220\n,DELETE_COLUMN_FAMILY_UPDATE_TABLE" +
-      "_DESCRIPTOR\020\003\022)\n%DELETE_COLUMN_FAMILY_DE" +
-      "LETE_FS_LAYOUT\020\004\022\'\n#DELETE_COLUMN_FAMILY" +
-      "_POST_OPERATION\020\005\022+\n\'DELETE_COLUMN_FAMIL" +
-      "Y_REOPEN_ALL_REGIONS\020\006*\350\001\n\020EnableTableSt" +
-      "ate\022\030\n\024ENABLE_TABLE_PREPARE\020\001\022\036\n\032ENABLE_" +
-      "TABLE_PRE_OPERATION\020\002\022)\n%ENABLE_TABLE_SE" +
-      "T_ENABLING_TABLE_STATE\020\003\022$\n ENABLE_TABLE",
-      "_MARK_REGIONS_ONLINE\020\004\022(\n$ENABLE_TABLE_S" +
-      "ET_ENABLED_TABLE_STATE\020\005\022\037\n\033ENABLE_TABLE" +
-      "_POST_OPERATION\020\006*\362\001\n\021DisableTableState\022" +
-      "\031\n\025DISABLE_TABLE_PREPARE\020\001\022\037\n\033DISABLE_TA" +
-      "BLE_PRE_OPERATION\020\002\022+\n\'DISABLE_TABLE_SET" +
-      "_DISABLING_TABLE_STATE\020\003\022&\n\"DISABLE_TABL" +
-      "E_MARK_REGIONS_OFFLINE\020\004\022*\n&DISABLE_TABL" +
-      "E_SET_DISABLED_TABLE_STATE\020\005\022 \n\034DISABLE_" +
-      "TABLE_POST_OPERATION\020\006*\234\002\n\020ServerCrashSt" +
-      "ate\022\026\n\022SERVER_CRASH_START\020\001\022\035\n\031SERVER_CR",
-      "ASH_PROCESS_META\020\002\022\034\n\030SERVER_CRASH_GET_R" +
-      "EGIONS\020\003\022\036\n\032SERVER_CRASH_NO_SPLIT_LOGS\020\004" +
-      "\022\033\n\027SERVER_CRASH_SPLIT_LOGS\020\005\022#\n\037SERVER_" +
-      "CRASH_PREPARE_LOG_REPLAY\020\006\022\027\n\023SERVER_CRA" +
-      "SH_ASSIGN\020\010\022\037\n\033SERVER_CRASH_WAIT_ON_ASSI" +
-      "GN\020\t\022\027\n\023SERVER_CRASH_FINISH\020dBK\n*org.apa" +
-      "che.hadoop.hbase.protobuf.generatedB\025Mas" +
-      "terProcedureProtosH\001\210\001\001\240\001\001"
+      "\n\025MasterProcedure.proto\022\010hbase.pb\032\013HBase" +
+      ".proto\032\tRPC.proto\"\234\001\n\024CreateTableStateDa" +
+      "ta\022,\n\tuser_info\030\001 \002(\0132\031.hbase.pb.UserInf" +
+      "ormation\022+\n\014table_schema\030\002 \002(\0132\025.hbase.p" +
+      "b.TableSchema\022)\n\013region_info\030\003 \003(\0132\024.hba" +
+      "se.pb.RegionInfo\"\332\001\n\024ModifyTableStateDat" +
+      "a\022,\n\tuser_info\030\001 \002(\0132\031.hbase.pb.UserInfo" +
+      "rmation\0226\n\027unmodified_table_schema\030\002 \001(\013" +
+      "2\025.hbase.pb.TableSchema\0224\n\025modified_tabl" +
+      "e_schema\030\003 \002(\0132\025.hbase.pb.TableSchema\022&\n",
+      "\036delete_column_family_in_modify\030\004 \002(\010\"\340\001" +
+      "\n\026TruncateTableStateData\022,\n\tuser_info\030\001 " +
+      "\002(\0132\031.hbase.pb.UserInformation\022\027\n\017preser" +
+      "ve_splits\030\002 \002(\010\022\'\n\ntable_name\030\003 \001(\0132\023.hb" +
+      "ase.pb.TableName\022+\n\014table_schema\030\004 \001(\0132\025" +
+      ".hbase.pb.TableSchema\022)\n\013region_info\030\005 \003" +
+      "(\0132\024.hbase.pb.RegionInfo\"\230\001\n\024DeleteTable" +
+      "StateData\022,\n\tuser_info\030\001 \002(\0132\031.hbase.pb." +
+      "UserInformation\022\'\n\ntable_name\030\002 \002(\0132\023.hb" +
+      "ase.pb.TableName\022)\n\013region_info\030\003 \003(\0132\024.",
+      "hbase.pb.RegionInfo\"\344\001\n\030AddColumnFamilyS" +
+      "tateData\022,\n\tuser_info\030\001 \002(\0132\031.hbase.pb.U" +
+      "serInformation\022\'\n\ntable_name\030\002 \002(\0132\023.hba" +
+      "se.pb.TableName\0229\n\023columnfamily_schema\030\003" +
+      " \002(\0132\034.hbase.pb.ColumnFamilySchema\0226\n\027un" +
+      "modified_table_schema\030\004 \001(\0132\025.hbase.pb.T" +
+      "ableSchema\"\347\001\n\033ModifyColumnFamilyStateDa" +
+      "ta\022,\n\tuser_info\030\001 \002(\0132\031.hbase.pb.UserInf" +
+      "ormation\022\'\n\ntable_name\030\002 \002(\0132\023.hbase.pb." +
+      "TableName\0229\n\023columnfamily_schema\030\003 \002(\0132\034",
+      ".hbase.pb.ColumnFamilySchema\0226\n\027unmodifi" +
+      "ed_table_schema\030\004 \001(\0132\025.hbase.pb.TableSc" +
+      "hema\"\307\001\n\033DeleteColumnFamilyStateData\022,\n\t" +
+      "user_info\030\001 \002(\0132\031.hbase.pb.UserInformati" +
+      "on\022\'\n\ntable_name\030\002 \002(\0132\023.hbase.pb.TableN" +
+      "ame\022\031\n\021columnfamily_name\030\003 \002(\014\0226\n\027unmodi" +
+      "fied_table_schema\030\004 \001(\0132\025.hbase.pb.Table" +
+      "Schema\"\215\001\n\024EnableTableStateData\022,\n\tuser_" +
+      "info\030\001 \002(\0132\031.hbase.pb.UserInformation\022\'\n" +
+      "\ntable_name\030\002 \002(\0132\023.hbase.pb.TableName\022\036",
+      "\n\026skip_table_state_check\030\003 \002(\010\"\216\001\n\025Disab" +
+      "leTableStateData\022,\n\tuser_info\030\001 \002(\0132\031.hb" +
+      "ase.pb.UserInformation\022\'\n\ntable_name\030\002 \002" +
+      "(\0132\023.hbase.pb.TableName\022\036\n\026skip_table_st" +
+      "ate_check\030\003 \002(\010\"\201\002\n\024ServerCrashStateData" +
+      "\022)\n\013server_name\030\001 \002(\0132\024.hbase.pb.ServerN" +
+      "ame\022\036\n\026distributed_log_replay\030\002 \001(\010\0227\n\031r" +
+      "egions_on_crashed_server\030\003 \003(\0132\024.hbase.p" +
+      "b.RegionInfo\022.\n\020regions_assigned\030\004 \003(\0132\024" +
+      ".hbase.pb.RegionInfo\022\025\n\rcarrying_meta\030\005 ",
+      "\001(\010\022\036\n\020should_split_wal\030\006 \001(\010:\004true*\330\001\n\020" +
+      "CreateTableState\022\036\n\032CREATE_TABLE_PRE_OPE" +
+      "RATION\020\001\022 \n\034CREATE_TABLE_WRITE_FS_LAYOUT" +
+      "\020\002\022\034\n\030CREATE_TABLE_ADD_TO_META\020\003\022\037\n\033CREA" +
+      "TE_TABLE_ASSIGN_REGIONS\020\004\022\"\n\036CREATE_TABL" +
+      "E_UPDATE_DESC_CACHE\020\005\022\037\n\033CREATE_TABLE_PO" +
+      "ST_OPERATION\020\006*\207\002\n\020ModifyTableState\022\030\n\024M" +
+      "ODIFY_TABLE_PREPARE\020\001\022\036\n\032MODIFY_TABLE_PR" +
+      "E_OPERATION\020\002\022(\n$MODIFY_TABLE_UPDATE_TAB" +
+      "LE_DESCRIPTOR\020\003\022&\n\"MODIFY_TABLE_REMOVE_R",
+      "EPLICA_COLUMN\020\004\022!\n\035MODIFY_TABLE_DELETE_F" +
+      "S_LAYOUT\020\005\022\037\n\033MODIFY_TABLE_POST_OPERATIO" +
+      "N\020\006\022#\n\037MODIFY_TABLE_REOPEN_ALL_REGIONS\020\007" +
+      "*\212\002\n\022TruncateTableState\022 \n\034TRUNCATE_TABL" +
+      "E_PRE_OPERATION\020\001\022#\n\037TRUNCATE_TABLE_REMO" +
+      "VE_FROM_META\020\002\022\"\n\036TRUNCATE_TABLE_CLEAR_F" +
+      "S_LAYOUT\020\003\022#\n\037TRUNCATE_TABLE_CREATE_FS_L" +
+      "AYOUT\020\004\022\036\n\032TRUNCATE_TABLE_ADD_TO_META\020\005\022" +
+      "!\n\035TRUNCATE_TABLE_ASSIGN_REGIONS\020\006\022!\n\035TR" +
+      "UNCATE_TABLE_POST_OPERATION\020\007*\337\001\n\020Delete",
+      "TableState\022\036\n\032DELETE_TABLE_PRE_OPERATION" +
+      "\020\001\022!\n\035DELETE_TABLE_REMOVE_FROM_META\020\002\022 \n" +
+      "\034DELETE_TABLE_CLEAR_FS_LAYOUT\020\003\022\"\n\036DELET" +
+      "E_TABLE_UPDATE_DESC_CACHE\020\004\022!\n\035DELETE_TA" +
+      "BLE_UNASSIGN_REGIONS\020\005\022\037\n\033DELETE_TABLE_P" +
+      "OST_OPERATION\020\006*\331\001\n\024AddColumnFamilyState" +
+      "\022\035\n\031ADD_COLUMN_FAMILY_PREPARE\020\001\022#\n\037ADD_C" +
+      "OLUMN_FAMILY_PRE_OPERATION\020\002\022-\n)ADD_COLU" +
+      "MN_FAMILY_UPDATE_TABLE_DESCRIPTOR\020\003\022$\n A" +
+      "DD_COLUMN_FAMILY_POST_OPERATION\020\004\022(\n$ADD",
+      "_COLUMN_FAMILY_REOPEN_ALL_REGIONS\020\005*\353\001\n\027" +
+      "ModifyColumnFamilyState\022 \n\034MODIFY_COLUMN" +
+      "_FAMILY_PREPARE\020\001\022&\n\"MODIFY_COLUMN_FAMIL" +
+      "Y_PRE_OPERATION\020\002\0220\n,MODIFY_COLUMN_FAMIL" +
+      "Y_UPDATE_TABLE_DESCRIPTOR\020\003\022\'\n#MODIFY_CO" +
+      "LUMN_FAMILY_POST_OPERATION\020\004\022+\n\'MODIFY_C" +
+      "OLUMN_FAMILY_REOPEN_ALL_REGIONS\020\005*\226\002\n\027De" +
+      "leteColumnFamilyState\022 \n\034DELETE_COLUMN_F" +
+      "AMILY_PREPARE\020\001\022&\n\"DELETE_COLUMN_FAMILY_" +
+      "PRE_OPERATION\020\002\0220\n,DELETE_COLUMN_FAMILY_",
+      "UPDATE_TABLE_DESCRIPTOR\020\003\022)\n%DELETE_COLU" +
+      "MN_FAMILY_DELETE_FS_LAYOUT\020\004\022\'\n#DELETE_C" +
+      "OLUMN_FAMILY_POST_OPERATION\020\005\022+\n\'DELETE_" +
+      "COLUMN_FAMILY_REOPEN_ALL_REGIONS\020\006*\350\001\n\020E" +
+      "nableTableState\022\030\n\024ENABLE_TABLE_PREPARE\020" +
+      "\001\022\036\n\032ENABLE_TABLE_PRE_OPERATION\020\002\022)\n%ENA" +
+      "BLE_TABLE_SET_ENABLING_TABLE_STATE\020\003\022$\n " +
+      "ENABLE_TABLE_MARK_REGIONS_ONLINE\020\004\022(\n$EN" +
+      "ABLE_TABLE_SET_ENABLED_TABLE_STATE\020\005\022\037\n\033" +
+      "ENABLE_TABLE_POST_OPERATION\020\006*\362\001\n\021Disabl",
+      "eTableState\022\031\n\025DISABLE_TABLE_PREPARE\020\001\022\037" +
+      "\n\033DISABLE_TABLE_PRE_OPERATION\020\002\022+\n\'DISAB" +
+      "LE_TABLE_SET_DISABLING_TABLE_STATE\020\003\022&\n\"" +
+      "DISABLE_TABLE_MARK_REGIONS_OFFLINE\020\004\022*\n&" +
+      "DISABLE_TABLE_SET_DISABLED_TABLE_STATE\020\005" +
+      "\022 \n\034DISABLE_TABLE_POST_OPERATION\020\006*\234\002\n\020S" +
+      "erverCrashState\022\026\n\022SERVER_CRASH_START\020\001\022" +
+      "\035\n\031SERVER_CRASH_PROCESS_META\020\002\022\034\n\030SERVER" +
+      "_CRASH_GET_REGIONS\020\003\022\036\n\032SERVER_CRASH_NO_" +
+      "SPLIT_LOGS\020\004\022\033\n\027SERVER_CRASH_SPLIT_LOGS\020",
+      "\005\022#\n\037SERVER_CRASH_PREPARE_LOG_REPLAY\020\006\022\027" +
+      "\n\023SERVER_CRASH_ASSIGN\020\010\022\037\n\033SERVER_CRASH_" +
+      "WAIT_ON_ASSIGN\020\t\022\027\n\023SERVER_CRASH_FINISH\020" +
+      "dBK\n*org.apache.hadoop.hbase.protobuf.ge" +
+      "neratedB\025MasterProcedureProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_CreateTableStateData_descriptor =
+          internal_static_hbase_pb_CreateTableStateData_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_CreateTableStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_CreateTableStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CreateTableStateData_descriptor,
+              internal_static_hbase_pb_CreateTableStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableSchema", "RegionInfo", });
-          internal_static_ModifyTableStateData_descriptor =
+          internal_static_hbase_pb_ModifyTableStateData_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_ModifyTableStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyTableStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyTableStateData_descriptor,
+              internal_static_hbase_pb_ModifyTableStateData_descriptor,
               new java.lang.String[] { "UserInfo", "UnmodifiedTableSchema", "ModifiedTableSchema", "DeleteColumnFamilyInModify", });
-          internal_static_TruncateTableStateData_descriptor =
+          internal_static_hbase_pb_TruncateTableStateData_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_TruncateTableStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_TruncateTableStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TruncateTableStateData_descriptor,
+              internal_static_hbase_pb_TruncateTableStateData_descriptor,
               new java.lang.String[] { "UserInfo", "PreserveSplits", "TableName", "TableSchema", "RegionInfo", });
-          internal_static_DeleteTableStateData_descriptor =
+          internal_static_hbase_pb_DeleteTableStateData_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_DeleteTableStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteTableStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteTableStateData_descriptor,
+              internal_static_hbase_pb_DeleteTableStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableName", "RegionInfo", });
-          internal_static_AddColumnFamilyStateData_descriptor =
+          internal_static_hbase_pb_AddColumnFamilyStateData_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_AddColumnFamilyStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_AddColumnFamilyStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AddColumnFamilyStateData_descriptor,
+              internal_static_hbase_pb_AddColumnFamilyStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableName", "ColumnfamilySchema", "UnmodifiedTableSchema", });
-          internal_static_ModifyColumnFamilyStateData_descriptor =
+          internal_static_hbase_pb_ModifyColumnFamilyStateData_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_ModifyColumnFamilyStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyColumnFamilyStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyColumnFamilyStateData_descriptor,
+              internal_static_hbase_pb_ModifyColumnFamilyStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableName", "ColumnfamilySchema", "UnmodifiedTableSchema", });
-          internal_static_DeleteColumnFamilyStateData_descriptor =
+          internal_static_hbase_pb_DeleteColumnFamilyStateData_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_DeleteColumnFamilyStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteColumnFamilyStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteColumnFamilyStateData_descriptor,
+              internal_static_hbase_pb_DeleteColumnFamilyStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableName", "ColumnfamilyName", "UnmodifiedTableSchema", });
-          internal_static_EnableTableStateData_descriptor =
+          internal_static_hbase_pb_EnableTableStateData_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_EnableTableStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_EnableTableStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_EnableTableStateData_descriptor,
+              internal_static_hbase_pb_EnableTableStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableName", "SkipTableStateCheck", });
-          internal_static_DisableTableStateData_descriptor =
+          internal_static_hbase_pb_DisableTableStateData_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_DisableTableStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_DisableTableStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DisableTableStateData_descriptor,
+              internal_static_hbase_pb_DisableTableStateData_descriptor,
               new java.lang.String[] { "UserInfo", "TableName", "SkipTableStateCheck", });
-          internal_static_ServerCrashStateData_descriptor =
+          internal_static_hbase_pb_ServerCrashStateData_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_ServerCrashStateData_fieldAccessorTable = new
+          internal_static_hbase_pb_ServerCrashStateData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ServerCrashStateData_descriptor,
+              internal_static_hbase_pb_ServerCrashStateData_descriptor,
               new java.lang.String[] { "ServerName", "DistributedLogReplay", "RegionsOnCrashedServer", "RegionsAssigned", "CarryingMeta", "ShouldSplitWal", });
           return null;
         }
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 23ced4bfb8c..0f74b853a64 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
@@ -11,31 +11,31 @@ public final class MasterProtos {
   public interface AddColumnRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // required .ColumnFamilySchema column_families = 2;
+    // required .hbase.pb.ColumnFamilySchema column_families = 2;
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     boolean hasColumnFamilies();
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies();
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder();
 
@@ -60,7 +60,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code AddColumnRequest}
+   * Protobuf type {@code hbase.pb.AddColumnRequest}
    */
   public static final class AddColumnRequest extends
       com.google.protobuf.GeneratedMessage
@@ -160,12 +160,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest.Builder.class);
     }
@@ -186,45 +186,45 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // required .ColumnFamilySchema column_families = 2;
+    // required .hbase.pb.ColumnFamilySchema column_families = 2;
     public static final int COLUMN_FAMILIES_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnFamilies_;
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     public boolean hasColumnFamilies() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies() {
       return columnFamilies_;
     }
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder() {
       return columnFamilies_;
@@ -477,19 +477,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AddColumnRequest}
+     * Protobuf type {@code hbase.pb.AddColumnRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest.Builder.class);
       }
@@ -541,7 +541,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest getDefaultInstanceForType() {
@@ -655,18 +655,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -676,7 +676,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -692,7 +692,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -706,7 +706,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -725,7 +725,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -738,7 +738,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -746,7 +746,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -756,7 +756,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -772,18 +772,18 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // required .ColumnFamilySchema column_families = 2;
+      // required .hbase.pb.ColumnFamilySchema column_families = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnFamilies_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> columnFamiliesBuilder_;
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public boolean hasColumnFamilies() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies() {
         if (columnFamiliesBuilder_ == null) {
@@ -793,7 +793,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder setColumnFamilies(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnFamiliesBuilder_ == null) {
@@ -809,7 +809,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder setColumnFamilies(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -823,7 +823,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder mergeColumnFamilies(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnFamiliesBuilder_ == null) {
@@ -842,7 +842,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder clearColumnFamilies() {
         if (columnFamiliesBuilder_ == null) {
@@ -855,7 +855,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder getColumnFamiliesBuilder() {
         bitField0_ |= 0x00000002;
@@ -863,7 +863,7 @@ public final class MasterProtos {
         return getColumnFamiliesFieldBuilder().getBuilder();
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder() {
         if (columnFamiliesBuilder_ != null) {
@@ -873,7 +873,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> 
@@ -955,7 +955,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:AddColumnRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AddColumnRequest)
     }
 
     static {
@@ -963,14 +963,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AddColumnRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AddColumnRequest)
   }
 
   public interface AddColumnResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code AddColumnResponse}
+   * Protobuf type {@code hbase.pb.AddColumnResponse}
    */
   public static final class AddColumnResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1033,12 +1033,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponse.Builder.class);
     }
@@ -1189,19 +1189,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AddColumnResponse}
+     * Protobuf type {@code hbase.pb.AddColumnResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponse.Builder.class);
       }
@@ -1235,7 +1235,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AddColumnResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AddColumnResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponse getDefaultInstanceForType() {
@@ -1293,7 +1293,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:AddColumnResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AddColumnResponse)
     }
 
     static {
@@ -1301,23 +1301,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AddColumnResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AddColumnResponse)
   }
 
   public interface DeleteColumnRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -1352,7 +1352,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code DeleteColumnRequest}
+   * Protobuf type {@code hbase.pb.DeleteColumnRequest}
    */
   public static final class DeleteColumnRequest extends
       com.google.protobuf.GeneratedMessage
@@ -1444,12 +1444,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnRequest.Builder.class);
     }
@@ -1470,23 +1470,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -1751,19 +1751,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteColumnRequest}
+     * Protobuf type {@code hbase.pb.DeleteColumnRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnRequest.Builder.class);
       }
@@ -1810,7 +1810,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnRequest getDefaultInstanceForType() {
@@ -1916,18 +1916,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -1937,7 +1937,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -1953,7 +1953,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -1967,7 +1967,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -1986,7 +1986,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -1999,7 +1999,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -2007,7 +2007,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -2017,7 +2017,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -2135,7 +2135,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteColumnRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteColumnRequest)
     }
 
     static {
@@ -2143,14 +2143,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteColumnRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteColumnRequest)
   }
 
   public interface DeleteColumnResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code DeleteColumnResponse}
+   * Protobuf type {@code hbase.pb.DeleteColumnResponse}
    */
   public static final class DeleteColumnResponse extends
       com.google.protobuf.GeneratedMessage
@@ -2213,12 +2213,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnResponse.Builder.class);
     }
@@ -2369,19 +2369,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteColumnResponse}
+     * Protobuf type {@code hbase.pb.DeleteColumnResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnResponse.Builder.class);
       }
@@ -2415,7 +2415,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteColumnResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteColumnResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteColumnResponse getDefaultInstanceForType() {
@@ -2473,7 +2473,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteColumnResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteColumnResponse)
     }
 
     static {
@@ -2481,37 +2481,37 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteColumnResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteColumnResponse)
   }
 
   public interface ModifyColumnRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // required .ColumnFamilySchema column_families = 2;
+    // required .hbase.pb.ColumnFamilySchema column_families = 2;
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     boolean hasColumnFamilies();
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies();
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder();
 
@@ -2536,7 +2536,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code ModifyColumnRequest}
+   * Protobuf type {@code hbase.pb.ModifyColumnRequest}
    */
   public static final class ModifyColumnRequest extends
       com.google.protobuf.GeneratedMessage
@@ -2636,12 +2636,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest.Builder.class);
     }
@@ -2662,45 +2662,45 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // required .ColumnFamilySchema column_families = 2;
+    // required .hbase.pb.ColumnFamilySchema column_families = 2;
     public static final int COLUMN_FAMILIES_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnFamilies_;
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     public boolean hasColumnFamilies() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies() {
       return columnFamilies_;
     }
     /**
-     * required .ColumnFamilySchema column_families = 2;
+     * required .hbase.pb.ColumnFamilySchema column_families = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder() {
       return columnFamilies_;
@@ -2953,19 +2953,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyColumnRequest}
+     * Protobuf type {@code hbase.pb.ModifyColumnRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest.Builder.class);
       }
@@ -3017,7 +3017,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest getDefaultInstanceForType() {
@@ -3131,18 +3131,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -3152,7 +3152,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -3168,7 +3168,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -3182,7 +3182,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -3201,7 +3201,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -3214,7 +3214,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -3222,7 +3222,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -3232,7 +3232,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -3248,18 +3248,18 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // required .ColumnFamilySchema column_families = 2;
+      // required .hbase.pb.ColumnFamilySchema column_families = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema columnFamilies_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> columnFamiliesBuilder_;
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public boolean hasColumnFamilies() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema getColumnFamilies() {
         if (columnFamiliesBuilder_ == null) {
@@ -3269,7 +3269,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder setColumnFamilies(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnFamiliesBuilder_ == null) {
@@ -3285,7 +3285,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder setColumnFamilies(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder builderForValue) {
@@ -3299,7 +3299,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder mergeColumnFamilies(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema value) {
         if (columnFamiliesBuilder_ == null) {
@@ -3318,7 +3318,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public Builder clearColumnFamilies() {
         if (columnFamiliesBuilder_ == null) {
@@ -3331,7 +3331,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder getColumnFamiliesBuilder() {
         bitField0_ |= 0x00000002;
@@ -3339,7 +3339,7 @@ public final class MasterProtos {
         return getColumnFamiliesFieldBuilder().getBuilder();
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder getColumnFamiliesOrBuilder() {
         if (columnFamiliesBuilder_ != null) {
@@ -3349,7 +3349,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ColumnFamilySchema column_families = 2;
+       * required .hbase.pb.ColumnFamilySchema column_families = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ColumnFamilySchemaOrBuilder> 
@@ -3431,7 +3431,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyColumnRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyColumnRequest)
     }
 
     static {
@@ -3439,14 +3439,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyColumnRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyColumnRequest)
   }
 
   public interface ModifyColumnResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ModifyColumnResponse}
+   * Protobuf type {@code hbase.pb.ModifyColumnResponse}
    */
   public static final class ModifyColumnResponse extends
       com.google.protobuf.GeneratedMessage
@@ -3509,12 +3509,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnResponse.Builder.class);
     }
@@ -3665,19 +3665,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyColumnResponse}
+     * Protobuf type {@code hbase.pb.ModifyColumnResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnResponse.Builder.class);
       }
@@ -3711,7 +3711,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyColumnResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyColumnResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnResponse getDefaultInstanceForType() {
@@ -3769,7 +3769,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyColumnResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyColumnResponse)
     }
 
     static {
@@ -3777,42 +3777,42 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyColumnResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyColumnResponse)
   }
 
   public interface MoveRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
-    // optional .ServerName dest_server_name = 2;
+    // optional .hbase.pb.ServerName dest_server_name = 2;
     /**
-     * optional .ServerName dest_server_name = 2;
+     * optional .hbase.pb.ServerName dest_server_name = 2;
      */
     boolean hasDestServerName();
     /**
-     * optional .ServerName dest_server_name = 2;
+     * optional .hbase.pb.ServerName dest_server_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDestServerName();
     /**
-     * optional .ServerName dest_server_name = 2;
+     * optional .hbase.pb.ServerName dest_server_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDestServerNameOrBuilder();
   }
   /**
-   * Protobuf type {@code MoveRegionRequest}
+   * Protobuf type {@code hbase.pb.MoveRegionRequest}
    */
   public static final class MoveRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -3902,12 +3902,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest.Builder.class);
     }
@@ -3928,45 +3928,45 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
     }
 
-    // optional .ServerName dest_server_name = 2;
+    // optional .hbase.pb.ServerName dest_server_name = 2;
     public static final int DEST_SERVER_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName destServerName_;
     /**
-     * optional .ServerName dest_server_name = 2;
+     * optional .hbase.pb.ServerName dest_server_name = 2;
      */
     public boolean hasDestServerName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .ServerName dest_server_name = 2;
+     * optional .hbase.pb.ServerName dest_server_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDestServerName() {
       return destServerName_;
     }
     /**
-     * optional .ServerName dest_server_name = 2;
+     * optional .hbase.pb.ServerName dest_server_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDestServerNameOrBuilder() {
       return destServerName_;
@@ -4151,19 +4151,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MoveRegionRequest}
+     * Protobuf type {@code hbase.pb.MoveRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest.Builder.class);
       }
@@ -4211,7 +4211,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionRequest getDefaultInstanceForType() {
@@ -4309,18 +4309,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -4330,7 +4330,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -4346,7 +4346,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -4360,7 +4360,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -4379,7 +4379,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -4392,7 +4392,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -4400,7 +4400,7 @@ public final class MasterProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -4410,7 +4410,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -4426,18 +4426,18 @@ public final class MasterProtos {
         return regionBuilder_;
       }
 
-      // optional .ServerName dest_server_name = 2;
+      // optional .hbase.pb.ServerName dest_server_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName destServerName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> destServerNameBuilder_;
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public boolean hasDestServerName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getDestServerName() {
         if (destServerNameBuilder_ == null) {
@@ -4447,7 +4447,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public Builder setDestServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (destServerNameBuilder_ == null) {
@@ -4463,7 +4463,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public Builder setDestServerName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -4477,7 +4477,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public Builder mergeDestServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (destServerNameBuilder_ == null) {
@@ -4496,7 +4496,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public Builder clearDestServerName() {
         if (destServerNameBuilder_ == null) {
@@ -4509,7 +4509,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getDestServerNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -4517,7 +4517,7 @@ public final class MasterProtos {
         return getDestServerNameFieldBuilder().getBuilder();
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getDestServerNameOrBuilder() {
         if (destServerNameBuilder_ != null) {
@@ -4527,7 +4527,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ServerName dest_server_name = 2;
+       * optional .hbase.pb.ServerName dest_server_name = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -4543,7 +4543,7 @@ public final class MasterProtos {
         return destServerNameBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:MoveRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MoveRegionRequest)
     }
 
     static {
@@ -4551,14 +4551,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MoveRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MoveRegionRequest)
   }
 
   public interface MoveRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code MoveRegionResponse}
+   * Protobuf type {@code hbase.pb.MoveRegionResponse}
    */
   public static final class MoveRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -4621,12 +4621,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionResponse.Builder.class);
     }
@@ -4777,19 +4777,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MoveRegionResponse}
+     * Protobuf type {@code hbase.pb.MoveRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionResponse.Builder.class);
       }
@@ -4823,7 +4823,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MoveRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MoveRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MoveRegionResponse getDefaultInstanceForType() {
@@ -4881,7 +4881,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MoveRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MoveRegionResponse)
     }
 
     static {
@@ -4889,37 +4889,37 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MoveRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MoveRegionResponse)
   }
 
   public interface DispatchMergingRegionsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region_a = 1;
+    // required .hbase.pb.RegionSpecifier region_a = 1;
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     boolean hasRegionA();
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionA();
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionAOrBuilder();
 
-    // required .RegionSpecifier region_b = 2;
+    // required .hbase.pb.RegionSpecifier region_b = 2;
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     boolean hasRegionB();
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionB();
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionBOrBuilder();
 
@@ -4934,7 +4934,7 @@ public final class MasterProtos {
     boolean getForcible();
   }
   /**
-   * Protobuf type {@code DispatchMergingRegionsRequest}
+   * Protobuf type {@code hbase.pb.DispatchMergingRegionsRequest}
    *
    * 
    **
@@ -5034,12 +5034,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsRequest.Builder.class);
     }
@@ -5060,45 +5060,45 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region_a = 1;
+    // required .hbase.pb.RegionSpecifier region_a = 1;
     public static final int REGION_A_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionA_;
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     public boolean hasRegionA() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionA() {
       return regionA_;
     }
     /**
-     * required .RegionSpecifier region_a = 1;
+     * required .hbase.pb.RegionSpecifier region_a = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionAOrBuilder() {
       return regionA_;
     }
 
-    // required .RegionSpecifier region_b = 2;
+    // required .hbase.pb.RegionSpecifier region_b = 2;
     public static final int REGION_B_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionB_;
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     public boolean hasRegionB() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionB() {
       return regionB_;
     }
     /**
-     * required .RegionSpecifier region_b = 2;
+     * required .hbase.pb.RegionSpecifier region_b = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionBOrBuilder() {
       return regionB_;
@@ -5318,7 +5318,7 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DispatchMergingRegionsRequest}
+     * Protobuf type {@code hbase.pb.DispatchMergingRegionsRequest}
      *
      * 
      **
@@ -5330,12 +5330,12 @@ public final class MasterProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsRequest.Builder.class);
       }
@@ -5385,7 +5385,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsRequest getDefaultInstanceForType() {
@@ -5492,18 +5492,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region_a = 1;
+      // required .hbase.pb.RegionSpecifier region_a = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionA_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionABuilder_;
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public boolean hasRegionA() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionA() {
         if (regionABuilder_ == null) {
@@ -5513,7 +5513,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder setRegionA(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionABuilder_ == null) {
@@ -5529,7 +5529,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder setRegionA(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -5543,7 +5543,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder mergeRegionA(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionABuilder_ == null) {
@@ -5562,7 +5562,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public Builder clearRegionA() {
         if (regionABuilder_ == null) {
@@ -5575,7 +5575,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionABuilder() {
         bitField0_ |= 0x00000001;
@@ -5583,7 +5583,7 @@ public final class MasterProtos {
         return getRegionAFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionAOrBuilder() {
         if (regionABuilder_ != null) {
@@ -5593,7 +5593,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_a = 1;
+       * required .hbase.pb.RegionSpecifier region_a = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -5609,18 +5609,18 @@ public final class MasterProtos {
         return regionABuilder_;
       }
 
-      // required .RegionSpecifier region_b = 2;
+      // required .hbase.pb.RegionSpecifier region_b = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier regionB_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBBuilder_;
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public boolean hasRegionB() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegionB() {
         if (regionBBuilder_ == null) {
@@ -5630,7 +5630,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder setRegionB(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBBuilder_ == null) {
@@ -5646,7 +5646,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder setRegionB(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -5660,7 +5660,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder mergeRegionB(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBBuilder_ == null) {
@@ -5679,7 +5679,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public Builder clearRegionB() {
         if (regionBBuilder_ == null) {
@@ -5692,7 +5692,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBBuilder() {
         bitField0_ |= 0x00000002;
@@ -5700,7 +5700,7 @@ public final class MasterProtos {
         return getRegionBFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionBOrBuilder() {
         if (regionBBuilder_ != null) {
@@ -5710,7 +5710,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region_b = 2;
+       * required .hbase.pb.RegionSpecifier region_b = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -5759,7 +5759,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DispatchMergingRegionsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DispatchMergingRegionsRequest)
     }
 
     static {
@@ -5767,14 +5767,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DispatchMergingRegionsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DispatchMergingRegionsRequest)
   }
 
   public interface DispatchMergingRegionsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code DispatchMergingRegionsResponse}
+   * Protobuf type {@code hbase.pb.DispatchMergingRegionsResponse}
    */
   public static final class DispatchMergingRegionsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -5837,12 +5837,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsResponse.Builder.class);
     }
@@ -5993,19 +5993,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DispatchMergingRegionsResponse}
+     * Protobuf type {@code hbase.pb.DispatchMergingRegionsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsResponse.Builder.class);
       }
@@ -6039,7 +6039,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DispatchMergingRegionsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DispatchMergingRegionsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DispatchMergingRegionsResponse getDefaultInstanceForType() {
@@ -6097,7 +6097,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DispatchMergingRegionsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DispatchMergingRegionsResponse)
     }
 
     static {
@@ -6105,28 +6105,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DispatchMergingRegionsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DispatchMergingRegionsResponse)
   }
 
   public interface AssignRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
   }
   /**
-   * Protobuf type {@code AssignRegionRequest}
+   * Protobuf type {@code hbase.pb.AssignRegionRequest}
    */
   public static final class AssignRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -6203,12 +6203,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequest.Builder.class);
     }
@@ -6229,23 +6229,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -6407,19 +6407,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AssignRegionRequest}
+     * Protobuf type {@code hbase.pb.AssignRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequest.Builder.class);
       }
@@ -6460,7 +6460,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionRequest getDefaultInstanceForType() {
@@ -6541,18 +6541,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -6562,7 +6562,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -6578,7 +6578,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -6592,7 +6592,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -6611,7 +6611,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -6624,7 +6624,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -6632,7 +6632,7 @@ public final class MasterProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -6642,7 +6642,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -6658,7 +6658,7 @@ public final class MasterProtos {
         return regionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:AssignRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AssignRegionRequest)
     }
 
     static {
@@ -6666,14 +6666,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AssignRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AssignRegionRequest)
   }
 
   public interface AssignRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code AssignRegionResponse}
+   * Protobuf type {@code hbase.pb.AssignRegionResponse}
    */
   public static final class AssignRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -6736,12 +6736,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionResponse.Builder.class);
     }
@@ -6892,19 +6892,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code AssignRegionResponse}
+     * Protobuf type {@code hbase.pb.AssignRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionResponse.Builder.class);
       }
@@ -6938,7 +6938,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_AssignRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_AssignRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AssignRegionResponse getDefaultInstanceForType() {
@@ -6996,7 +6996,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:AssignRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.AssignRegionResponse)
     }
 
     static {
@@ -7004,23 +7004,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:AssignRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.AssignRegionResponse)
   }
 
   public interface UnassignRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
 
@@ -7035,7 +7035,7 @@ public final class MasterProtos {
     boolean getForce();
   }
   /**
-   * Protobuf type {@code UnassignRegionRequest}
+   * Protobuf type {@code hbase.pb.UnassignRegionRequest}
    */
   public static final class UnassignRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -7117,12 +7117,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest.Builder.class);
     }
@@ -7143,23 +7143,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -7354,19 +7354,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UnassignRegionRequest}
+     * Protobuf type {@code hbase.pb.UnassignRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest.Builder.class);
       }
@@ -7409,7 +7409,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest getDefaultInstanceForType() {
@@ -7497,18 +7497,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -7518,7 +7518,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -7534,7 +7534,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -7548,7 +7548,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -7567,7 +7567,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -7580,7 +7580,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -7588,7 +7588,7 @@ public final class MasterProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -7598,7 +7598,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -7647,7 +7647,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UnassignRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UnassignRegionRequest)
     }
 
     static {
@@ -7655,14 +7655,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UnassignRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UnassignRegionRequest)
   }
 
   public interface UnassignRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code UnassignRegionResponse}
+   * Protobuf type {@code hbase.pb.UnassignRegionResponse}
    */
   public static final class UnassignRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -7725,12 +7725,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponse.Builder.class);
     }
@@ -7881,19 +7881,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UnassignRegionResponse}
+     * Protobuf type {@code hbase.pb.UnassignRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponse.Builder.class);
       }
@@ -7927,7 +7927,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_UnassignRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_UnassignRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponse getDefaultInstanceForType() {
@@ -7985,7 +7985,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UnassignRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UnassignRegionResponse)
     }
 
     static {
@@ -7993,28 +7993,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UnassignRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UnassignRegionResponse)
   }
 
   public interface OfflineRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
   }
   /**
-   * Protobuf type {@code OfflineRegionRequest}
+   * Protobuf type {@code hbase.pb.OfflineRegionRequest}
    */
   public static final class OfflineRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -8091,12 +8091,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequest.Builder.class);
     }
@@ -8117,23 +8117,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -8295,19 +8295,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code OfflineRegionRequest}
+     * Protobuf type {@code hbase.pb.OfflineRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequest.Builder.class);
       }
@@ -8348,7 +8348,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionRequest getDefaultInstanceForType() {
@@ -8429,18 +8429,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -8450,7 +8450,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -8466,7 +8466,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -8480,7 +8480,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -8499,7 +8499,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -8512,7 +8512,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -8520,7 +8520,7 @@ public final class MasterProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -8530,7 +8530,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -8546,7 +8546,7 @@ public final class MasterProtos {
         return regionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:OfflineRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.OfflineRegionRequest)
     }
 
     static {
@@ -8554,14 +8554,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:OfflineRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.OfflineRegionRequest)
   }
 
   public interface OfflineRegionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code OfflineRegionResponse}
+   * Protobuf type {@code hbase.pb.OfflineRegionResponse}
    */
   public static final class OfflineRegionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -8624,12 +8624,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionResponse.Builder.class);
     }
@@ -8780,19 +8780,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code OfflineRegionResponse}
+     * Protobuf type {@code hbase.pb.OfflineRegionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionResponse.Builder.class);
       }
@@ -8826,7 +8826,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_OfflineRegionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_OfflineRegionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.OfflineRegionResponse getDefaultInstanceForType() {
@@ -8884,7 +8884,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:OfflineRegionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.OfflineRegionResponse)
     }
 
     static {
@@ -8892,23 +8892,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:OfflineRegionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.OfflineRegionResponse)
   }
 
   public interface CreateTableRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableSchema table_schema = 1;
+    // required .hbase.pb.TableSchema table_schema = 1;
     /**
-     * required .TableSchema table_schema = 1;
+     * required .hbase.pb.TableSchema table_schema = 1;
      */
     boolean hasTableSchema();
     /**
-     * required .TableSchema table_schema = 1;
+     * required .hbase.pb.TableSchema table_schema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema();
     /**
-     * required .TableSchema table_schema = 1;
+     * required .hbase.pb.TableSchema table_schema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder();
 
@@ -8947,7 +8947,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code CreateTableRequest}
+   * Protobuf type {@code hbase.pb.CreateTableRequest}
    */
   public static final class CreateTableRequest extends
       com.google.protobuf.GeneratedMessage
@@ -9045,12 +9045,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableRequest.Builder.class);
     }
@@ -9071,23 +9071,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableSchema table_schema = 1;
+    // required .hbase.pb.TableSchema table_schema = 1;
     public static final int TABLE_SCHEMA_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_;
     /**
-     * required .TableSchema table_schema = 1;
+     * required .hbase.pb.TableSchema table_schema = 1;
      */
     public boolean hasTableSchema() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableSchema table_schema = 1;
+     * required .hbase.pb.TableSchema table_schema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
       return tableSchema_;
     }
     /**
-     * required .TableSchema table_schema = 1;
+     * required .hbase.pb.TableSchema table_schema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
       return tableSchema_;
@@ -9357,19 +9357,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CreateTableRequest}
+     * Protobuf type {@code hbase.pb.CreateTableRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableRequest.Builder.class);
       }
@@ -9416,7 +9416,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableRequest getDefaultInstanceForType() {
@@ -9526,18 +9526,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableSchema table_schema = 1;
+      // required .hbase.pb.TableSchema table_schema = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableSchemaBuilder_;
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public boolean hasTableSchema() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -9547,7 +9547,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder setTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -9563,7 +9563,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder setTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -9577,7 +9577,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder mergeTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -9596,7 +9596,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder clearTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -9609,7 +9609,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableSchemaBuilder() {
         bitField0_ |= 0x00000001;
@@ -9617,7 +9617,7 @@ public final class MasterProtos {
         return getTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
         if (tableSchemaBuilder_ != null) {
@@ -9627,7 +9627,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableSchema table_schema = 1;
+       * required .hbase.pb.TableSchema table_schema = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -9781,7 +9781,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CreateTableRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CreateTableRequest)
     }
 
     static {
@@ -9789,7 +9789,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CreateTableRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CreateTableRequest)
   }
 
   public interface CreateTableResponseOrBuilder
@@ -9806,7 +9806,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code CreateTableResponse}
+   * Protobuf type {@code hbase.pb.CreateTableResponse}
    */
   public static final class CreateTableResponse extends
       com.google.protobuf.GeneratedMessage
@@ -9875,12 +9875,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableResponse.Builder.class);
     }
@@ -10065,19 +10065,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CreateTableResponse}
+     * Protobuf type {@code hbase.pb.CreateTableResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableResponse.Builder.class);
       }
@@ -10113,7 +10113,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateTableResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableResponse getDefaultInstanceForType() {
@@ -10215,7 +10215,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CreateTableResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CreateTableResponse)
     }
 
     static {
@@ -10223,23 +10223,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CreateTableResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CreateTableResponse)
   }
 
   public interface DeleteTableRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -10264,7 +10264,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code DeleteTableRequest}
+   * Protobuf type {@code hbase.pb.DeleteTableRequest}
    */
   public static final class DeleteTableRequest extends
       com.google.protobuf.GeneratedMessage
@@ -10351,12 +10351,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableRequest.Builder.class);
     }
@@ -10377,23 +10377,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -10621,19 +10621,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteTableRequest}
+     * Protobuf type {@code hbase.pb.DeleteTableRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableRequest.Builder.class);
       }
@@ -10678,7 +10678,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableRequest getDefaultInstanceForType() {
@@ -10773,18 +10773,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -10794,7 +10794,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -10810,7 +10810,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -10824,7 +10824,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -10843,7 +10843,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -10856,7 +10856,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -10864,7 +10864,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -10874,7 +10874,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -10956,7 +10956,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteTableRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteTableRequest)
     }
 
     static {
@@ -10964,7 +10964,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteTableRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteTableRequest)
   }
 
   public interface DeleteTableResponseOrBuilder
@@ -10981,7 +10981,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code DeleteTableResponse}
+   * Protobuf type {@code hbase.pb.DeleteTableResponse}
    */
   public static final class DeleteTableResponse extends
       com.google.protobuf.GeneratedMessage
@@ -11050,12 +11050,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableResponse.Builder.class);
     }
@@ -11240,19 +11240,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteTableResponse}
+     * Protobuf type {@code hbase.pb.DeleteTableResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableResponse.Builder.class);
       }
@@ -11288,7 +11288,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteTableResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteTableResponse getDefaultInstanceForType() {
@@ -11390,7 +11390,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteTableResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteTableResponse)
     }
 
     static {
@@ -11398,23 +11398,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteTableResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteTableResponse)
   }
 
   public interface TruncateTableRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName tableName = 1;
+    // required .hbase.pb.TableName tableName = 1;
     /**
-     * required .TableName tableName = 1;
+     * required .hbase.pb.TableName tableName = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName tableName = 1;
+     * required .hbase.pb.TableName tableName = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName tableName = 1;
+     * required .hbase.pb.TableName tableName = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -11449,7 +11449,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code TruncateTableRequest}
+   * Protobuf type {@code hbase.pb.TruncateTableRequest}
    */
   public static final class TruncateTableRequest extends
       com.google.protobuf.GeneratedMessage
@@ -11541,12 +11541,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequest.Builder.class);
     }
@@ -11567,23 +11567,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName tableName = 1;
+    // required .hbase.pb.TableName tableName = 1;
     public static final int TABLENAME_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * required .TableName tableName = 1;
+     * required .hbase.pb.TableName tableName = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName tableName = 1;
+     * required .hbase.pb.TableName tableName = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName tableName = 1;
+     * required .hbase.pb.TableName tableName = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -11844,19 +11844,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TruncateTableRequest}
+     * Protobuf type {@code hbase.pb.TruncateTableRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequest.Builder.class);
       }
@@ -11903,7 +11903,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableRequest getDefaultInstanceForType() {
@@ -12005,18 +12005,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName tableName = 1;
+      // 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 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_;
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -12026,7 +12026,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -12042,7 +12042,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -12056,7 +12056,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -12075,7 +12075,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -12088,7 +12088,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -12096,7 +12096,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -12106,7 +12106,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName tableName = 1;
+       * required .hbase.pb.TableName tableName = 1;
        */
       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> 
@@ -12221,7 +12221,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TruncateTableRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TruncateTableRequest)
     }
 
     static {
@@ -12229,7 +12229,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TruncateTableRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TruncateTableRequest)
   }
 
   public interface TruncateTableResponseOrBuilder
@@ -12246,7 +12246,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code TruncateTableResponse}
+   * Protobuf type {@code hbase.pb.TruncateTableResponse}
    */
   public static final class TruncateTableResponse extends
       com.google.protobuf.GeneratedMessage
@@ -12315,12 +12315,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableResponse.Builder.class);
     }
@@ -12505,19 +12505,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TruncateTableResponse}
+     * Protobuf type {@code hbase.pb.TruncateTableResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableResponse.Builder.class);
       }
@@ -12553,7 +12553,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_TruncateTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_TruncateTableResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.TruncateTableResponse getDefaultInstanceForType() {
@@ -12655,7 +12655,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TruncateTableResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TruncateTableResponse)
     }
 
     static {
@@ -12663,23 +12663,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TruncateTableResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TruncateTableResponse)
   }
 
   public interface EnableTableRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -12704,7 +12704,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code EnableTableRequest}
+   * Protobuf type {@code hbase.pb.EnableTableRequest}
    */
   public static final class EnableTableRequest extends
       com.google.protobuf.GeneratedMessage
@@ -12791,12 +12791,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequest.Builder.class);
     }
@@ -12817,23 +12817,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -13061,19 +13061,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code EnableTableRequest}
+     * Protobuf type {@code hbase.pb.EnableTableRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequest.Builder.class);
       }
@@ -13118,7 +13118,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequest getDefaultInstanceForType() {
@@ -13213,18 +13213,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -13234,7 +13234,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -13250,7 +13250,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -13264,7 +13264,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -13283,7 +13283,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -13296,7 +13296,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -13304,7 +13304,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -13314,7 +13314,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -13396,7 +13396,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:EnableTableRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.EnableTableRequest)
     }
 
     static {
@@ -13404,7 +13404,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:EnableTableRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.EnableTableRequest)
   }
 
   public interface EnableTableResponseOrBuilder
@@ -13421,7 +13421,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code EnableTableResponse}
+   * Protobuf type {@code hbase.pb.EnableTableResponse}
    */
   public static final class EnableTableResponse extends
       com.google.protobuf.GeneratedMessage
@@ -13490,12 +13490,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponse.Builder.class);
     }
@@ -13680,19 +13680,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code EnableTableResponse}
+     * Protobuf type {@code hbase.pb.EnableTableResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponse.Builder.class);
       }
@@ -13728,7 +13728,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableTableResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponse getDefaultInstanceForType() {
@@ -13830,7 +13830,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:EnableTableResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.EnableTableResponse)
     }
 
     static {
@@ -13838,23 +13838,23 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:EnableTableResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.EnableTableResponse)
   }
 
   public interface DisableTableRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -13879,7 +13879,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code DisableTableRequest}
+   * Protobuf type {@code hbase.pb.DisableTableRequest}
    */
   public static final class DisableTableRequest extends
       com.google.protobuf.GeneratedMessage
@@ -13966,12 +13966,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableRequest.Builder.class);
     }
@@ -13992,23 +13992,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -14236,19 +14236,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DisableTableRequest}
+     * Protobuf type {@code hbase.pb.DisableTableRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableRequest.Builder.class);
       }
@@ -14293,7 +14293,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableRequest getDefaultInstanceForType() {
@@ -14388,18 +14388,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -14409,7 +14409,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -14425,7 +14425,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -14439,7 +14439,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -14458,7 +14458,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -14471,7 +14471,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -14479,7 +14479,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -14489,7 +14489,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -14571,7 +14571,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DisableTableRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DisableTableRequest)
     }
 
     static {
@@ -14579,7 +14579,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DisableTableRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DisableTableRequest)
   }
 
   public interface DisableTableResponseOrBuilder
@@ -14596,7 +14596,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code DisableTableResponse}
+   * Protobuf type {@code hbase.pb.DisableTableResponse}
    */
   public static final class DisableTableResponse extends
       com.google.protobuf.GeneratedMessage
@@ -14665,12 +14665,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableResponse.Builder.class);
     }
@@ -14855,19 +14855,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DisableTableResponse}
+     * Protobuf type {@code hbase.pb.DisableTableResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableResponse.Builder.class);
       }
@@ -14903,7 +14903,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DisableTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DisableTableResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DisableTableResponse getDefaultInstanceForType() {
@@ -15005,7 +15005,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DisableTableResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DisableTableResponse)
     }
 
     static {
@@ -15013,37 +15013,37 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DisableTableResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DisableTableResponse)
   }
 
   public interface ModifyTableRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // required .TableSchema table_schema = 2;
+    // required .hbase.pb.TableSchema table_schema = 2;
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     boolean hasTableSchema();
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema();
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder();
 
@@ -15068,7 +15068,7 @@ public final class MasterProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code ModifyTableRequest}
+   * Protobuf type {@code hbase.pb.ModifyTableRequest}
    */
   public static final class ModifyTableRequest extends
       com.google.protobuf.GeneratedMessage
@@ -15168,12 +15168,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequest.Builder.class);
     }
@@ -15194,45 +15194,45 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // required .TableSchema table_schema = 2;
+    // required .hbase.pb.TableSchema table_schema = 2;
     public static final int TABLE_SCHEMA_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_;
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     public boolean hasTableSchema() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
       return tableSchema_;
     }
     /**
-     * required .TableSchema table_schema = 2;
+     * required .hbase.pb.TableSchema table_schema = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
       return tableSchema_;
@@ -15485,19 +15485,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyTableRequest}
+     * Protobuf type {@code hbase.pb.ModifyTableRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequest.Builder.class);
       }
@@ -15549,7 +15549,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableRequest getDefaultInstanceForType() {
@@ -15663,18 +15663,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -15684,7 +15684,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -15700,7 +15700,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -15714,7 +15714,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -15733,7 +15733,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -15746,7 +15746,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -15754,7 +15754,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -15764,7 +15764,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -15780,18 +15780,18 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // required .TableSchema table_schema = 2;
+      // required .hbase.pb.TableSchema table_schema = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema tableSchema_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableSchemaBuilder_;
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public boolean hasTableSchema() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -15801,7 +15801,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder setTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -15817,7 +15817,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder setTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -15831,7 +15831,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder mergeTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -15850,7 +15850,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public Builder clearTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -15863,7 +15863,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableSchemaBuilder() {
         bitField0_ |= 0x00000002;
@@ -15871,7 +15871,7 @@ public final class MasterProtos {
         return getTableSchemaFieldBuilder().getBuilder();
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder() {
         if (tableSchemaBuilder_ != null) {
@@ -15881,7 +15881,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableSchema table_schema = 2;
+       * required .hbase.pb.TableSchema table_schema = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> 
@@ -15963,7 +15963,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyTableRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyTableRequest)
     }
 
     static {
@@ -15971,7 +15971,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyTableRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyTableRequest)
   }
 
   public interface ModifyTableResponseOrBuilder
@@ -15988,7 +15988,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code ModifyTableResponse}
+   * Protobuf type {@code hbase.pb.ModifyTableResponse}
    */
   public static final class ModifyTableResponse extends
       com.google.protobuf.GeneratedMessage
@@ -16057,12 +16057,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableResponse.Builder.class);
     }
@@ -16247,19 +16247,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyTableResponse}
+     * Protobuf type {@code hbase.pb.ModifyTableResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableResponse.Builder.class);
       }
@@ -16295,7 +16295,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyTableResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyTableResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyTableResponse getDefaultInstanceForType() {
@@ -16397,7 +16397,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyTableResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyTableResponse)
     }
 
     static {
@@ -16405,28 +16405,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyTableResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyTableResponse)
   }
 
   public interface CreateNamespaceRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .NamespaceDescriptor namespaceDescriptor = 1;
+    // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     boolean hasNamespaceDescriptor();
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor();
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder();
   }
   /**
-   * Protobuf type {@code CreateNamespaceRequest}
+   * Protobuf type {@code hbase.pb.CreateNamespaceRequest}
    */
   public static final class CreateNamespaceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -16503,12 +16503,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceRequest.Builder.class);
     }
@@ -16529,23 +16529,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .NamespaceDescriptor namespaceDescriptor = 1;
+    // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     public static final int NAMESPACEDESCRIPTOR_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor namespaceDescriptor_;
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public boolean hasNamespaceDescriptor() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor() {
       return namespaceDescriptor_;
     }
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder() {
       return namespaceDescriptor_;
@@ -16707,19 +16707,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CreateNamespaceRequest}
+     * Protobuf type {@code hbase.pb.CreateNamespaceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceRequest.Builder.class);
       }
@@ -16760,7 +16760,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceRequest getDefaultInstanceForType() {
@@ -16841,18 +16841,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .NamespaceDescriptor namespaceDescriptor = 1;
+      // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor namespaceDescriptor_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> namespaceDescriptorBuilder_;
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public boolean hasNamespaceDescriptor() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -16862,7 +16862,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -16878,7 +16878,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder builderForValue) {
@@ -16892,7 +16892,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder mergeNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -16911,7 +16911,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder clearNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -16924,7 +16924,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder getNamespaceDescriptorBuilder() {
         bitField0_ |= 0x00000001;
@@ -16932,7 +16932,7 @@ public final class MasterProtos {
         return getNamespaceDescriptorFieldBuilder().getBuilder();
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder() {
         if (namespaceDescriptorBuilder_ != null) {
@@ -16942,7 +16942,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> 
@@ -16958,7 +16958,7 @@ public final class MasterProtos {
         return namespaceDescriptorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:CreateNamespaceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CreateNamespaceRequest)
     }
 
     static {
@@ -16966,14 +16966,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CreateNamespaceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CreateNamespaceRequest)
   }
 
   public interface CreateNamespaceResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code CreateNamespaceResponse}
+   * Protobuf type {@code hbase.pb.CreateNamespaceResponse}
    */
   public static final class CreateNamespaceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -17036,12 +17036,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceResponse.Builder.class);
     }
@@ -17192,19 +17192,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CreateNamespaceResponse}
+     * Protobuf type {@code hbase.pb.CreateNamespaceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceResponse.Builder.class);
       }
@@ -17238,7 +17238,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_CreateNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_CreateNamespaceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateNamespaceResponse getDefaultInstanceForType() {
@@ -17296,7 +17296,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CreateNamespaceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CreateNamespaceResponse)
     }
 
     static {
@@ -17304,7 +17304,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CreateNamespaceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CreateNamespaceResponse)
   }
 
   public interface DeleteNamespaceRequestOrBuilder
@@ -17326,7 +17326,7 @@ public final class MasterProtos {
         getNamespaceNameBytes();
   }
   /**
-   * Protobuf type {@code DeleteNamespaceRequest}
+   * Protobuf type {@code hbase.pb.DeleteNamespaceRequest}
    */
   public static final class DeleteNamespaceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -17395,12 +17395,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceRequest.Builder.class);
     }
@@ -17616,19 +17616,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteNamespaceRequest}
+     * Protobuf type {@code hbase.pb.DeleteNamespaceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceRequest.Builder.class);
       }
@@ -17664,7 +17664,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceRequest getDefaultInstanceForType() {
@@ -17813,7 +17813,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteNamespaceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteNamespaceRequest)
     }
 
     static {
@@ -17821,14 +17821,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteNamespaceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteNamespaceRequest)
   }
 
   public interface DeleteNamespaceResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code DeleteNamespaceResponse}
+   * Protobuf type {@code hbase.pb.DeleteNamespaceResponse}
    */
   public static final class DeleteNamespaceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -17891,12 +17891,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceResponse.Builder.class);
     }
@@ -18047,19 +18047,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteNamespaceResponse}
+     * Protobuf type {@code hbase.pb.DeleteNamespaceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceResponse.Builder.class);
       }
@@ -18093,7 +18093,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteNamespaceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteNamespaceResponse getDefaultInstanceForType() {
@@ -18151,7 +18151,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteNamespaceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteNamespaceResponse)
     }
 
     static {
@@ -18159,28 +18159,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteNamespaceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteNamespaceResponse)
   }
 
   public interface ModifyNamespaceRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .NamespaceDescriptor namespaceDescriptor = 1;
+    // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     boolean hasNamespaceDescriptor();
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor();
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder();
   }
   /**
-   * Protobuf type {@code ModifyNamespaceRequest}
+   * Protobuf type {@code hbase.pb.ModifyNamespaceRequest}
    */
   public static final class ModifyNamespaceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -18257,12 +18257,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceRequest.Builder.class);
     }
@@ -18283,23 +18283,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .NamespaceDescriptor namespaceDescriptor = 1;
+    // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     public static final int NAMESPACEDESCRIPTOR_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor namespaceDescriptor_;
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public boolean hasNamespaceDescriptor() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor() {
       return namespaceDescriptor_;
     }
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder() {
       return namespaceDescriptor_;
@@ -18461,19 +18461,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyNamespaceRequest}
+     * Protobuf type {@code hbase.pb.ModifyNamespaceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceRequest.Builder.class);
       }
@@ -18514,7 +18514,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceRequest getDefaultInstanceForType() {
@@ -18595,18 +18595,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .NamespaceDescriptor namespaceDescriptor = 1;
+      // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor namespaceDescriptor_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> namespaceDescriptorBuilder_;
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public boolean hasNamespaceDescriptor() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -18616,7 +18616,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -18632,7 +18632,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder builderForValue) {
@@ -18646,7 +18646,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder mergeNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -18665,7 +18665,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder clearNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -18678,7 +18678,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder getNamespaceDescriptorBuilder() {
         bitField0_ |= 0x00000001;
@@ -18686,7 +18686,7 @@ public final class MasterProtos {
         return getNamespaceDescriptorFieldBuilder().getBuilder();
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder() {
         if (namespaceDescriptorBuilder_ != null) {
@@ -18696,7 +18696,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> 
@@ -18712,7 +18712,7 @@ public final class MasterProtos {
         return namespaceDescriptorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyNamespaceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyNamespaceRequest)
     }
 
     static {
@@ -18720,14 +18720,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyNamespaceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyNamespaceRequest)
   }
 
   public interface ModifyNamespaceResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ModifyNamespaceResponse}
+   * Protobuf type {@code hbase.pb.ModifyNamespaceResponse}
    */
   public static final class ModifyNamespaceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -18790,12 +18790,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceResponse.Builder.class);
     }
@@ -18946,19 +18946,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ModifyNamespaceResponse}
+     * Protobuf type {@code hbase.pb.ModifyNamespaceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceResponse.Builder.class);
       }
@@ -18992,7 +18992,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ModifyNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ModifyNamespaceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyNamespaceResponse getDefaultInstanceForType() {
@@ -19050,7 +19050,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ModifyNamespaceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ModifyNamespaceResponse)
     }
 
     static {
@@ -19058,7 +19058,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ModifyNamespaceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ModifyNamespaceResponse)
   }
 
   public interface GetNamespaceDescriptorRequestOrBuilder
@@ -19080,7 +19080,7 @@ public final class MasterProtos {
         getNamespaceNameBytes();
   }
   /**
-   * Protobuf type {@code GetNamespaceDescriptorRequest}
+   * Protobuf type {@code hbase.pb.GetNamespaceDescriptorRequest}
    */
   public static final class GetNamespaceDescriptorRequest extends
       com.google.protobuf.GeneratedMessage
@@ -19149,12 +19149,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest.Builder.class);
     }
@@ -19370,19 +19370,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetNamespaceDescriptorRequest}
+     * Protobuf type {@code hbase.pb.GetNamespaceDescriptorRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest.Builder.class);
       }
@@ -19418,7 +19418,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorRequest getDefaultInstanceForType() {
@@ -19567,7 +19567,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetNamespaceDescriptorRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetNamespaceDescriptorRequest)
     }
 
     static {
@@ -19575,28 +19575,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetNamespaceDescriptorRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetNamespaceDescriptorRequest)
   }
 
   public interface GetNamespaceDescriptorResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .NamespaceDescriptor namespaceDescriptor = 1;
+    // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     boolean hasNamespaceDescriptor();
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor();
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder();
   }
   /**
-   * Protobuf type {@code GetNamespaceDescriptorResponse}
+   * Protobuf type {@code hbase.pb.GetNamespaceDescriptorResponse}
    */
   public static final class GetNamespaceDescriptorResponse extends
       com.google.protobuf.GeneratedMessage
@@ -19673,12 +19673,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse.Builder.class);
     }
@@ -19699,23 +19699,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .NamespaceDescriptor namespaceDescriptor = 1;
+    // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     public static final int NAMESPACEDESCRIPTOR_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor namespaceDescriptor_;
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public boolean hasNamespaceDescriptor() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor() {
       return namespaceDescriptor_;
     }
     /**
-     * required .NamespaceDescriptor namespaceDescriptor = 1;
+     * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder() {
       return namespaceDescriptor_;
@@ -19877,19 +19877,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetNamespaceDescriptorResponse}
+     * Protobuf type {@code hbase.pb.GetNamespaceDescriptorResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse.Builder.class);
       }
@@ -19930,7 +19930,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetNamespaceDescriptorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetNamespaceDescriptorResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetNamespaceDescriptorResponse getDefaultInstanceForType() {
@@ -20011,18 +20011,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .NamespaceDescriptor namespaceDescriptor = 1;
+      // required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor namespaceDescriptor_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> namespaceDescriptorBuilder_;
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public boolean hasNamespaceDescriptor() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20032,7 +20032,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20048,7 +20048,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder builderForValue) {
@@ -20062,7 +20062,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder mergeNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20081,7 +20081,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder clearNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20094,7 +20094,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder getNamespaceDescriptorBuilder() {
         bitField0_ |= 0x00000001;
@@ -20102,7 +20102,7 @@ public final class MasterProtos {
         return getNamespaceDescriptorFieldBuilder().getBuilder();
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder() {
         if (namespaceDescriptorBuilder_ != null) {
@@ -20112,7 +20112,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .NamespaceDescriptor namespaceDescriptor = 1;
+       * required .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> 
@@ -20128,7 +20128,7 @@ public final class MasterProtos {
         return namespaceDescriptorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetNamespaceDescriptorResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetNamespaceDescriptorResponse)
     }
 
     static {
@@ -20136,14 +20136,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetNamespaceDescriptorResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetNamespaceDescriptorResponse)
   }
 
   public interface ListNamespaceDescriptorsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ListNamespaceDescriptorsRequest}
+   * Protobuf type {@code hbase.pb.ListNamespaceDescriptorsRequest}
    */
   public static final class ListNamespaceDescriptorsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -20206,12 +20206,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequest.Builder.class);
     }
@@ -20362,19 +20362,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListNamespaceDescriptorsRequest}
+     * Protobuf type {@code hbase.pb.ListNamespaceDescriptorsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequest.Builder.class);
       }
@@ -20408,7 +20408,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsRequest getDefaultInstanceForType() {
@@ -20466,7 +20466,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListNamespaceDescriptorsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListNamespaceDescriptorsRequest)
     }
 
     static {
@@ -20474,39 +20474,39 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListNamespaceDescriptorsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListNamespaceDescriptorsRequest)
   }
 
   public interface ListNamespaceDescriptorsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .NamespaceDescriptor namespaceDescriptor = 1;
+    // repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     java.util.List 
         getNamespaceDescriptorList();
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor(int index);
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     int getNamespaceDescriptorCount();
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     java.util.List 
         getNamespaceDescriptorOrBuilderList();
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ListNamespaceDescriptorsResponse}
+   * Protobuf type {@code hbase.pb.ListNamespaceDescriptorsResponse}
    */
   public static final class ListNamespaceDescriptorsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -20581,12 +20581,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsResponse.Builder.class);
     }
@@ -20606,36 +20606,36 @@ public final class MasterProtos {
       return PARSER;
     }
 
-    // repeated .NamespaceDescriptor namespaceDescriptor = 1;
+    // repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
     public static final int NAMESPACEDESCRIPTOR_FIELD_NUMBER = 1;
     private java.util.List namespaceDescriptor_;
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public java.util.List getNamespaceDescriptorList() {
       return namespaceDescriptor_;
     }
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public java.util.List 
         getNamespaceDescriptorOrBuilderList() {
       return namespaceDescriptor_;
     }
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public int getNamespaceDescriptorCount() {
       return namespaceDescriptor_.size();
     }
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor(int index) {
       return namespaceDescriptor_.get(index);
     }
     /**
-     * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+     * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder(
         int index) {
@@ -20793,19 +20793,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListNamespaceDescriptorsResponse}
+     * Protobuf type {@code hbase.pb.ListNamespaceDescriptorsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsResponse.Builder.class);
       }
@@ -20846,7 +20846,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListNamespaceDescriptorsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListNamespaceDescriptorsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListNamespaceDescriptorsResponse getDefaultInstanceForType() {
@@ -20947,7 +20947,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .NamespaceDescriptor namespaceDescriptor = 1;
+      // repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
       private java.util.List namespaceDescriptor_ =
         java.util.Collections.emptyList();
       private void ensureNamespaceDescriptorIsMutable() {
@@ -20961,7 +20961,7 @@ public final class MasterProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder> namespaceDescriptorBuilder_;
 
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public java.util.List getNamespaceDescriptorList() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20971,7 +20971,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public int getNamespaceDescriptorCount() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20981,7 +20981,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor getNamespaceDescriptor(int index) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -20991,7 +20991,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
@@ -21008,7 +21008,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder setNamespaceDescriptor(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder builderForValue) {
@@ -21022,7 +21022,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder addNamespaceDescriptor(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -21038,7 +21038,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder addNamespaceDescriptor(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor value) {
@@ -21055,7 +21055,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder addNamespaceDescriptor(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder builderForValue) {
@@ -21069,7 +21069,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder addNamespaceDescriptor(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder builderForValue) {
@@ -21083,7 +21083,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder addAllNamespaceDescriptor(
           java.lang.Iterable values) {
@@ -21097,7 +21097,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder clearNamespaceDescriptor() {
         if (namespaceDescriptorBuilder_ == null) {
@@ -21110,7 +21110,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public Builder removeNamespaceDescriptor(int index) {
         if (namespaceDescriptorBuilder_ == null) {
@@ -21123,14 +21123,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder getNamespaceDescriptorBuilder(
           int index) {
         return getNamespaceDescriptorFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptorOrBuilder getNamespaceDescriptorOrBuilder(
           int index) {
@@ -21140,7 +21140,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public java.util.List 
            getNamespaceDescriptorOrBuilderList() {
@@ -21151,14 +21151,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder addNamespaceDescriptorBuilder() {
         return getNamespaceDescriptorFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.Builder addNamespaceDescriptorBuilder(
           int index) {
@@ -21166,7 +21166,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NamespaceDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .NamespaceDescriptor namespaceDescriptor = 1;
+       * repeated .hbase.pb.NamespaceDescriptor namespaceDescriptor = 1;
        */
       public java.util.List 
            getNamespaceDescriptorBuilderList() {
@@ -21187,7 +21187,7 @@ public final class MasterProtos {
         return namespaceDescriptorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListNamespaceDescriptorsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListNamespaceDescriptorsResponse)
     }
 
     static {
@@ -21195,7 +21195,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListNamespaceDescriptorsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListNamespaceDescriptorsResponse)
   }
 
   public interface ListTableDescriptorsByNamespaceRequestOrBuilder
@@ -21217,7 +21217,7 @@ public final class MasterProtos {
         getNamespaceNameBytes();
   }
   /**
-   * Protobuf type {@code ListTableDescriptorsByNamespaceRequest}
+   * Protobuf type {@code hbase.pb.ListTableDescriptorsByNamespaceRequest}
    */
   public static final class ListTableDescriptorsByNamespaceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -21286,12 +21286,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequest.Builder.class);
     }
@@ -21507,19 +21507,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListTableDescriptorsByNamespaceRequest}
+     * Protobuf type {@code hbase.pb.ListTableDescriptorsByNamespaceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequest.Builder.class);
       }
@@ -21555,7 +21555,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceRequest getDefaultInstanceForType() {
@@ -21704,7 +21704,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListTableDescriptorsByNamespaceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListTableDescriptorsByNamespaceRequest)
     }
 
     static {
@@ -21712,39 +21712,39 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListTableDescriptorsByNamespaceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListTableDescriptorsByNamespaceRequest)
   }
 
   public interface ListTableDescriptorsByNamespaceResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .TableSchema tableSchema = 1;
+    // repeated .hbase.pb.TableSchema tableSchema = 1;
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     java.util.List 
         getTableSchemaList();
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema(int index);
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     int getTableSchemaCount();
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     java.util.List 
         getTableSchemaOrBuilderList();
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ListTableDescriptorsByNamespaceResponse}
+   * Protobuf type {@code hbase.pb.ListTableDescriptorsByNamespaceResponse}
    */
   public static final class ListTableDescriptorsByNamespaceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -21819,12 +21819,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceResponse.Builder.class);
     }
@@ -21844,36 +21844,36 @@ public final class MasterProtos {
       return PARSER;
     }
 
-    // repeated .TableSchema tableSchema = 1;
+    // repeated .hbase.pb.TableSchema tableSchema = 1;
     public static final int TABLESCHEMA_FIELD_NUMBER = 1;
     private java.util.List tableSchema_;
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     public java.util.List getTableSchemaList() {
       return tableSchema_;
     }
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     public java.util.List 
         getTableSchemaOrBuilderList() {
       return tableSchema_;
     }
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     public int getTableSchemaCount() {
       return tableSchema_.size();
     }
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema(int index) {
       return tableSchema_.get(index);
     }
     /**
-     * repeated .TableSchema tableSchema = 1;
+     * repeated .hbase.pb.TableSchema tableSchema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder(
         int index) {
@@ -22031,19 +22031,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListTableDescriptorsByNamespaceResponse}
+     * Protobuf type {@code hbase.pb.ListTableDescriptorsByNamespaceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceResponse.Builder.class);
       }
@@ -22084,7 +22084,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableDescriptorsByNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableDescriptorsByNamespaceResponse getDefaultInstanceForType() {
@@ -22185,7 +22185,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .TableSchema tableSchema = 1;
+      // repeated .hbase.pb.TableSchema tableSchema = 1;
       private java.util.List tableSchema_ =
         java.util.Collections.emptyList();
       private void ensureTableSchemaIsMutable() {
@@ -22199,7 +22199,7 @@ public final class MasterProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableSchemaBuilder_;
 
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public java.util.List getTableSchemaList() {
         if (tableSchemaBuilder_ == null) {
@@ -22209,7 +22209,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public int getTableSchemaCount() {
         if (tableSchemaBuilder_ == null) {
@@ -22219,7 +22219,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema(int index) {
         if (tableSchemaBuilder_ == null) {
@@ -22229,7 +22229,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder setTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
@@ -22246,7 +22246,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder setTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -22260,7 +22260,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder addTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -22276,7 +22276,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder addTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
@@ -22293,7 +22293,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder addTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -22307,7 +22307,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder addTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -22321,7 +22321,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder addAllTableSchema(
           java.lang.Iterable values) {
@@ -22335,7 +22335,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder clearTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -22348,7 +22348,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public Builder removeTableSchema(int index) {
         if (tableSchemaBuilder_ == null) {
@@ -22361,14 +22361,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableSchemaBuilder(
           int index) {
         return getTableSchemaFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder(
           int index) {
@@ -22378,7 +22378,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public java.util.List 
            getTableSchemaOrBuilderList() {
@@ -22389,14 +22389,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder addTableSchemaBuilder() {
         return getTableSchemaFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance());
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder addTableSchemaBuilder(
           int index) {
@@ -22404,7 +22404,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance());
       }
       /**
-       * repeated .TableSchema tableSchema = 1;
+       * repeated .hbase.pb.TableSchema tableSchema = 1;
        */
       public java.util.List 
            getTableSchemaBuilderList() {
@@ -22425,7 +22425,7 @@ public final class MasterProtos {
         return tableSchemaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListTableDescriptorsByNamespaceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListTableDescriptorsByNamespaceResponse)
     }
 
     static {
@@ -22433,7 +22433,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListTableDescriptorsByNamespaceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListTableDescriptorsByNamespaceResponse)
   }
 
   public interface ListTableNamesByNamespaceRequestOrBuilder
@@ -22455,7 +22455,7 @@ public final class MasterProtos {
         getNamespaceNameBytes();
   }
   /**
-   * Protobuf type {@code ListTableNamesByNamespaceRequest}
+   * Protobuf type {@code hbase.pb.ListTableNamesByNamespaceRequest}
    */
   public static final class ListTableNamesByNamespaceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -22524,12 +22524,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceRequest.Builder.class);
     }
@@ -22745,19 +22745,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListTableNamesByNamespaceRequest}
+     * Protobuf type {@code hbase.pb.ListTableNamesByNamespaceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceRequest.Builder.class);
       }
@@ -22793,7 +22793,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceRequest getDefaultInstanceForType() {
@@ -22942,7 +22942,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListTableNamesByNamespaceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListTableNamesByNamespaceRequest)
     }
 
     static {
@@ -22950,39 +22950,39 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListTableNamesByNamespaceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListTableNamesByNamespaceRequest)
   }
 
   public interface ListTableNamesByNamespaceResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .TableName tableName = 1;
+    // repeated .hbase.pb.TableName tableName = 1;
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     java.util.List 
         getTableNameList();
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName(int index);
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     int getTableNameCount();
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     java.util.List 
         getTableNameOrBuilderList();
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ListTableNamesByNamespaceResponse}
+   * Protobuf type {@code hbase.pb.ListTableNamesByNamespaceResponse}
    */
   public static final class ListTableNamesByNamespaceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -23057,12 +23057,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceResponse.Builder.class);
     }
@@ -23082,36 +23082,36 @@ public final class MasterProtos {
       return PARSER;
     }
 
-    // repeated .TableName tableName = 1;
+    // repeated .hbase.pb.TableName tableName = 1;
     public static final int TABLENAME_FIELD_NUMBER = 1;
     private java.util.List tableName_;
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     public java.util.List getTableNameList() {
       return tableName_;
     }
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     public java.util.List 
         getTableNameOrBuilderList() {
       return tableName_;
     }
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     public int getTableNameCount() {
       return tableName_.size();
     }
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName(int index) {
       return tableName_.get(index);
     }
     /**
-     * repeated .TableName tableName = 1;
+     * repeated .hbase.pb.TableName tableName = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder(
         int index) {
@@ -23269,19 +23269,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListTableNamesByNamespaceResponse}
+     * Protobuf type {@code hbase.pb.ListTableNamesByNamespaceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceResponse.Builder.class);
       }
@@ -23322,7 +23322,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ListTableNamesByNamespaceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ListTableNamesByNamespaceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ListTableNamesByNamespaceResponse getDefaultInstanceForType() {
@@ -23423,7 +23423,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .TableName tableName = 1;
+      // repeated .hbase.pb.TableName tableName = 1;
       private java.util.List tableName_ =
         java.util.Collections.emptyList();
       private void ensureTableNameIsMutable() {
@@ -23437,7 +23437,7 @@ public final class MasterProtos {
           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_;
 
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public java.util.List getTableNameList() {
         if (tableNameBuilder_ == null) {
@@ -23447,7 +23447,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public int getTableNameCount() {
         if (tableNameBuilder_ == null) {
@@ -23457,7 +23457,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName(int index) {
         if (tableNameBuilder_ == null) {
@@ -23467,7 +23467,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder setTableName(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
@@ -23484,7 +23484,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder setTableName(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -23498,7 +23498,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder addTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -23514,7 +23514,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder addTableName(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
@@ -23531,7 +23531,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder addTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -23545,7 +23545,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder addTableName(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -23559,7 +23559,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder addAllTableName(
           java.lang.Iterable values) {
@@ -23573,7 +23573,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -23586,7 +23586,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public Builder removeTableName(int index) {
         if (tableNameBuilder_ == null) {
@@ -23599,14 +23599,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder(
           int index) {
         return getTableNameFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder(
           int index) {
@@ -23616,7 +23616,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public java.util.List 
            getTableNameOrBuilderList() {
@@ -23627,14 +23627,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableNameBuilder() {
         return getTableNameFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance());
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableNameBuilder(
           int index) {
@@ -23642,7 +23642,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance());
       }
       /**
-       * repeated .TableName tableName = 1;
+       * repeated .hbase.pb.TableName tableName = 1;
        */
       public java.util.List 
            getTableNameBuilderList() {
@@ -23663,7 +23663,7 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListTableNamesByNamespaceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListTableNamesByNamespaceResponse)
     }
 
     static {
@@ -23671,14 +23671,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListTableNamesByNamespaceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListTableNamesByNamespaceResponse)
   }
 
   public interface ShutdownRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ShutdownRequest}
+   * Protobuf type {@code hbase.pb.ShutdownRequest}
    */
   public static final class ShutdownRequest extends
       com.google.protobuf.GeneratedMessage
@@ -23741,12 +23741,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownRequest.Builder.class);
     }
@@ -23897,19 +23897,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ShutdownRequest}
+     * Protobuf type {@code hbase.pb.ShutdownRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownRequest.Builder.class);
       }
@@ -23943,7 +23943,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownRequest getDefaultInstanceForType() {
@@ -24001,7 +24001,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ShutdownRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ShutdownRequest)
     }
 
     static {
@@ -24009,14 +24009,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ShutdownRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ShutdownRequest)
   }
 
   public interface ShutdownResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ShutdownResponse}
+   * Protobuf type {@code hbase.pb.ShutdownResponse}
    */
   public static final class ShutdownResponse extends
       com.google.protobuf.GeneratedMessage
@@ -24079,12 +24079,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownResponse.Builder.class);
     }
@@ -24235,19 +24235,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ShutdownResponse}
+     * Protobuf type {@code hbase.pb.ShutdownResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownResponse.Builder.class);
       }
@@ -24281,7 +24281,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ShutdownResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ShutdownResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ShutdownResponse getDefaultInstanceForType() {
@@ -24339,7 +24339,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ShutdownResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ShutdownResponse)
     }
 
     static {
@@ -24347,14 +24347,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ShutdownResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ShutdownResponse)
   }
 
   public interface StopMasterRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code StopMasterRequest}
+   * Protobuf type {@code hbase.pb.StopMasterRequest}
    */
   public static final class StopMasterRequest extends
       com.google.protobuf.GeneratedMessage
@@ -24417,12 +24417,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterRequest.Builder.class);
     }
@@ -24573,19 +24573,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StopMasterRequest}
+     * Protobuf type {@code hbase.pb.StopMasterRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterRequest.Builder.class);
       }
@@ -24619,7 +24619,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterRequest getDefaultInstanceForType() {
@@ -24677,7 +24677,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StopMasterRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StopMasterRequest)
     }
 
     static {
@@ -24685,14 +24685,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StopMasterRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StopMasterRequest)
   }
 
   public interface StopMasterResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code StopMasterResponse}
+   * Protobuf type {@code hbase.pb.StopMasterResponse}
    */
   public static final class StopMasterResponse extends
       com.google.protobuf.GeneratedMessage
@@ -24755,12 +24755,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponse.Builder.class);
     }
@@ -24911,19 +24911,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StopMasterResponse}
+     * Protobuf type {@code hbase.pb.StopMasterResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponse.Builder.class);
       }
@@ -24957,7 +24957,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_StopMasterResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_StopMasterResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponse getDefaultInstanceForType() {
@@ -25015,7 +25015,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StopMasterResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StopMasterResponse)
     }
 
     static {
@@ -25023,14 +25023,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StopMasterResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StopMasterResponse)
   }
 
   public interface BalanceRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code BalanceRequest}
+   * Protobuf type {@code hbase.pb.BalanceRequest}
    */
   public static final class BalanceRequest extends
       com.google.protobuf.GeneratedMessage
@@ -25093,12 +25093,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequest.Builder.class);
     }
@@ -25249,19 +25249,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BalanceRequest}
+     * Protobuf type {@code hbase.pb.BalanceRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequest.Builder.class);
       }
@@ -25295,7 +25295,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceRequest getDefaultInstanceForType() {
@@ -25353,7 +25353,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BalanceRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BalanceRequest)
     }
 
     static {
@@ -25361,7 +25361,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BalanceRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BalanceRequest)
   }
 
   public interface BalanceResponseOrBuilder
@@ -25378,7 +25378,7 @@ public final class MasterProtos {
     boolean getBalancerRan();
   }
   /**
-   * Protobuf type {@code BalanceResponse}
+   * Protobuf type {@code hbase.pb.BalanceResponse}
    */
   public static final class BalanceResponse extends
       com.google.protobuf.GeneratedMessage
@@ -25447,12 +25447,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceResponse.Builder.class);
     }
@@ -25641,19 +25641,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BalanceResponse}
+     * Protobuf type {@code hbase.pb.BalanceResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceResponse.Builder.class);
       }
@@ -25689,7 +25689,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_BalanceResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_BalanceResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.BalanceResponse getDefaultInstanceForType() {
@@ -25795,7 +25795,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BalanceResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BalanceResponse)
     }
 
     static {
@@ -25803,7 +25803,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BalanceResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BalanceResponse)
   }
 
   public interface SetBalancerRunningRequestOrBuilder
@@ -25830,7 +25830,7 @@ public final class MasterProtos {
     boolean getSynchronous();
   }
   /**
-   * Protobuf type {@code SetBalancerRunningRequest}
+   * Protobuf type {@code hbase.pb.SetBalancerRunningRequest}
    */
   public static final class SetBalancerRunningRequest extends
       com.google.protobuf.GeneratedMessage
@@ -25904,12 +25904,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequest.Builder.class);
     }
@@ -26131,19 +26131,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SetBalancerRunningRequest}
+     * Protobuf type {@code hbase.pb.SetBalancerRunningRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequest.Builder.class);
       }
@@ -26181,7 +26181,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningRequest getDefaultInstanceForType() {
@@ -26327,7 +26327,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SetBalancerRunningRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SetBalancerRunningRequest)
     }
 
     static {
@@ -26335,7 +26335,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SetBalancerRunningRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SetBalancerRunningRequest)
   }
 
   public interface SetBalancerRunningResponseOrBuilder
@@ -26352,7 +26352,7 @@ public final class MasterProtos {
     boolean getPrevBalanceValue();
   }
   /**
-   * Protobuf type {@code SetBalancerRunningResponse}
+   * Protobuf type {@code hbase.pb.SetBalancerRunningResponse}
    */
   public static final class SetBalancerRunningResponse extends
       com.google.protobuf.GeneratedMessage
@@ -26421,12 +26421,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningResponse.Builder.class);
     }
@@ -26611,19 +26611,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SetBalancerRunningResponse}
+     * Protobuf type {@code hbase.pb.SetBalancerRunningResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningResponse.Builder.class);
       }
@@ -26659,7 +26659,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetBalancerRunningResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetBalancerRunningResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetBalancerRunningResponse getDefaultInstanceForType() {
@@ -26761,7 +26761,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SetBalancerRunningResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SetBalancerRunningResponse)
     }
 
     static {
@@ -26769,14 +26769,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SetBalancerRunningResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SetBalancerRunningResponse)
   }
 
   public interface IsBalancerEnabledRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code IsBalancerEnabledRequest}
+   * Protobuf type {@code hbase.pb.IsBalancerEnabledRequest}
    */
   public static final class IsBalancerEnabledRequest extends
       com.google.protobuf.GeneratedMessage
@@ -26839,12 +26839,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest.Builder.class);
     }
@@ -26995,19 +26995,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsBalancerEnabledRequest}
+     * Protobuf type {@code hbase.pb.IsBalancerEnabledRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest.Builder.class);
       }
@@ -27041,7 +27041,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest getDefaultInstanceForType() {
@@ -27099,7 +27099,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsBalancerEnabledRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsBalancerEnabledRequest)
     }
 
     static {
@@ -27107,7 +27107,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsBalancerEnabledRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsBalancerEnabledRequest)
   }
 
   public interface IsBalancerEnabledResponseOrBuilder
@@ -27124,7 +27124,7 @@ public final class MasterProtos {
     boolean getEnabled();
   }
   /**
-   * Protobuf type {@code IsBalancerEnabledResponse}
+   * Protobuf type {@code hbase.pb.IsBalancerEnabledResponse}
    */
   public static final class IsBalancerEnabledResponse extends
       com.google.protobuf.GeneratedMessage
@@ -27193,12 +27193,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse.Builder.class);
     }
@@ -27387,19 +27387,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsBalancerEnabledResponse}
+     * Protobuf type {@code hbase.pb.IsBalancerEnabledResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse.Builder.class);
       }
@@ -27435,7 +27435,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsBalancerEnabledResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsBalancerEnabledResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse getDefaultInstanceForType() {
@@ -27541,7 +27541,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsBalancerEnabledResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsBalancerEnabledResponse)
     }
 
     static {
@@ -27549,14 +27549,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsBalancerEnabledResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsBalancerEnabledResponse)
   }
 
   public interface RunCatalogScanRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code RunCatalogScanRequest}
+   * Protobuf type {@code hbase.pb.RunCatalogScanRequest}
    */
   public static final class RunCatalogScanRequest extends
       com.google.protobuf.GeneratedMessage
@@ -27619,12 +27619,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest.Builder.class);
     }
@@ -27775,19 +27775,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RunCatalogScanRequest}
+     * Protobuf type {@code hbase.pb.RunCatalogScanRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest.Builder.class);
       }
@@ -27821,7 +27821,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanRequest getDefaultInstanceForType() {
@@ -27879,7 +27879,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RunCatalogScanRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RunCatalogScanRequest)
     }
 
     static {
@@ -27887,7 +27887,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RunCatalogScanRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RunCatalogScanRequest)
   }
 
   public interface RunCatalogScanResponseOrBuilder
@@ -27904,7 +27904,7 @@ public final class MasterProtos {
     int getScanResult();
   }
   /**
-   * Protobuf type {@code RunCatalogScanResponse}
+   * Protobuf type {@code hbase.pb.RunCatalogScanResponse}
    */
   public static final class RunCatalogScanResponse extends
       com.google.protobuf.GeneratedMessage
@@ -27973,12 +27973,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanResponse.Builder.class);
     }
@@ -28163,19 +28163,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RunCatalogScanResponse}
+     * Protobuf type {@code hbase.pb.RunCatalogScanResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanResponse.Builder.class);
       }
@@ -28211,7 +28211,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RunCatalogScanResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RunCatalogScanResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RunCatalogScanResponse getDefaultInstanceForType() {
@@ -28313,7 +28313,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RunCatalogScanResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RunCatalogScanResponse)
     }
 
     static {
@@ -28321,7 +28321,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RunCatalogScanResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RunCatalogScanResponse)
   }
 
   public interface EnableCatalogJanitorRequestOrBuilder
@@ -28338,7 +28338,7 @@ public final class MasterProtos {
     boolean getEnable();
   }
   /**
-   * Protobuf type {@code EnableCatalogJanitorRequest}
+   * Protobuf type {@code hbase.pb.EnableCatalogJanitorRequest}
    */
   public static final class EnableCatalogJanitorRequest extends
       com.google.protobuf.GeneratedMessage
@@ -28407,12 +28407,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorRequest.Builder.class);
     }
@@ -28601,19 +28601,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code EnableCatalogJanitorRequest}
+     * Protobuf type {@code hbase.pb.EnableCatalogJanitorRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorRequest.Builder.class);
       }
@@ -28649,7 +28649,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorRequest getDefaultInstanceForType() {
@@ -28755,7 +28755,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:EnableCatalogJanitorRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.EnableCatalogJanitorRequest)
     }
 
     static {
@@ -28763,7 +28763,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:EnableCatalogJanitorRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.EnableCatalogJanitorRequest)
   }
 
   public interface EnableCatalogJanitorResponseOrBuilder
@@ -28780,7 +28780,7 @@ public final class MasterProtos {
     boolean getPrevValue();
   }
   /**
-   * Protobuf type {@code EnableCatalogJanitorResponse}
+   * Protobuf type {@code hbase.pb.EnableCatalogJanitorResponse}
    */
   public static final class EnableCatalogJanitorResponse extends
       com.google.protobuf.GeneratedMessage
@@ -28849,12 +28849,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse.Builder.class);
     }
@@ -29039,19 +29039,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code EnableCatalogJanitorResponse}
+     * Protobuf type {@code hbase.pb.EnableCatalogJanitorResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse.Builder.class);
       }
@@ -29087,7 +29087,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_EnableCatalogJanitorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_EnableCatalogJanitorResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse getDefaultInstanceForType() {
@@ -29189,7 +29189,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:EnableCatalogJanitorResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.EnableCatalogJanitorResponse)
     }
 
     static {
@@ -29197,14 +29197,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:EnableCatalogJanitorResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.EnableCatalogJanitorResponse)
   }
 
   public interface IsCatalogJanitorEnabledRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code IsCatalogJanitorEnabledRequest}
+   * Protobuf type {@code hbase.pb.IsCatalogJanitorEnabledRequest}
    */
   public static final class IsCatalogJanitorEnabledRequest extends
       com.google.protobuf.GeneratedMessage
@@ -29267,12 +29267,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest.Builder.class);
     }
@@ -29423,19 +29423,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsCatalogJanitorEnabledRequest}
+     * Protobuf type {@code hbase.pb.IsCatalogJanitorEnabledRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest.Builder.class);
       }
@@ -29469,7 +29469,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest getDefaultInstanceForType() {
@@ -29527,7 +29527,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsCatalogJanitorEnabledRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsCatalogJanitorEnabledRequest)
     }
 
     static {
@@ -29535,7 +29535,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsCatalogJanitorEnabledRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsCatalogJanitorEnabledRequest)
   }
 
   public interface IsCatalogJanitorEnabledResponseOrBuilder
@@ -29552,7 +29552,7 @@ public final class MasterProtos {
     boolean getValue();
   }
   /**
-   * Protobuf type {@code IsCatalogJanitorEnabledResponse}
+   * Protobuf type {@code hbase.pb.IsCatalogJanitorEnabledResponse}
    */
   public static final class IsCatalogJanitorEnabledResponse extends
       com.google.protobuf.GeneratedMessage
@@ -29621,12 +29621,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse.Builder.class);
     }
@@ -29815,19 +29815,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsCatalogJanitorEnabledResponse}
+     * Protobuf type {@code hbase.pb.IsCatalogJanitorEnabledResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse.Builder.class);
       }
@@ -29863,7 +29863,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsCatalogJanitorEnabledResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse getDefaultInstanceForType() {
@@ -29969,7 +29969,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsCatalogJanitorEnabledResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsCatalogJanitorEnabledResponse)
     }
 
     static {
@@ -29977,28 +29977,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsCatalogJanitorEnabledResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsCatalogJanitorEnabledResponse)
   }
 
   public interface SnapshotRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .SnapshotDescription snapshot = 1;
+    // required .hbase.pb.SnapshotDescription snapshot = 1;
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     boolean hasSnapshot();
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot();
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code SnapshotRequest}
+   * Protobuf type {@code hbase.pb.SnapshotRequest}
    */
   public static final class SnapshotRequest extends
       com.google.protobuf.GeneratedMessage
@@ -30075,12 +30075,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequest.Builder.class);
     }
@@ -30101,23 +30101,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .SnapshotDescription snapshot = 1;
+    // required .hbase.pb.SnapshotDescription snapshot = 1;
     public static final int SNAPSHOT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_;
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -30279,19 +30279,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SnapshotRequest}
+     * Protobuf type {@code hbase.pb.SnapshotRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequest.Builder.class);
       }
@@ -30332,7 +30332,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotRequest getDefaultInstanceForType() {
@@ -30413,18 +30413,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .SnapshotDescription snapshot = 1;
+      // required .hbase.pb.SnapshotDescription snapshot = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -30434,7 +30434,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -30450,7 +30450,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -30464,7 +30464,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -30483,7 +30483,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -30496,7 +30496,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000001;
@@ -30504,7 +30504,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -30514,7 +30514,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> 
@@ -30530,7 +30530,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:SnapshotRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SnapshotRequest)
     }
 
     static {
@@ -30538,7 +30538,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SnapshotRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SnapshotRequest)
   }
 
   public interface SnapshotResponseOrBuilder
@@ -30555,7 +30555,7 @@ public final class MasterProtos {
     long getExpectedTimeout();
   }
   /**
-   * Protobuf type {@code SnapshotResponse}
+   * Protobuf type {@code hbase.pb.SnapshotResponse}
    */
   public static final class SnapshotResponse extends
       com.google.protobuf.GeneratedMessage
@@ -30624,12 +30624,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse.Builder.class);
     }
@@ -30818,19 +30818,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SnapshotResponse}
+     * Protobuf type {@code hbase.pb.SnapshotResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse.Builder.class);
       }
@@ -30866,7 +30866,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SnapshotResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SnapshotResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SnapshotResponse getDefaultInstanceForType() {
@@ -30972,7 +30972,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SnapshotResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SnapshotResponse)
     }
 
     static {
@@ -30980,14 +30980,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SnapshotResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SnapshotResponse)
   }
 
   public interface GetCompletedSnapshotsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code GetCompletedSnapshotsRequest}
+   * Protobuf type {@code hbase.pb.GetCompletedSnapshotsRequest}
    */
   public static final class GetCompletedSnapshotsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -31050,12 +31050,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest.Builder.class);
     }
@@ -31206,19 +31206,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetCompletedSnapshotsRequest}
+     * Protobuf type {@code hbase.pb.GetCompletedSnapshotsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest.Builder.class);
       }
@@ -31252,7 +31252,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest getDefaultInstanceForType() {
@@ -31310,7 +31310,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetCompletedSnapshotsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetCompletedSnapshotsRequest)
     }
 
     static {
@@ -31318,39 +31318,39 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetCompletedSnapshotsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetCompletedSnapshotsRequest)
   }
 
   public interface GetCompletedSnapshotsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .SnapshotDescription snapshots = 1;
+    // repeated .hbase.pb.SnapshotDescription snapshots = 1;
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     java.util.List 
         getSnapshotsList();
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshots(int index);
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     int getSnapshotsCount();
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     java.util.List 
         getSnapshotsOrBuilderList();
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotsOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code GetCompletedSnapshotsResponse}
+   * Protobuf type {@code hbase.pb.GetCompletedSnapshotsResponse}
    */
   public static final class GetCompletedSnapshotsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -31425,12 +31425,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse.Builder.class);
     }
@@ -31450,36 +31450,36 @@ public final class MasterProtos {
       return PARSER;
     }
 
-    // repeated .SnapshotDescription snapshots = 1;
+    // repeated .hbase.pb.SnapshotDescription snapshots = 1;
     public static final int SNAPSHOTS_FIELD_NUMBER = 1;
     private java.util.List snapshots_;
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     public java.util.List getSnapshotsList() {
       return snapshots_;
     }
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     public java.util.List 
         getSnapshotsOrBuilderList() {
       return snapshots_;
     }
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     public int getSnapshotsCount() {
       return snapshots_.size();
     }
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshots(int index) {
       return snapshots_.get(index);
     }
     /**
-     * repeated .SnapshotDescription snapshots = 1;
+     * repeated .hbase.pb.SnapshotDescription snapshots = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotsOrBuilder(
         int index) {
@@ -31637,19 +31637,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetCompletedSnapshotsResponse}
+     * Protobuf type {@code hbase.pb.GetCompletedSnapshotsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse.Builder.class);
       }
@@ -31690,7 +31690,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetCompletedSnapshotsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetCompletedSnapshotsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse getDefaultInstanceForType() {
@@ -31791,7 +31791,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .SnapshotDescription snapshots = 1;
+      // repeated .hbase.pb.SnapshotDescription snapshots = 1;
       private java.util.List snapshots_ =
         java.util.Collections.emptyList();
       private void ensureSnapshotsIsMutable() {
@@ -31805,7 +31805,7 @@ public final class MasterProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotsBuilder_;
 
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public java.util.List getSnapshotsList() {
         if (snapshotsBuilder_ == null) {
@@ -31815,7 +31815,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public int getSnapshotsCount() {
         if (snapshotsBuilder_ == null) {
@@ -31825,7 +31825,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshots(int index) {
         if (snapshotsBuilder_ == null) {
@@ -31835,7 +31835,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder setSnapshots(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
@@ -31852,7 +31852,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder setSnapshots(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -31866,7 +31866,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder addSnapshots(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotsBuilder_ == null) {
@@ -31882,7 +31882,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder addSnapshots(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
@@ -31899,7 +31899,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder addSnapshots(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -31913,7 +31913,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder addSnapshots(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -31927,7 +31927,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder addAllSnapshots(
           java.lang.Iterable values) {
@@ -31941,7 +31941,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder clearSnapshots() {
         if (snapshotsBuilder_ == null) {
@@ -31954,7 +31954,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public Builder removeSnapshots(int index) {
         if (snapshotsBuilder_ == null) {
@@ -31967,14 +31967,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotsBuilder(
           int index) {
         return getSnapshotsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotsOrBuilder(
           int index) {
@@ -31984,7 +31984,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public java.util.List 
            getSnapshotsOrBuilderList() {
@@ -31995,14 +31995,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder addSnapshotsBuilder() {
         return getSnapshotsFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance());
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder addSnapshotsBuilder(
           int index) {
@@ -32010,7 +32010,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance());
       }
       /**
-       * repeated .SnapshotDescription snapshots = 1;
+       * repeated .hbase.pb.SnapshotDescription snapshots = 1;
        */
       public java.util.List 
            getSnapshotsBuilderList() {
@@ -32031,7 +32031,7 @@ public final class MasterProtos {
         return snapshotsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetCompletedSnapshotsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetCompletedSnapshotsResponse)
     }
 
     static {
@@ -32039,28 +32039,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetCompletedSnapshotsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetCompletedSnapshotsResponse)
   }
 
   public interface DeleteSnapshotRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .SnapshotDescription snapshot = 1;
+    // required .hbase.pb.SnapshotDescription snapshot = 1;
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     boolean hasSnapshot();
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot();
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code DeleteSnapshotRequest}
+   * Protobuf type {@code hbase.pb.DeleteSnapshotRequest}
    */
   public static final class DeleteSnapshotRequest extends
       com.google.protobuf.GeneratedMessage
@@ -32137,12 +32137,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotRequest.Builder.class);
     }
@@ -32163,23 +32163,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .SnapshotDescription snapshot = 1;
+    // required .hbase.pb.SnapshotDescription snapshot = 1;
     public static final int SNAPSHOT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_;
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -32341,19 +32341,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteSnapshotRequest}
+     * Protobuf type {@code hbase.pb.DeleteSnapshotRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotRequest.Builder.class);
       }
@@ -32394,7 +32394,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotRequest getDefaultInstanceForType() {
@@ -32475,18 +32475,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .SnapshotDescription snapshot = 1;
+      // required .hbase.pb.SnapshotDescription snapshot = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -32496,7 +32496,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -32512,7 +32512,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -32526,7 +32526,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -32545,7 +32545,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -32558,7 +32558,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000001;
@@ -32566,7 +32566,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -32576,7 +32576,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> 
@@ -32592,7 +32592,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteSnapshotRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteSnapshotRequest)
     }
 
     static {
@@ -32600,14 +32600,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteSnapshotRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteSnapshotRequest)
   }
 
   public interface DeleteSnapshotResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code DeleteSnapshotResponse}
+   * Protobuf type {@code hbase.pb.DeleteSnapshotResponse}
    */
   public static final class DeleteSnapshotResponse extends
       com.google.protobuf.GeneratedMessage
@@ -32670,12 +32670,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotResponse.Builder.class);
     }
@@ -32826,19 +32826,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeleteSnapshotResponse}
+     * Protobuf type {@code hbase.pb.DeleteSnapshotResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotResponse.Builder.class);
       }
@@ -32872,7 +32872,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_DeleteSnapshotResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_DeleteSnapshotResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.DeleteSnapshotResponse getDefaultInstanceForType() {
@@ -32930,7 +32930,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeleteSnapshotResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeleteSnapshotResponse)
     }
 
     static {
@@ -32938,28 +32938,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeleteSnapshotResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeleteSnapshotResponse)
   }
 
   public interface RestoreSnapshotRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .SnapshotDescription snapshot = 1;
+    // required .hbase.pb.SnapshotDescription snapshot = 1;
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     boolean hasSnapshot();
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot();
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code RestoreSnapshotRequest}
+   * Protobuf type {@code hbase.pb.RestoreSnapshotRequest}
    */
   public static final class RestoreSnapshotRequest extends
       com.google.protobuf.GeneratedMessage
@@ -33036,12 +33036,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotRequest.Builder.class);
     }
@@ -33062,23 +33062,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .SnapshotDescription snapshot = 1;
+    // required .hbase.pb.SnapshotDescription snapshot = 1;
     public static final int SNAPSHOT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_;
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * required .SnapshotDescription snapshot = 1;
+     * required .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -33240,19 +33240,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RestoreSnapshotRequest}
+     * Protobuf type {@code hbase.pb.RestoreSnapshotRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotRequest.Builder.class);
       }
@@ -33293,7 +33293,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotRequest getDefaultInstanceForType() {
@@ -33374,18 +33374,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .SnapshotDescription snapshot = 1;
+      // required .hbase.pb.SnapshotDescription snapshot = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -33395,7 +33395,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -33411,7 +33411,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -33425,7 +33425,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -33444,7 +33444,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -33457,7 +33457,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000001;
@@ -33465,7 +33465,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -33475,7 +33475,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .SnapshotDescription snapshot = 1;
+       * required .hbase.pb.SnapshotDescription snapshot = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> 
@@ -33491,7 +33491,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RestoreSnapshotRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RestoreSnapshotRequest)
     }
 
     static {
@@ -33499,14 +33499,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RestoreSnapshotRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RestoreSnapshotRequest)
   }
 
   public interface RestoreSnapshotResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code RestoreSnapshotResponse}
+   * Protobuf type {@code hbase.pb.RestoreSnapshotResponse}
    */
   public static final class RestoreSnapshotResponse extends
       com.google.protobuf.GeneratedMessage
@@ -33569,12 +33569,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotResponse.Builder.class);
     }
@@ -33725,19 +33725,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RestoreSnapshotResponse}
+     * Protobuf type {@code hbase.pb.RestoreSnapshotResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotResponse.Builder.class);
       }
@@ -33771,7 +33771,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_RestoreSnapshotResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_RestoreSnapshotResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.RestoreSnapshotResponse getDefaultInstanceForType() {
@@ -33829,7 +33829,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RestoreSnapshotResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RestoreSnapshotResponse)
     }
 
     static {
@@ -33837,28 +33837,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RestoreSnapshotResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RestoreSnapshotResponse)
   }
 
   public interface IsSnapshotDoneRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .SnapshotDescription snapshot = 1;
+    // optional .hbase.pb.SnapshotDescription snapshot = 1;
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     boolean hasSnapshot();
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot();
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code IsSnapshotDoneRequest}
+   * Protobuf type {@code hbase.pb.IsSnapshotDoneRequest}
    *
    * 
    * if you don't send the snapshot, then you will get it back
@@ -33940,12 +33940,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest.Builder.class);
     }
@@ -33966,23 +33966,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // optional .SnapshotDescription snapshot = 1;
+    // optional .hbase.pb.SnapshotDescription snapshot = 1;
     public static final int SNAPSHOT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_;
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -34142,7 +34142,7 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsSnapshotDoneRequest}
+     * Protobuf type {@code hbase.pb.IsSnapshotDoneRequest}
      *
      * 
      * if you don't send the snapshot, then you will get it back
@@ -34154,12 +34154,12 @@ public final class MasterProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest.Builder.class);
       }
@@ -34200,7 +34200,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest getDefaultInstanceForType() {
@@ -34279,18 +34279,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // optional .SnapshotDescription snapshot = 1;
+      // optional .hbase.pb.SnapshotDescription snapshot = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -34300,7 +34300,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -34316,7 +34316,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -34330,7 +34330,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -34349,7 +34349,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -34362,7 +34362,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000001;
@@ -34370,7 +34370,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -34380,7 +34380,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> 
@@ -34396,7 +34396,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsSnapshotDoneRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsSnapshotDoneRequest)
     }
 
     static {
@@ -34404,7 +34404,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsSnapshotDoneRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsSnapshotDoneRequest)
   }
 
   public interface IsSnapshotDoneResponseOrBuilder
@@ -34420,22 +34420,22 @@ public final class MasterProtos {
      */
     boolean getDone();
 
-    // optional .SnapshotDescription snapshot = 2;
+    // optional .hbase.pb.SnapshotDescription snapshot = 2;
     /**
-     * optional .SnapshotDescription snapshot = 2;
+     * optional .hbase.pb.SnapshotDescription snapshot = 2;
      */
     boolean hasSnapshot();
     /**
-     * optional .SnapshotDescription snapshot = 2;
+     * optional .hbase.pb.SnapshotDescription snapshot = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot();
     /**
-     * optional .SnapshotDescription snapshot = 2;
+     * optional .hbase.pb.SnapshotDescription snapshot = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code IsSnapshotDoneResponse}
+   * Protobuf type {@code hbase.pb.IsSnapshotDoneResponse}
    */
   public static final class IsSnapshotDoneResponse extends
       com.google.protobuf.GeneratedMessage
@@ -34517,12 +34517,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse.Builder.class);
     }
@@ -34559,23 +34559,23 @@ public final class MasterProtos {
       return done_;
     }
 
-    // optional .SnapshotDescription snapshot = 2;
+    // optional .hbase.pb.SnapshotDescription snapshot = 2;
     public static final int SNAPSHOT_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_;
     /**
-     * optional .SnapshotDescription snapshot = 2;
+     * optional .hbase.pb.SnapshotDescription snapshot = 2;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .SnapshotDescription snapshot = 2;
+     * optional .hbase.pb.SnapshotDescription snapshot = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * optional .SnapshotDescription snapshot = 2;
+     * optional .hbase.pb.SnapshotDescription snapshot = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -34752,19 +34752,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsSnapshotDoneResponse}
+     * Protobuf type {@code hbase.pb.IsSnapshotDoneResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse.Builder.class);
       }
@@ -34807,7 +34807,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsSnapshotDoneResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsSnapshotDoneResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneResponse getDefaultInstanceForType() {
@@ -34926,18 +34926,18 @@ public final class MasterProtos {
         return this;
       }
 
-      // optional .SnapshotDescription snapshot = 2;
+      // optional .hbase.pb.SnapshotDescription snapshot = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -34947,7 +34947,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -34963,7 +34963,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -34977,7 +34977,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -34996,7 +34996,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -35009,7 +35009,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000002;
@@ -35017,7 +35017,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -35027,7 +35027,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .SnapshotDescription snapshot = 2;
+       * optional .hbase.pb.SnapshotDescription snapshot = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> 
@@ -35043,7 +35043,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsSnapshotDoneResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsSnapshotDoneResponse)
     }
 
     static {
@@ -35051,28 +35051,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsSnapshotDoneResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsSnapshotDoneResponse)
   }
 
   public interface IsRestoreSnapshotDoneRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .SnapshotDescription snapshot = 1;
+    // optional .hbase.pb.SnapshotDescription snapshot = 1;
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     boolean hasSnapshot();
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot();
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code IsRestoreSnapshotDoneRequest}
+   * Protobuf type {@code hbase.pb.IsRestoreSnapshotDoneRequest}
    */
   public static final class IsRestoreSnapshotDoneRequest extends
       com.google.protobuf.GeneratedMessage
@@ -35149,12 +35149,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequest.Builder.class);
     }
@@ -35175,23 +35175,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // optional .SnapshotDescription snapshot = 1;
+    // optional .hbase.pb.SnapshotDescription snapshot = 1;
     public static final int SNAPSHOT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_;
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * optional .SnapshotDescription snapshot = 1;
+     * optional .hbase.pb.SnapshotDescription snapshot = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -35351,19 +35351,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsRestoreSnapshotDoneRequest}
+     * Protobuf type {@code hbase.pb.IsRestoreSnapshotDoneRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequest.Builder.class);
       }
@@ -35404,7 +35404,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequest getDefaultInstanceForType() {
@@ -35483,18 +35483,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // optional .SnapshotDescription snapshot = 1;
+      // optional .hbase.pb.SnapshotDescription snapshot = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -35504,7 +35504,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -35520,7 +35520,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder builderForValue) {
@@ -35534,7 +35534,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription value) {
         if (snapshotBuilder_ == null) {
@@ -35553,7 +35553,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -35566,7 +35566,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000001;
@@ -35574,7 +35574,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -35584,7 +35584,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .SnapshotDescription snapshot = 1;
+       * optional .hbase.pb.SnapshotDescription snapshot = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptionOrBuilder> 
@@ -35600,7 +35600,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsRestoreSnapshotDoneRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsRestoreSnapshotDoneRequest)
     }
 
     static {
@@ -35608,7 +35608,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsRestoreSnapshotDoneRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsRestoreSnapshotDoneRequest)
   }
 
   public interface IsRestoreSnapshotDoneResponseOrBuilder
@@ -35625,7 +35625,7 @@ public final class MasterProtos {
     boolean getDone();
   }
   /**
-   * Protobuf type {@code IsRestoreSnapshotDoneResponse}
+   * Protobuf type {@code hbase.pb.IsRestoreSnapshotDoneResponse}
    */
   public static final class IsRestoreSnapshotDoneResponse extends
       com.google.protobuf.GeneratedMessage
@@ -35694,12 +35694,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse.Builder.class);
     }
@@ -35884,19 +35884,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsRestoreSnapshotDoneResponse}
+     * Protobuf type {@code hbase.pb.IsRestoreSnapshotDoneResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse.Builder.class);
       }
@@ -35932,7 +35932,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsRestoreSnapshotDoneResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse getDefaultInstanceForType() {
@@ -36034,7 +36034,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsRestoreSnapshotDoneResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsRestoreSnapshotDoneResponse)
     }
 
     static {
@@ -36042,28 +36042,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsRestoreSnapshotDoneResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsRestoreSnapshotDoneResponse)
   }
 
   public interface GetSchemaAlterStatusRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
   }
   /**
-   * Protobuf type {@code GetSchemaAlterStatusRequest}
+   * Protobuf type {@code hbase.pb.GetSchemaAlterStatusRequest}
    */
   public static final class GetSchemaAlterStatusRequest extends
       com.google.protobuf.GeneratedMessage
@@ -36140,12 +36140,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest.Builder.class);
     }
@@ -36166,23 +36166,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -36344,19 +36344,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetSchemaAlterStatusRequest}
+     * Protobuf type {@code hbase.pb.GetSchemaAlterStatusRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest.Builder.class);
       }
@@ -36397,7 +36397,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest getDefaultInstanceForType() {
@@ -36478,18 +36478,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -36499,7 +36499,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -36515,7 +36515,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -36529,7 +36529,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -36548,7 +36548,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -36561,7 +36561,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -36569,7 +36569,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -36579,7 +36579,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -36595,7 +36595,7 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetSchemaAlterStatusRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetSchemaAlterStatusRequest)
     }
 
     static {
@@ -36603,7 +36603,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetSchemaAlterStatusRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetSchemaAlterStatusRequest)
   }
 
   public interface GetSchemaAlterStatusResponseOrBuilder
@@ -36630,7 +36630,7 @@ public final class MasterProtos {
     int getTotalRegions();
   }
   /**
-   * Protobuf type {@code GetSchemaAlterStatusResponse}
+   * Protobuf type {@code hbase.pb.GetSchemaAlterStatusResponse}
    */
   public static final class GetSchemaAlterStatusResponse extends
       com.google.protobuf.GeneratedMessage
@@ -36704,12 +36704,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse.Builder.class);
     }
@@ -36927,19 +36927,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetSchemaAlterStatusResponse}
+     * Protobuf type {@code hbase.pb.GetSchemaAlterStatusResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse.Builder.class);
       }
@@ -36977,7 +36977,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetSchemaAlterStatusResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetSchemaAlterStatusResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse getDefaultInstanceForType() {
@@ -37119,7 +37119,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetSchemaAlterStatusResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetSchemaAlterStatusResponse)
     }
 
     static {
@@ -37127,33 +37127,33 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetSchemaAlterStatusResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetSchemaAlterStatusResponse)
   }
 
   public interface GetTableDescriptorsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .TableName table_names = 1;
+    // repeated .hbase.pb.TableName table_names = 1;
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     java.util.List 
         getTableNamesList();
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableNames(int index);
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     int getTableNamesCount();
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     java.util.List 
         getTableNamesOrBuilderList();
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNamesOrBuilder(
         int index);
@@ -37199,7 +37199,7 @@ public final class MasterProtos {
         getNamespaceBytes();
   }
   /**
-   * Protobuf type {@code GetTableDescriptorsRequest}
+   * Protobuf type {@code hbase.pb.GetTableDescriptorsRequest}
    */
   public static final class GetTableDescriptorsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -37289,12 +37289,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest.Builder.class);
     }
@@ -37315,36 +37315,36 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // repeated .TableName table_names = 1;
+    // repeated .hbase.pb.TableName table_names = 1;
     public static final int TABLE_NAMES_FIELD_NUMBER = 1;
     private java.util.List tableNames_;
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public java.util.List getTableNamesList() {
       return tableNames_;
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public java.util.List 
         getTableNamesOrBuilderList() {
       return tableNames_;
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public int getTableNamesCount() {
       return tableNames_.size();
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableNames(int index) {
       return tableNames_.get(index);
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNamesOrBuilder(
         int index) {
@@ -37655,19 +37655,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetTableDescriptorsRequest}
+     * Protobuf type {@code hbase.pb.GetTableDescriptorsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest.Builder.class);
       }
@@ -37714,7 +37714,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest getDefaultInstanceForType() {
@@ -37842,7 +37842,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .TableName table_names = 1;
+      // repeated .hbase.pb.TableName table_names = 1;
       private java.util.List tableNames_ =
         java.util.Collections.emptyList();
       private void ensureTableNamesIsMutable() {
@@ -37856,7 +37856,7 @@ public final class MasterProtos {
           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> tableNamesBuilder_;
 
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public java.util.List getTableNamesList() {
         if (tableNamesBuilder_ == null) {
@@ -37866,7 +37866,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public int getTableNamesCount() {
         if (tableNamesBuilder_ == null) {
@@ -37876,7 +37876,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableNames(int index) {
         if (tableNamesBuilder_ == null) {
@@ -37886,7 +37886,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder setTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
@@ -37903,7 +37903,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder setTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -37917,7 +37917,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNamesBuilder_ == null) {
@@ -37933,7 +37933,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
@@ -37950,7 +37950,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -37964,7 +37964,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -37978,7 +37978,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addAllTableNames(
           java.lang.Iterable values) {
@@ -37992,7 +37992,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder clearTableNames() {
         if (tableNamesBuilder_ == null) {
@@ -38005,7 +38005,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder removeTableNames(int index) {
         if (tableNamesBuilder_ == null) {
@@ -38018,14 +38018,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNamesBuilder(
           int index) {
         return getTableNamesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNamesOrBuilder(
           int index) {
@@ -38035,7 +38035,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public java.util.List 
            getTableNamesOrBuilderList() {
@@ -38046,14 +38046,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableNamesBuilder() {
         return getTableNamesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance());
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableNamesBuilder(
           int index) {
@@ -38061,7 +38061,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance());
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public java.util.List 
            getTableNamesBuilderList() {
@@ -38263,7 +38263,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetTableDescriptorsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetTableDescriptorsRequest)
     }
 
     static {
@@ -38271,39 +38271,39 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetTableDescriptorsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetTableDescriptorsRequest)
   }
 
   public interface GetTableDescriptorsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .TableSchema table_schema = 1;
+    // repeated .hbase.pb.TableSchema table_schema = 1;
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     java.util.List 
         getTableSchemaList();
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema(int index);
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     int getTableSchemaCount();
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     java.util.List 
         getTableSchemaOrBuilderList();
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code GetTableDescriptorsResponse}
+   * Protobuf type {@code hbase.pb.GetTableDescriptorsResponse}
    */
   public static final class GetTableDescriptorsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -38378,12 +38378,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse.Builder.class);
     }
@@ -38403,36 +38403,36 @@ public final class MasterProtos {
       return PARSER;
     }
 
-    // repeated .TableSchema table_schema = 1;
+    // repeated .hbase.pb.TableSchema table_schema = 1;
     public static final int TABLE_SCHEMA_FIELD_NUMBER = 1;
     private java.util.List tableSchema_;
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     public java.util.List getTableSchemaList() {
       return tableSchema_;
     }
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     public java.util.List 
         getTableSchemaOrBuilderList() {
       return tableSchema_;
     }
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     public int getTableSchemaCount() {
       return tableSchema_.size();
     }
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema(int index) {
       return tableSchema_.get(index);
     }
     /**
-     * repeated .TableSchema table_schema = 1;
+     * repeated .hbase.pb.TableSchema table_schema = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder(
         int index) {
@@ -38590,19 +38590,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetTableDescriptorsResponse}
+     * Protobuf type {@code hbase.pb.GetTableDescriptorsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse.Builder.class);
       }
@@ -38643,7 +38643,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableDescriptorsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableDescriptorsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse getDefaultInstanceForType() {
@@ -38744,7 +38744,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .TableSchema table_schema = 1;
+      // repeated .hbase.pb.TableSchema table_schema = 1;
       private java.util.List tableSchema_ =
         java.util.Collections.emptyList();
       private void ensureTableSchemaIsMutable() {
@@ -38758,7 +38758,7 @@ public final class MasterProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder> tableSchemaBuilder_;
 
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public java.util.List getTableSchemaList() {
         if (tableSchemaBuilder_ == null) {
@@ -38768,7 +38768,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public int getTableSchemaCount() {
         if (tableSchemaBuilder_ == null) {
@@ -38778,7 +38778,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema getTableSchema(int index) {
         if (tableSchemaBuilder_ == null) {
@@ -38788,7 +38788,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder setTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
@@ -38805,7 +38805,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder setTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -38819,7 +38819,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder addTableSchema(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
         if (tableSchemaBuilder_ == null) {
@@ -38835,7 +38835,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder addTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema value) {
@@ -38852,7 +38852,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder addTableSchema(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -38866,7 +38866,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder addTableSchema(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder builderForValue) {
@@ -38880,7 +38880,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder addAllTableSchema(
           java.lang.Iterable values) {
@@ -38894,7 +38894,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder clearTableSchema() {
         if (tableSchemaBuilder_ == null) {
@@ -38907,7 +38907,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public Builder removeTableSchema(int index) {
         if (tableSchemaBuilder_ == null) {
@@ -38920,14 +38920,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder getTableSchemaBuilder(
           int index) {
         return getTableSchemaFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchemaOrBuilder getTableSchemaOrBuilder(
           int index) {
@@ -38937,7 +38937,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public java.util.List 
            getTableSchemaOrBuilderList() {
@@ -38948,14 +38948,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder addTableSchemaBuilder() {
         return getTableSchemaFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance());
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.Builder addTableSchemaBuilder(
           int index) {
@@ -38963,7 +38963,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableSchema.getDefaultInstance());
       }
       /**
-       * repeated .TableSchema table_schema = 1;
+       * repeated .hbase.pb.TableSchema table_schema = 1;
        */
       public java.util.List 
            getTableSchemaBuilderList() {
@@ -38984,7 +38984,7 @@ public final class MasterProtos {
         return tableSchemaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetTableDescriptorsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetTableDescriptorsResponse)
     }
 
     static {
@@ -38992,7 +38992,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetTableDescriptorsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetTableDescriptorsResponse)
   }
 
   public interface GetTableNamesRequestOrBuilder
@@ -39039,7 +39039,7 @@ public final class MasterProtos {
         getNamespaceBytes();
   }
   /**
-   * Protobuf type {@code GetTableNamesRequest}
+   * Protobuf type {@code hbase.pb.GetTableNamesRequest}
    */
   public static final class GetTableNamesRequest extends
       com.google.protobuf.GeneratedMessage
@@ -39118,12 +39118,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest.Builder.class);
     }
@@ -39428,19 +39428,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetTableNamesRequest}
+     * Protobuf type {@code hbase.pb.GetTableNamesRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest.Builder.class);
       }
@@ -39480,7 +39480,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest getDefaultInstanceForType() {
@@ -39748,7 +39748,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetTableNamesRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetTableNamesRequest)
     }
 
     static {
@@ -39756,39 +39756,39 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetTableNamesRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetTableNamesRequest)
   }
 
   public interface GetTableNamesResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .TableName table_names = 1;
+    // repeated .hbase.pb.TableName table_names = 1;
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     java.util.List 
         getTableNamesList();
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableNames(int index);
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     int getTableNamesCount();
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     java.util.List 
         getTableNamesOrBuilderList();
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNamesOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code GetTableNamesResponse}
+   * Protobuf type {@code hbase.pb.GetTableNamesResponse}
    */
   public static final class GetTableNamesResponse extends
       com.google.protobuf.GeneratedMessage
@@ -39863,12 +39863,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse.Builder.class);
     }
@@ -39888,36 +39888,36 @@ public final class MasterProtos {
       return PARSER;
     }
 
-    // repeated .TableName table_names = 1;
+    // repeated .hbase.pb.TableName table_names = 1;
     public static final int TABLE_NAMES_FIELD_NUMBER = 1;
     private java.util.List tableNames_;
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public java.util.List getTableNamesList() {
       return tableNames_;
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public java.util.List 
         getTableNamesOrBuilderList() {
       return tableNames_;
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public int getTableNamesCount() {
       return tableNames_.size();
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableNames(int index) {
       return tableNames_.get(index);
     }
     /**
-     * repeated .TableName table_names = 1;
+     * repeated .hbase.pb.TableName table_names = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNamesOrBuilder(
         int index) {
@@ -40075,19 +40075,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetTableNamesResponse}
+     * Protobuf type {@code hbase.pb.GetTableNamesResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse.Builder.class);
       }
@@ -40128,7 +40128,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableNamesResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableNamesResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse getDefaultInstanceForType() {
@@ -40229,7 +40229,7 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // repeated .TableName table_names = 1;
+      // repeated .hbase.pb.TableName table_names = 1;
       private java.util.List tableNames_ =
         java.util.Collections.emptyList();
       private void ensureTableNamesIsMutable() {
@@ -40243,7 +40243,7 @@ public final class MasterProtos {
           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> tableNamesBuilder_;
 
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public java.util.List getTableNamesList() {
         if (tableNamesBuilder_ == null) {
@@ -40253,7 +40253,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public int getTableNamesCount() {
         if (tableNamesBuilder_ == null) {
@@ -40263,7 +40263,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableNames(int index) {
         if (tableNamesBuilder_ == null) {
@@ -40273,7 +40273,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder setTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
@@ -40290,7 +40290,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder setTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -40304,7 +40304,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNamesBuilder_ == null) {
@@ -40320,7 +40320,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
@@ -40337,7 +40337,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -40351,7 +40351,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addTableNames(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -40365,7 +40365,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder addAllTableNames(
           java.lang.Iterable values) {
@@ -40379,7 +40379,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder clearTableNames() {
         if (tableNamesBuilder_ == null) {
@@ -40392,7 +40392,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public Builder removeTableNames(int index) {
         if (tableNamesBuilder_ == null) {
@@ -40405,14 +40405,14 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNamesBuilder(
           int index) {
         return getTableNamesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNamesOrBuilder(
           int index) {
@@ -40422,7 +40422,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public java.util.List 
            getTableNamesOrBuilderList() {
@@ -40433,14 +40433,14 @@ public final class MasterProtos {
         }
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableNamesBuilder() {
         return getTableNamesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance());
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableNamesBuilder(
           int index) {
@@ -40448,7 +40448,7 @@ public final class MasterProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance());
       }
       /**
-       * repeated .TableName table_names = 1;
+       * repeated .hbase.pb.TableName table_names = 1;
        */
       public java.util.List 
            getTableNamesBuilderList() {
@@ -40469,7 +40469,7 @@ public final class MasterProtos {
         return tableNamesBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetTableNamesResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetTableNamesResponse)
     }
 
     static {
@@ -40477,28 +40477,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetTableNamesResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetTableNamesResponse)
   }
 
   public interface GetTableStateRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
   }
   /**
-   * Protobuf type {@code GetTableStateRequest}
+   * Protobuf type {@code hbase.pb.GetTableStateRequest}
    */
   public static final class GetTableStateRequest extends
       com.google.protobuf.GeneratedMessage
@@ -40575,12 +40575,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequest.Builder.class);
     }
@@ -40601,23 +40601,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -40779,19 +40779,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetTableStateRequest}
+     * Protobuf type {@code hbase.pb.GetTableStateRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequest.Builder.class);
       }
@@ -40832,7 +40832,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateRequest getDefaultInstanceForType() {
@@ -40913,18 +40913,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -40934,7 +40934,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -40950,7 +40950,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -40964,7 +40964,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -40983,7 +40983,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -40996,7 +40996,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -41004,7 +41004,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -41014,7 +41014,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -41030,7 +41030,7 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetTableStateRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetTableStateRequest)
     }
 
     static {
@@ -41038,28 +41038,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetTableStateRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetTableStateRequest)
   }
 
   public interface GetTableStateResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableState table_state = 1;
+    // required .hbase.pb.TableState table_state = 1;
     /**
-     * required .TableState table_state = 1;
+     * required .hbase.pb.TableState table_state = 1;
      */
     boolean hasTableState();
     /**
-     * required .TableState table_state = 1;
+     * required .hbase.pb.TableState table_state = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState getTableState();
     /**
-     * required .TableState table_state = 1;
+     * required .hbase.pb.TableState table_state = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableStateOrBuilder getTableStateOrBuilder();
   }
   /**
-   * Protobuf type {@code GetTableStateResponse}
+   * Protobuf type {@code hbase.pb.GetTableStateResponse}
    */
   public static final class GetTableStateResponse extends
       com.google.protobuf.GeneratedMessage
@@ -41136,12 +41136,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateResponse.Builder.class);
     }
@@ -41162,23 +41162,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableState table_state = 1;
+    // required .hbase.pb.TableState table_state = 1;
     public static final int TABLE_STATE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState tableState_;
     /**
-     * required .TableState table_state = 1;
+     * required .hbase.pb.TableState table_state = 1;
      */
     public boolean hasTableState() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableState table_state = 1;
+     * required .hbase.pb.TableState table_state = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState getTableState() {
       return tableState_;
     }
     /**
-     * required .TableState table_state = 1;
+     * required .hbase.pb.TableState table_state = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableStateOrBuilder getTableStateOrBuilder() {
       return tableState_;
@@ -41340,19 +41340,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetTableStateResponse}
+     * Protobuf type {@code hbase.pb.GetTableStateResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateResponse.Builder.class);
       }
@@ -41393,7 +41393,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetTableStateResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetTableStateResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableStateResponse getDefaultInstanceForType() {
@@ -41474,18 +41474,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableState table_state = 1;
+      // required .hbase.pb.TableState table_state = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState tableState_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableStateOrBuilder> tableStateBuilder_;
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public boolean hasTableState() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState getTableState() {
         if (tableStateBuilder_ == null) {
@@ -41495,7 +41495,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public Builder setTableState(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState value) {
         if (tableStateBuilder_ == null) {
@@ -41511,7 +41511,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public Builder setTableState(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.Builder builderForValue) {
@@ -41525,7 +41525,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public Builder mergeTableState(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState value) {
         if (tableStateBuilder_ == null) {
@@ -41544,7 +41544,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public Builder clearTableState() {
         if (tableStateBuilder_ == null) {
@@ -41557,7 +41557,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.Builder getTableStateBuilder() {
         bitField0_ |= 0x00000001;
@@ -41565,7 +41565,7 @@ public final class MasterProtos {
         return getTableStateFieldBuilder().getBuilder();
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableStateOrBuilder getTableStateOrBuilder() {
         if (tableStateBuilder_ != null) {
@@ -41575,7 +41575,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableState table_state = 1;
+       * required .hbase.pb.TableState table_state = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableState.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableStateOrBuilder> 
@@ -41591,7 +41591,7 @@ public final class MasterProtos {
         return tableStateBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetTableStateResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetTableStateResponse)
     }
 
     static {
@@ -41599,14 +41599,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetTableStateResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetTableStateResponse)
   }
 
   public interface GetClusterStatusRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code GetClusterStatusRequest}
+   * Protobuf type {@code hbase.pb.GetClusterStatusRequest}
    */
   public static final class GetClusterStatusRequest extends
       com.google.protobuf.GeneratedMessage
@@ -41669,12 +41669,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest.Builder.class);
     }
@@ -41825,19 +41825,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetClusterStatusRequest}
+     * Protobuf type {@code hbase.pb.GetClusterStatusRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest.Builder.class);
       }
@@ -41871,7 +41871,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest getDefaultInstanceForType() {
@@ -41929,7 +41929,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetClusterStatusRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetClusterStatusRequest)
     }
 
     static {
@@ -41937,28 +41937,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetClusterStatusRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetClusterStatusRequest)
   }
 
   public interface GetClusterStatusResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ClusterStatus cluster_status = 1;
+    // required .hbase.pb.ClusterStatus cluster_status = 1;
     /**
-     * required .ClusterStatus cluster_status = 1;
+     * required .hbase.pb.ClusterStatus cluster_status = 1;
      */
     boolean hasClusterStatus();
     /**
-     * required .ClusterStatus cluster_status = 1;
+     * required .hbase.pb.ClusterStatus cluster_status = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus getClusterStatus();
     /**
-     * required .ClusterStatus cluster_status = 1;
+     * required .hbase.pb.ClusterStatus cluster_status = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatusOrBuilder getClusterStatusOrBuilder();
   }
   /**
-   * Protobuf type {@code GetClusterStatusResponse}
+   * Protobuf type {@code hbase.pb.GetClusterStatusResponse}
    */
   public static final class GetClusterStatusResponse extends
       com.google.protobuf.GeneratedMessage
@@ -42035,12 +42035,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponse.Builder.class);
     }
@@ -42061,23 +42061,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .ClusterStatus cluster_status = 1;
+    // required .hbase.pb.ClusterStatus cluster_status = 1;
     public static final int CLUSTER_STATUS_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus clusterStatus_;
     /**
-     * required .ClusterStatus cluster_status = 1;
+     * required .hbase.pb.ClusterStatus cluster_status = 1;
      */
     public boolean hasClusterStatus() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ClusterStatus cluster_status = 1;
+     * required .hbase.pb.ClusterStatus cluster_status = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus getClusterStatus() {
       return clusterStatus_;
     }
     /**
-     * required .ClusterStatus cluster_status = 1;
+     * required .hbase.pb.ClusterStatus cluster_status = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatusOrBuilder getClusterStatusOrBuilder() {
       return clusterStatus_;
@@ -42239,19 +42239,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetClusterStatusResponse}
+     * Protobuf type {@code hbase.pb.GetClusterStatusResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponse.Builder.class);
       }
@@ -42292,7 +42292,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetClusterStatusResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetClusterStatusResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponse getDefaultInstanceForType() {
@@ -42373,18 +42373,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .ClusterStatus cluster_status = 1;
+      // required .hbase.pb.ClusterStatus cluster_status = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus clusterStatus_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatusOrBuilder> clusterStatusBuilder_;
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public boolean hasClusterStatus() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus getClusterStatus() {
         if (clusterStatusBuilder_ == null) {
@@ -42394,7 +42394,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public Builder setClusterStatus(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus value) {
         if (clusterStatusBuilder_ == null) {
@@ -42410,7 +42410,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public Builder setClusterStatus(
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.Builder builderForValue) {
@@ -42424,7 +42424,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public Builder mergeClusterStatus(org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus value) {
         if (clusterStatusBuilder_ == null) {
@@ -42443,7 +42443,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public Builder clearClusterStatus() {
         if (clusterStatusBuilder_ == null) {
@@ -42456,7 +42456,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.Builder getClusterStatusBuilder() {
         bitField0_ |= 0x00000001;
@@ -42464,7 +42464,7 @@ public final class MasterProtos {
         return getClusterStatusFieldBuilder().getBuilder();
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatusOrBuilder getClusterStatusOrBuilder() {
         if (clusterStatusBuilder_ != null) {
@@ -42474,7 +42474,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ClusterStatus cluster_status = 1;
+       * required .hbase.pb.ClusterStatus cluster_status = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatus.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ClusterStatusOrBuilder> 
@@ -42490,7 +42490,7 @@ public final class MasterProtos {
         return clusterStatusBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetClusterStatusResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetClusterStatusResponse)
     }
 
     static {
@@ -42498,14 +42498,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetClusterStatusResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetClusterStatusResponse)
   }
 
   public interface IsMasterRunningRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code IsMasterRunningRequest}
+   * Protobuf type {@code hbase.pb.IsMasterRunningRequest}
    */
   public static final class IsMasterRunningRequest extends
       com.google.protobuf.GeneratedMessage
@@ -42568,12 +42568,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest.Builder.class);
     }
@@ -42724,19 +42724,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsMasterRunningRequest}
+     * Protobuf type {@code hbase.pb.IsMasterRunningRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest.Builder.class);
       }
@@ -42770,7 +42770,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest getDefaultInstanceForType() {
@@ -42828,7 +42828,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsMasterRunningRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsMasterRunningRequest)
     }
 
     static {
@@ -42836,7 +42836,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsMasterRunningRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsMasterRunningRequest)
   }
 
   public interface IsMasterRunningResponseOrBuilder
@@ -42853,7 +42853,7 @@ public final class MasterProtos {
     boolean getIsMasterRunning();
   }
   /**
-   * Protobuf type {@code IsMasterRunningResponse}
+   * Protobuf type {@code hbase.pb.IsMasterRunningResponse}
    */
   public static final class IsMasterRunningResponse extends
       com.google.protobuf.GeneratedMessage
@@ -42922,12 +42922,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponse.Builder.class);
     }
@@ -43116,19 +43116,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsMasterRunningResponse}
+     * Protobuf type {@code hbase.pb.IsMasterRunningResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponse.Builder.class);
       }
@@ -43164,7 +43164,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsMasterRunningResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsMasterRunningResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponse getDefaultInstanceForType() {
@@ -43270,7 +43270,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsMasterRunningResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsMasterRunningResponse)
     }
 
     static {
@@ -43278,28 +43278,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsMasterRunningResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsMasterRunningResponse)
   }
 
   public interface ExecProcedureRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ProcedureDescription procedure = 1;
+    // required .hbase.pb.ProcedureDescription procedure = 1;
     /**
-     * required .ProcedureDescription procedure = 1;
+     * required .hbase.pb.ProcedureDescription procedure = 1;
      */
     boolean hasProcedure();
     /**
-     * required .ProcedureDescription procedure = 1;
+     * required .hbase.pb.ProcedureDescription procedure = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getProcedure();
     /**
-     * required .ProcedureDescription procedure = 1;
+     * required .hbase.pb.ProcedureDescription procedure = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getProcedureOrBuilder();
   }
   /**
-   * Protobuf type {@code ExecProcedureRequest}
+   * Protobuf type {@code hbase.pb.ExecProcedureRequest}
    */
   public static final class ExecProcedureRequest extends
       com.google.protobuf.GeneratedMessage
@@ -43376,12 +43376,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest.Builder.class);
     }
@@ -43402,23 +43402,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .ProcedureDescription procedure = 1;
+    // required .hbase.pb.ProcedureDescription procedure = 1;
     public static final int PROCEDURE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription procedure_;
     /**
-     * required .ProcedureDescription procedure = 1;
+     * required .hbase.pb.ProcedureDescription procedure = 1;
      */
     public boolean hasProcedure() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ProcedureDescription procedure = 1;
+     * required .hbase.pb.ProcedureDescription procedure = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getProcedure() {
       return procedure_;
     }
     /**
-     * required .ProcedureDescription procedure = 1;
+     * required .hbase.pb.ProcedureDescription procedure = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getProcedureOrBuilder() {
       return procedure_;
@@ -43580,19 +43580,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ExecProcedureRequest}
+     * Protobuf type {@code hbase.pb.ExecProcedureRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest.Builder.class);
       }
@@ -43633,7 +43633,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest getDefaultInstanceForType() {
@@ -43714,18 +43714,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .ProcedureDescription procedure = 1;
+      // required .hbase.pb.ProcedureDescription procedure = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription procedure_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder> procedureBuilder_;
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public boolean hasProcedure() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getProcedure() {
         if (procedureBuilder_ == null) {
@@ -43735,7 +43735,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder setProcedure(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription value) {
         if (procedureBuilder_ == null) {
@@ -43751,7 +43751,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder setProcedure(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder builderForValue) {
@@ -43765,7 +43765,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder mergeProcedure(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription value) {
         if (procedureBuilder_ == null) {
@@ -43784,7 +43784,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder clearProcedure() {
         if (procedureBuilder_ == null) {
@@ -43797,7 +43797,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder getProcedureBuilder() {
         bitField0_ |= 0x00000001;
@@ -43805,7 +43805,7 @@ public final class MasterProtos {
         return getProcedureFieldBuilder().getBuilder();
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getProcedureOrBuilder() {
         if (procedureBuilder_ != null) {
@@ -43815,7 +43815,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .ProcedureDescription procedure = 1;
+       * required .hbase.pb.ProcedureDescription procedure = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder> 
@@ -43831,7 +43831,7 @@ public final class MasterProtos {
         return procedureBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ExecProcedureRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ExecProcedureRequest)
     }
 
     static {
@@ -43839,7 +43839,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ExecProcedureRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ExecProcedureRequest)
   }
 
   public interface ExecProcedureResponseOrBuilder
@@ -43866,7 +43866,7 @@ public final class MasterProtos {
     com.google.protobuf.ByteString getReturnData();
   }
   /**
-   * Protobuf type {@code ExecProcedureResponse}
+   * Protobuf type {@code hbase.pb.ExecProcedureResponse}
    */
   public static final class ExecProcedureResponse extends
       com.google.protobuf.GeneratedMessage
@@ -43940,12 +43940,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse.Builder.class);
     }
@@ -44163,19 +44163,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ExecProcedureResponse}
+     * Protobuf type {@code hbase.pb.ExecProcedureResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse.Builder.class);
       }
@@ -44213,7 +44213,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_ExecProcedureResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_ExecProcedureResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse getDefaultInstanceForType() {
@@ -44358,7 +44358,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ExecProcedureResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ExecProcedureResponse)
     }
 
     static {
@@ -44366,28 +44366,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ExecProcedureResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ExecProcedureResponse)
   }
 
   public interface IsProcedureDoneRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .ProcedureDescription procedure = 1;
+    // optional .hbase.pb.ProcedureDescription procedure = 1;
     /**
-     * optional .ProcedureDescription procedure = 1;
+     * optional .hbase.pb.ProcedureDescription procedure = 1;
      */
     boolean hasProcedure();
     /**
-     * optional .ProcedureDescription procedure = 1;
+     * optional .hbase.pb.ProcedureDescription procedure = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getProcedure();
     /**
-     * optional .ProcedureDescription procedure = 1;
+     * optional .hbase.pb.ProcedureDescription procedure = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getProcedureOrBuilder();
   }
   /**
-   * Protobuf type {@code IsProcedureDoneRequest}
+   * Protobuf type {@code hbase.pb.IsProcedureDoneRequest}
    */
   public static final class IsProcedureDoneRequest extends
       com.google.protobuf.GeneratedMessage
@@ -44464,12 +44464,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest.Builder.class);
     }
@@ -44490,23 +44490,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // optional .ProcedureDescription procedure = 1;
+    // optional .hbase.pb.ProcedureDescription procedure = 1;
     public static final int PROCEDURE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription procedure_;
     /**
-     * optional .ProcedureDescription procedure = 1;
+     * optional .hbase.pb.ProcedureDescription procedure = 1;
      */
     public boolean hasProcedure() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .ProcedureDescription procedure = 1;
+     * optional .hbase.pb.ProcedureDescription procedure = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getProcedure() {
       return procedure_;
     }
     /**
-     * optional .ProcedureDescription procedure = 1;
+     * optional .hbase.pb.ProcedureDescription procedure = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getProcedureOrBuilder() {
       return procedure_;
@@ -44666,19 +44666,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsProcedureDoneRequest}
+     * Protobuf type {@code hbase.pb.IsProcedureDoneRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest.Builder.class);
       }
@@ -44719,7 +44719,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest getDefaultInstanceForType() {
@@ -44798,18 +44798,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // optional .ProcedureDescription procedure = 1;
+      // optional .hbase.pb.ProcedureDescription procedure = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription procedure_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder> procedureBuilder_;
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public boolean hasProcedure() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getProcedure() {
         if (procedureBuilder_ == null) {
@@ -44819,7 +44819,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder setProcedure(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription value) {
         if (procedureBuilder_ == null) {
@@ -44835,7 +44835,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder setProcedure(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder builderForValue) {
@@ -44849,7 +44849,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder mergeProcedure(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription value) {
         if (procedureBuilder_ == null) {
@@ -44868,7 +44868,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public Builder clearProcedure() {
         if (procedureBuilder_ == null) {
@@ -44881,7 +44881,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder getProcedureBuilder() {
         bitField0_ |= 0x00000001;
@@ -44889,7 +44889,7 @@ public final class MasterProtos {
         return getProcedureFieldBuilder().getBuilder();
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getProcedureOrBuilder() {
         if (procedureBuilder_ != null) {
@@ -44899,7 +44899,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ProcedureDescription procedure = 1;
+       * optional .hbase.pb.ProcedureDescription procedure = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder> 
@@ -44915,7 +44915,7 @@ public final class MasterProtos {
         return procedureBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsProcedureDoneRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsProcedureDoneRequest)
     }
 
     static {
@@ -44923,7 +44923,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsProcedureDoneRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsProcedureDoneRequest)
   }
 
   public interface IsProcedureDoneResponseOrBuilder
@@ -44939,22 +44939,22 @@ public final class MasterProtos {
      */
     boolean getDone();
 
-    // optional .ProcedureDescription snapshot = 2;
+    // optional .hbase.pb.ProcedureDescription snapshot = 2;
     /**
-     * optional .ProcedureDescription snapshot = 2;
+     * optional .hbase.pb.ProcedureDescription snapshot = 2;
      */
     boolean hasSnapshot();
     /**
-     * optional .ProcedureDescription snapshot = 2;
+     * optional .hbase.pb.ProcedureDescription snapshot = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getSnapshot();
     /**
-     * optional .ProcedureDescription snapshot = 2;
+     * optional .hbase.pb.ProcedureDescription snapshot = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getSnapshotOrBuilder();
   }
   /**
-   * Protobuf type {@code IsProcedureDoneResponse}
+   * Protobuf type {@code hbase.pb.IsProcedureDoneResponse}
    */
   public static final class IsProcedureDoneResponse extends
       com.google.protobuf.GeneratedMessage
@@ -45036,12 +45036,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse.Builder.class);
     }
@@ -45078,23 +45078,23 @@ public final class MasterProtos {
       return done_;
     }
 
-    // optional .ProcedureDescription snapshot = 2;
+    // optional .hbase.pb.ProcedureDescription snapshot = 2;
     public static final int SNAPSHOT_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription snapshot_;
     /**
-     * optional .ProcedureDescription snapshot = 2;
+     * optional .hbase.pb.ProcedureDescription snapshot = 2;
      */
     public boolean hasSnapshot() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .ProcedureDescription snapshot = 2;
+     * optional .hbase.pb.ProcedureDescription snapshot = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getSnapshot() {
       return snapshot_;
     }
     /**
-     * optional .ProcedureDescription snapshot = 2;
+     * optional .hbase.pb.ProcedureDescription snapshot = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getSnapshotOrBuilder() {
       return snapshot_;
@@ -45271,19 +45271,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code IsProcedureDoneResponse}
+     * Protobuf type {@code hbase.pb.IsProcedureDoneResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse.Builder.class);
       }
@@ -45326,7 +45326,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_IsProcedureDoneResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_IsProcedureDoneResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse getDefaultInstanceForType() {
@@ -45445,18 +45445,18 @@ public final class MasterProtos {
         return this;
       }
 
-      // optional .ProcedureDescription snapshot = 2;
+      // optional .hbase.pb.ProcedureDescription snapshot = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription snapshot_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder> snapshotBuilder_;
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public boolean hasSnapshot() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription getSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -45466,7 +45466,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public Builder setSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription value) {
         if (snapshotBuilder_ == null) {
@@ -45482,7 +45482,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public Builder setSnapshot(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder builderForValue) {
@@ -45496,7 +45496,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public Builder mergeSnapshot(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription value) {
         if (snapshotBuilder_ == null) {
@@ -45515,7 +45515,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public Builder clearSnapshot() {
         if (snapshotBuilder_ == null) {
@@ -45528,7 +45528,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder getSnapshotBuilder() {
         bitField0_ |= 0x00000002;
@@ -45536,7 +45536,7 @@ public final class MasterProtos {
         return getSnapshotFieldBuilder().getBuilder();
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder getSnapshotOrBuilder() {
         if (snapshotBuilder_ != null) {
@@ -45546,7 +45546,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ProcedureDescription snapshot = 2;
+       * optional .hbase.pb.ProcedureDescription snapshot = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescriptionOrBuilder> 
@@ -45562,7 +45562,7 @@ public final class MasterProtos {
         return snapshotBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:IsProcedureDoneResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.IsProcedureDoneResponse)
     }
 
     static {
@@ -45570,7 +45570,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:IsProcedureDoneResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.IsProcedureDoneResponse)
   }
 
   public interface GetProcedureResultRequestOrBuilder
@@ -45587,7 +45587,7 @@ public final class MasterProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code GetProcedureResultRequest}
+   * Protobuf type {@code hbase.pb.GetProcedureResultRequest}
    */
   public static final class GetProcedureResultRequest extends
       com.google.protobuf.GeneratedMessage
@@ -45656,12 +45656,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultRequest.Builder.class);
     }
@@ -45850,19 +45850,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetProcedureResultRequest}
+     * Protobuf type {@code hbase.pb.GetProcedureResultRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultRequest.Builder.class);
       }
@@ -45898,7 +45898,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultRequest getDefaultInstanceForType() {
@@ -46004,7 +46004,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetProcedureResultRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetProcedureResultRequest)
     }
 
     static {
@@ -46012,19 +46012,19 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetProcedureResultRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetProcedureResultRequest)
   }
 
   public interface GetProcedureResultResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .GetProcedureResultResponse.State state = 1;
+    // required .hbase.pb.GetProcedureResultResponse.State state = 1;
     /**
-     * required .GetProcedureResultResponse.State state = 1;
+     * required .hbase.pb.GetProcedureResultResponse.State state = 1;
      */
     boolean hasState();
     /**
-     * required .GetProcedureResultResponse.State state = 1;
+     * required .hbase.pb.GetProcedureResultResponse.State state = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State getState();
 
@@ -46058,22 +46058,22 @@ public final class MasterProtos {
      */
     com.google.protobuf.ByteString getResult();
 
-    // optional .ForeignExceptionMessage exception = 5;
+    // optional .hbase.pb.ForeignExceptionMessage exception = 5;
     /**
-     * optional .ForeignExceptionMessage exception = 5;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 5;
      */
     boolean hasException();
     /**
-     * optional .ForeignExceptionMessage exception = 5;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage getException();
     /**
-     * optional .ForeignExceptionMessage exception = 5;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder getExceptionOrBuilder();
   }
   /**
-   * Protobuf type {@code GetProcedureResultResponse}
+   * Protobuf type {@code hbase.pb.GetProcedureResultResponse}
    */
   public static final class GetProcedureResultResponse extends
       com.google.protobuf.GeneratedMessage
@@ -46176,12 +46176,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.Builder.class);
     }
@@ -46202,7 +46202,7 @@ public final class MasterProtos {
     }
 
     /**
-     * Protobuf enum {@code GetProcedureResultResponse.State}
+     * Protobuf enum {@code hbase.pb.GetProcedureResultResponse.State}
      */
     public enum State
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -46289,21 +46289,21 @@ public final class MasterProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:GetProcedureResultResponse.State)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.GetProcedureResultResponse.State)
     }
 
     private int bitField0_;
-    // required .GetProcedureResultResponse.State state = 1;
+    // required .hbase.pb.GetProcedureResultResponse.State state = 1;
     public static final int STATE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State state_;
     /**
-     * required .GetProcedureResultResponse.State state = 1;
+     * required .hbase.pb.GetProcedureResultResponse.State state = 1;
      */
     public boolean hasState() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .GetProcedureResultResponse.State state = 1;
+     * required .hbase.pb.GetProcedureResultResponse.State state = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State getState() {
       return state_;
@@ -46357,23 +46357,23 @@ public final class MasterProtos {
       return result_;
     }
 
-    // optional .ForeignExceptionMessage exception = 5;
+    // optional .hbase.pb.ForeignExceptionMessage exception = 5;
     public static final int EXCEPTION_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage exception_;
     /**
-     * optional .ForeignExceptionMessage exception = 5;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 5;
      */
     public boolean hasException() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .ForeignExceptionMessage exception = 5;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage getException() {
       return exception_;
     }
     /**
-     * optional .ForeignExceptionMessage exception = 5;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder getExceptionOrBuilder() {
       return exception_;
@@ -46599,19 +46599,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetProcedureResultResponse}
+     * Protobuf type {@code hbase.pb.GetProcedureResultResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.Builder.class);
       }
@@ -46660,7 +46660,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_GetProcedureResultResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_GetProcedureResultResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse getDefaultInstanceForType() {
@@ -46765,22 +46765,22 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .GetProcedureResultResponse.State state = 1;
+      // required .hbase.pb.GetProcedureResultResponse.State state = 1;
       private org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State state_ = org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State.NOT_FOUND;
       /**
-       * required .GetProcedureResultResponse.State state = 1;
+       * required .hbase.pb.GetProcedureResultResponse.State state = 1;
        */
       public boolean hasState() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .GetProcedureResultResponse.State state = 1;
+       * required .hbase.pb.GetProcedureResultResponse.State state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State getState() {
         return state_;
       }
       /**
-       * required .GetProcedureResultResponse.State state = 1;
+       * required .hbase.pb.GetProcedureResultResponse.State state = 1;
        */
       public Builder setState(org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetProcedureResultResponse.State value) {
         if (value == null) {
@@ -46792,7 +46792,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .GetProcedureResultResponse.State state = 1;
+       * required .hbase.pb.GetProcedureResultResponse.State state = 1;
        */
       public Builder clearState() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -46903,18 +46903,18 @@ public final class MasterProtos {
         return this;
       }
 
-      // optional .ForeignExceptionMessage exception = 5;
+      // optional .hbase.pb.ForeignExceptionMessage exception = 5;
       private org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage exception_ = org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder> exceptionBuilder_;
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public boolean hasException() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage getException() {
         if (exceptionBuilder_ == null) {
@@ -46924,7 +46924,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public Builder setException(org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage value) {
         if (exceptionBuilder_ == null) {
@@ -46940,7 +46940,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public Builder setException(
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder builderForValue) {
@@ -46954,7 +46954,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public Builder mergeException(org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage value) {
         if (exceptionBuilder_ == null) {
@@ -46973,7 +46973,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public Builder clearException() {
         if (exceptionBuilder_ == null) {
@@ -46986,7 +46986,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder getExceptionBuilder() {
         bitField0_ |= 0x00000010;
@@ -46994,7 +46994,7 @@ public final class MasterProtos {
         return getExceptionFieldBuilder().getBuilder();
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder getExceptionOrBuilder() {
         if (exceptionBuilder_ != null) {
@@ -47004,7 +47004,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ForeignExceptionMessage exception = 5;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder> 
@@ -47020,7 +47020,7 @@ public final class MasterProtos {
         return exceptionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetProcedureResultResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetProcedureResultResponse)
     }
 
     static {
@@ -47028,7 +47028,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetProcedureResultResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetProcedureResultResponse)
   }
 
   public interface SetQuotaRequestOrBuilder
@@ -47079,17 +47079,17 @@ public final class MasterProtos {
     com.google.protobuf.ByteString
         getNamespaceBytes();
 
-    // optional .TableName table_name = 4;
+    // optional .hbase.pb.TableName table_name = 4;
     /**
-     * optional .TableName table_name = 4;
+     * optional .hbase.pb.TableName table_name = 4;
      */
     boolean hasTableName();
     /**
-     * optional .TableName table_name = 4;
+     * optional .hbase.pb.TableName table_name = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * optional .TableName table_name = 4;
+     * optional .hbase.pb.TableName table_name = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -47113,22 +47113,22 @@ public final class MasterProtos {
      */
     boolean getBypassGlobals();
 
-    // optional .ThrottleRequest throttle = 7;
+    // optional .hbase.pb.ThrottleRequest throttle = 7;
     /**
-     * optional .ThrottleRequest throttle = 7;
+     * optional .hbase.pb.ThrottleRequest throttle = 7;
      */
     boolean hasThrottle();
     /**
-     * optional .ThrottleRequest throttle = 7;
+     * optional .hbase.pb.ThrottleRequest throttle = 7;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest getThrottle();
     /**
-     * optional .ThrottleRequest throttle = 7;
+     * optional .hbase.pb.ThrottleRequest throttle = 7;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequestOrBuilder getThrottleOrBuilder();
   }
   /**
-   * Protobuf type {@code SetQuotaRequest}
+   * Protobuf type {@code hbase.pb.SetQuotaRequest}
    */
   public static final class SetQuotaRequest extends
       com.google.protobuf.GeneratedMessage
@@ -47243,12 +47243,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest.Builder.class);
     }
@@ -47398,23 +47398,23 @@ public final class MasterProtos {
       }
     }
 
-    // optional .TableName table_name = 4;
+    // optional .hbase.pb.TableName table_name = 4;
     public static final int TABLE_NAME_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_;
     /**
-     * optional .TableName table_name = 4;
+     * optional .hbase.pb.TableName table_name = 4;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TableName table_name = 4;
+     * optional .hbase.pb.TableName table_name = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * optional .TableName table_name = 4;
+     * optional .hbase.pb.TableName table_name = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -47452,23 +47452,23 @@ public final class MasterProtos {
       return bypassGlobals_;
     }
 
-    // optional .ThrottleRequest throttle = 7;
+    // optional .hbase.pb.ThrottleRequest throttle = 7;
     public static final int THROTTLE_FIELD_NUMBER = 7;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest throttle_;
     /**
-     * optional .ThrottleRequest throttle = 7;
+     * optional .hbase.pb.ThrottleRequest throttle = 7;
      */
     public boolean hasThrottle() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * optional .ThrottleRequest throttle = 7;
+     * optional .hbase.pb.ThrottleRequest throttle = 7;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest getThrottle() {
       return throttle_;
     }
     /**
-     * optional .ThrottleRequest throttle = 7;
+     * optional .hbase.pb.ThrottleRequest throttle = 7;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequestOrBuilder getThrottleOrBuilder() {
       return throttle_;
@@ -47736,19 +47736,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SetQuotaRequest}
+     * Protobuf type {@code hbase.pb.SetQuotaRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest.Builder.class);
       }
@@ -47806,7 +47806,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest getDefaultInstanceForType() {
@@ -48165,18 +48165,18 @@ public final class MasterProtos {
         return this;
       }
 
-      // optional .TableName table_name = 4;
+      // optional .hbase.pb.TableName table_name = 4;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.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_;
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -48186,7 +48186,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -48202,7 +48202,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -48216,7 +48216,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -48235,7 +48235,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -48248,7 +48248,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000008;
@@ -48256,7 +48256,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -48266,7 +48266,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .TableName table_name = 4;
+       * optional .hbase.pb.TableName table_name = 4;
        */
       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> 
@@ -48348,18 +48348,18 @@ public final class MasterProtos {
         return this;
       }
 
-      // optional .ThrottleRequest throttle = 7;
+      // optional .hbase.pb.ThrottleRequest throttle = 7;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest throttle_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequestOrBuilder> throttleBuilder_;
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public boolean hasThrottle() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest getThrottle() {
         if (throttleBuilder_ == null) {
@@ -48369,7 +48369,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public Builder setThrottle(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest value) {
         if (throttleBuilder_ == null) {
@@ -48385,7 +48385,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public Builder setThrottle(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.Builder builderForValue) {
@@ -48399,7 +48399,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public Builder mergeThrottle(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest value) {
         if (throttleBuilder_ == null) {
@@ -48418,7 +48418,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public Builder clearThrottle() {
         if (throttleBuilder_ == null) {
@@ -48431,7 +48431,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.Builder getThrottleBuilder() {
         bitField0_ |= 0x00000040;
@@ -48439,7 +48439,7 @@ public final class MasterProtos {
         return getThrottleFieldBuilder().getBuilder();
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequestOrBuilder getThrottleOrBuilder() {
         if (throttleBuilder_ != null) {
@@ -48449,7 +48449,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * optional .ThrottleRequest throttle = 7;
+       * optional .hbase.pb.ThrottleRequest throttle = 7;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequestOrBuilder> 
@@ -48465,7 +48465,7 @@ public final class MasterProtos {
         return throttleBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:SetQuotaRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SetQuotaRequest)
     }
 
     static {
@@ -48473,14 +48473,14 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SetQuotaRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SetQuotaRequest)
   }
 
   public interface SetQuotaResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code SetQuotaResponse}
+   * Protobuf type {@code hbase.pb.SetQuotaResponse}
    */
   public static final class SetQuotaResponse extends
       com.google.protobuf.GeneratedMessage
@@ -48543,12 +48543,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaResponse.Builder.class);
     }
@@ -48699,19 +48699,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SetQuotaResponse}
+     * Protobuf type {@code hbase.pb.SetQuotaResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaResponse.Builder.class);
       }
@@ -48745,7 +48745,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_SetQuotaResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_SetQuotaResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaResponse getDefaultInstanceForType() {
@@ -48803,7 +48803,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SetQuotaResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SetQuotaResponse)
     }
 
     static {
@@ -48811,28 +48811,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SetQuotaResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SetQuotaResponse)
   }
 
   public interface MajorCompactionTimestampRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
   }
   /**
-   * Protobuf type {@code MajorCompactionTimestampRequest}
+   * Protobuf type {@code hbase.pb.MajorCompactionTimestampRequest}
    */
   public static final class MajorCompactionTimestampRequest extends
       com.google.protobuf.GeneratedMessage
@@ -48909,12 +48909,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampRequest.Builder.class);
     }
@@ -48935,23 +48935,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -49113,19 +49113,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MajorCompactionTimestampRequest}
+     * Protobuf type {@code hbase.pb.MajorCompactionTimestampRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampRequest.Builder.class);
       }
@@ -49166,7 +49166,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampRequest getDefaultInstanceForType() {
@@ -49247,18 +49247,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -49268,7 +49268,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -49284,7 +49284,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -49298,7 +49298,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -49317,7 +49317,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -49330,7 +49330,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -49338,7 +49338,7 @@ public final class MasterProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -49348,7 +49348,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -49364,7 +49364,7 @@ public final class MasterProtos {
         return tableNameBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:MajorCompactionTimestampRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MajorCompactionTimestampRequest)
     }
 
     static {
@@ -49372,28 +49372,28 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MajorCompactionTimestampRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MajorCompactionTimestampRequest)
   }
 
   public interface MajorCompactionTimestampForRegionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     boolean hasRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion();
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder();
   }
   /**
-   * Protobuf type {@code MajorCompactionTimestampForRegionRequest}
+   * Protobuf type {@code hbase.pb.MajorCompactionTimestampForRegionRequest}
    */
   public static final class MajorCompactionTimestampForRegionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -49470,12 +49470,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampForRegionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampForRegionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampForRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampForRegionRequest.Builder.class);
     }
@@ -49496,23 +49496,23 @@ public final class MasterProtos {
     }
 
     private int bitField0_;
-    // required .RegionSpecifier region = 1;
+    // required .hbase.pb.RegionSpecifier region = 1;
     public static final int REGION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_;
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public boolean hasRegion() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
       return region_;
     }
     /**
-     * required .RegionSpecifier region = 1;
+     * required .hbase.pb.RegionSpecifier region = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
       return region_;
@@ -49674,19 +49674,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MajorCompactionTimestampForRegionRequest}
+     * Protobuf type {@code hbase.pb.MajorCompactionTimestampForRegionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampForRegionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampForRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampForRegionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampForRegionRequest.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampForRegionRequest.Builder.class);
       }
@@ -49727,7 +49727,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampForRegionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampForRegionRequest getDefaultInstanceForType() {
@@ -49808,18 +49808,18 @@ public final class MasterProtos {
       }
       private int bitField0_;
 
-      // required .RegionSpecifier region = 1;
+      // required .hbase.pb.RegionSpecifier region = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier region_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_;
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public boolean hasRegion() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion() {
         if (regionBuilder_ == null) {
@@ -49829,7 +49829,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -49845,7 +49845,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder setRegion(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) {
@@ -49859,7 +49859,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder mergeRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) {
         if (regionBuilder_ == null) {
@@ -49878,7 +49878,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public Builder clearRegion() {
         if (regionBuilder_ == null) {
@@ -49891,7 +49891,7 @@ public final class MasterProtos {
         return this;
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder() {
         bitField0_ |= 0x00000001;
@@ -49899,7 +49899,7 @@ public final class MasterProtos {
         return getRegionFieldBuilder().getBuilder();
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder() {
         if (regionBuilder_ != null) {
@@ -49909,7 +49909,7 @@ public final class MasterProtos {
         }
       }
       /**
-       * required .RegionSpecifier region = 1;
+       * required .hbase.pb.RegionSpecifier region = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> 
@@ -49925,7 +49925,7 @@ public final class MasterProtos {
         return regionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:MajorCompactionTimestampForRegionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MajorCompactionTimestampForRegionRequest)
     }
 
     static {
@@ -49933,7 +49933,7 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MajorCompactionTimestampForRegionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MajorCompactionTimestampForRegionRequest)
   }
 
   public interface MajorCompactionTimestampResponseOrBuilder
@@ -49950,7 +49950,7 @@ public final class MasterProtos {
     long getCompactionTimestamp();
   }
   /**
-   * Protobuf type {@code MajorCompactionTimestampResponse}
+   * Protobuf type {@code hbase.pb.MajorCompactionTimestampResponse}
    */
   public static final class MajorCompactionTimestampResponse extends
       com.google.protobuf.GeneratedMessage
@@ -50019,12 +50019,12 @@ public final class MasterProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampResponse.Builder.class);
     }
@@ -50213,19 +50213,19 @@ public final class MasterProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MajorCompactionTimestampResponse}
+     * Protobuf type {@code hbase.pb.MajorCompactionTimestampResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampResponse.class, org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampResponse.Builder.class);
       }
@@ -50261,7 +50261,7 @@ public final class MasterProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_MajorCompactionTimestampResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MasterProtos.internal_static_hbase_pb_MajorCompactionTimestampResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MajorCompactionTimestampResponse getDefaultInstanceForType() {
@@ -50367,7 +50367,7 @@ public final class MasterProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MajorCompactionTimestampResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MajorCompactionTimestampResponse)
     }
 
     static {
@@ -50375,11 +50375,11 @@ public final class MasterProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MajorCompactionTimestampResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MajorCompactionTimestampResponse)
   }
 
   /**
-   * Protobuf service {@code MasterService}
+   * Protobuf service {@code hbase.pb.MasterService}
    */
   public static abstract class MasterService
       implements com.google.protobuf.Service {
@@ -50387,7 +50387,7 @@ public final class MasterProtos {
 
     public interface Interface {
       /**
-       * rpc GetSchemaAlterStatus(.GetSchemaAlterStatusRequest) returns (.GetSchemaAlterStatusResponse);
+       * rpc GetSchemaAlterStatus(.hbase.pb.GetSchemaAlterStatusRequest) returns (.hbase.pb.GetSchemaAlterStatusResponse);
        *
        * 
        ** Used by the client to get the number of regions that have received the updated schema 
@@ -50399,7 +50399,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetTableDescriptors(.GetTableDescriptorsRequest) returns (.GetTableDescriptorsResponse);
+       * rpc GetTableDescriptors(.hbase.pb.GetTableDescriptorsRequest) returns (.hbase.pb.GetTableDescriptorsResponse);
        *
        * 
        ** Get list of TableDescriptors for requested tables. 
@@ -50411,7 +50411,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetTableNames(.GetTableNamesRequest) returns (.GetTableNamesResponse);
+       * rpc GetTableNames(.hbase.pb.GetTableNamesRequest) returns (.hbase.pb.GetTableNamesResponse);
        *
        * 
        ** Get the list of table names. 
@@ -50423,7 +50423,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetClusterStatus(.GetClusterStatusRequest) returns (.GetClusterStatusResponse);
+       * rpc GetClusterStatus(.hbase.pb.GetClusterStatusRequest) returns (.hbase.pb.GetClusterStatusResponse);
        *
        * 
        ** Return cluster status. 
@@ -50435,7 +50435,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc IsMasterRunning(.IsMasterRunningRequest) returns (.IsMasterRunningResponse);
+       * rpc IsMasterRunning(.hbase.pb.IsMasterRunningRequest) returns (.hbase.pb.IsMasterRunningResponse);
        *
        * 
        ** return true if master is available 
@@ -50447,7 +50447,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc AddColumn(.AddColumnRequest) returns (.AddColumnResponse);
+       * rpc AddColumn(.hbase.pb.AddColumnRequest) returns (.hbase.pb.AddColumnResponse);
        *
        * 
        ** Adds a column to the specified table. 
@@ -50459,7 +50459,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc DeleteColumn(.DeleteColumnRequest) returns (.DeleteColumnResponse);
+       * rpc DeleteColumn(.hbase.pb.DeleteColumnRequest) returns (.hbase.pb.DeleteColumnResponse);
        *
        * 
        ** Deletes a column from the specified table. Table must be disabled. 
@@ -50471,7 +50471,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ModifyColumn(.ModifyColumnRequest) returns (.ModifyColumnResponse);
+       * rpc ModifyColumn(.hbase.pb.ModifyColumnRequest) returns (.hbase.pb.ModifyColumnResponse);
        *
        * 
        ** Modifies an existing column on the specified table. 
@@ -50483,7 +50483,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc MoveRegion(.MoveRegionRequest) returns (.MoveRegionResponse);
+       * rpc MoveRegion(.hbase.pb.MoveRegionRequest) returns (.hbase.pb.MoveRegionResponse);
        *
        * 
        ** Move the region region to the destination server. 
@@ -50495,7 +50495,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc DispatchMergingRegions(.DispatchMergingRegionsRequest) returns (.DispatchMergingRegionsResponse);
+       * rpc DispatchMergingRegions(.hbase.pb.DispatchMergingRegionsRequest) returns (.hbase.pb.DispatchMergingRegionsResponse);
        *
        * 
        ** Master dispatch merging the regions 
@@ -50507,7 +50507,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc AssignRegion(.AssignRegionRequest) returns (.AssignRegionResponse);
+       * rpc AssignRegion(.hbase.pb.AssignRegionRequest) returns (.hbase.pb.AssignRegionResponse);
        *
        * 
        ** Assign a region to a server chosen at random. 
@@ -50519,7 +50519,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc UnassignRegion(.UnassignRegionRequest) returns (.UnassignRegionResponse);
+       * rpc UnassignRegion(.hbase.pb.UnassignRegionRequest) returns (.hbase.pb.UnassignRegionResponse);
        *
        * 
        **
@@ -50535,7 +50535,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc OfflineRegion(.OfflineRegionRequest) returns (.OfflineRegionResponse);
+       * rpc OfflineRegion(.hbase.pb.OfflineRegionRequest) returns (.hbase.pb.OfflineRegionResponse);
        *
        * 
        **
@@ -50551,7 +50551,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc DeleteTable(.DeleteTableRequest) returns (.DeleteTableResponse);
+       * rpc DeleteTable(.hbase.pb.DeleteTableRequest) returns (.hbase.pb.DeleteTableResponse);
        *
        * 
        ** Deletes a table 
@@ -50563,7 +50563,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc truncateTable(.TruncateTableRequest) returns (.TruncateTableResponse);
+       * rpc truncateTable(.hbase.pb.TruncateTableRequest) returns (.hbase.pb.TruncateTableResponse);
        *
        * 
        ** Truncate a table 
@@ -50575,7 +50575,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc EnableTable(.EnableTableRequest) returns (.EnableTableResponse);
+       * rpc EnableTable(.hbase.pb.EnableTableRequest) returns (.hbase.pb.EnableTableResponse);
        *
        * 
        ** Puts the table on-line (only needed if table has been previously taken offline) 
@@ -50587,7 +50587,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc DisableTable(.DisableTableRequest) returns (.DisableTableResponse);
+       * rpc DisableTable(.hbase.pb.DisableTableRequest) returns (.hbase.pb.DisableTableResponse);
        *
        * 
        ** Take table offline 
@@ -50599,7 +50599,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ModifyTable(.ModifyTableRequest) returns (.ModifyTableResponse);
+       * rpc ModifyTable(.hbase.pb.ModifyTableRequest) returns (.hbase.pb.ModifyTableResponse);
        *
        * 
        ** Modify a table's metadata 
@@ -50611,7 +50611,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc CreateTable(.CreateTableRequest) returns (.CreateTableResponse);
+       * rpc CreateTable(.hbase.pb.CreateTableRequest) returns (.hbase.pb.CreateTableResponse);
        *
        * 
        ** Creates a new table asynchronously 
@@ -50623,7 +50623,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Shutdown(.ShutdownRequest) returns (.ShutdownResponse);
+       * rpc Shutdown(.hbase.pb.ShutdownRequest) returns (.hbase.pb.ShutdownResponse);
        *
        * 
        ** Shutdown an HBase cluster. 
@@ -50635,7 +50635,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc StopMaster(.StopMasterRequest) returns (.StopMasterResponse);
+       * rpc StopMaster(.hbase.pb.StopMasterRequest) returns (.hbase.pb.StopMasterResponse);
        *
        * 
        ** Stop HBase Master only.  Does not shutdown the cluster. 
@@ -50647,7 +50647,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Balance(.BalanceRequest) returns (.BalanceResponse);
+       * rpc Balance(.hbase.pb.BalanceRequest) returns (.hbase.pb.BalanceResponse);
        *
        * 
        **
@@ -50662,7 +50662,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc SetBalancerRunning(.SetBalancerRunningRequest) returns (.SetBalancerRunningResponse);
+       * rpc SetBalancerRunning(.hbase.pb.SetBalancerRunningRequest) returns (.hbase.pb.SetBalancerRunningResponse);
        *
        * 
        **
@@ -50676,7 +50676,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc IsBalancerEnabled(.IsBalancerEnabledRequest) returns (.IsBalancerEnabledResponse);
+       * rpc IsBalancerEnabled(.hbase.pb.IsBalancerEnabledRequest) returns (.hbase.pb.IsBalancerEnabledResponse);
        *
        * 
        **
@@ -50689,7 +50689,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc RunCatalogScan(.RunCatalogScanRequest) returns (.RunCatalogScanResponse);
+       * rpc RunCatalogScan(.hbase.pb.RunCatalogScanRequest) returns (.hbase.pb.RunCatalogScanResponse);
        *
        * 
        ** Get a run of the catalog janitor 
@@ -50701,7 +50701,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc EnableCatalogJanitor(.EnableCatalogJanitorRequest) returns (.EnableCatalogJanitorResponse);
+       * rpc EnableCatalogJanitor(.hbase.pb.EnableCatalogJanitorRequest) returns (.hbase.pb.EnableCatalogJanitorResponse);
        *
        * 
        **
@@ -50714,7 +50714,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc IsCatalogJanitorEnabled(.IsCatalogJanitorEnabledRequest) returns (.IsCatalogJanitorEnabledResponse);
+       * rpc IsCatalogJanitorEnabled(.hbase.pb.IsCatalogJanitorEnabledRequest) returns (.hbase.pb.IsCatalogJanitorEnabledResponse);
        *
        * 
        **
@@ -50727,7 +50727,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ExecMasterService(.CoprocessorServiceRequest) returns (.CoprocessorServiceResponse);
+       * rpc ExecMasterService(.hbase.pb.CoprocessorServiceRequest) returns (.hbase.pb.CoprocessorServiceResponse);
        *
        * 
        **
@@ -50740,7 +50740,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc Snapshot(.SnapshotRequest) returns (.SnapshotResponse);
+       * rpc Snapshot(.hbase.pb.SnapshotRequest) returns (.hbase.pb.SnapshotResponse);
        *
        * 
        **
@@ -50753,7 +50753,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetCompletedSnapshots(.GetCompletedSnapshotsRequest) returns (.GetCompletedSnapshotsResponse);
+       * rpc GetCompletedSnapshots(.hbase.pb.GetCompletedSnapshotsRequest) returns (.hbase.pb.GetCompletedSnapshotsResponse);
        *
        * 
        **
@@ -50767,7 +50767,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc DeleteSnapshot(.DeleteSnapshotRequest) returns (.DeleteSnapshotResponse);
+       * rpc DeleteSnapshot(.hbase.pb.DeleteSnapshotRequest) returns (.hbase.pb.DeleteSnapshotResponse);
        *
        * 
        **
@@ -50780,7 +50780,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc IsSnapshotDone(.IsSnapshotDoneRequest) returns (.IsSnapshotDoneResponse);
+       * rpc IsSnapshotDone(.hbase.pb.IsSnapshotDoneRequest) returns (.hbase.pb.IsSnapshotDoneResponse);
        *
        * 
        **
@@ -50793,7 +50793,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc RestoreSnapshot(.RestoreSnapshotRequest) returns (.RestoreSnapshotResponse);
+       * rpc RestoreSnapshot(.hbase.pb.RestoreSnapshotRequest) returns (.hbase.pb.RestoreSnapshotResponse);
        *
        * 
        **
@@ -50806,7 +50806,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc IsRestoreSnapshotDone(.IsRestoreSnapshotDoneRequest) returns (.IsRestoreSnapshotDoneResponse);
+       * rpc IsRestoreSnapshotDone(.hbase.pb.IsRestoreSnapshotDoneRequest) returns (.hbase.pb.IsRestoreSnapshotDoneResponse);
        *
        * 
        **
@@ -50819,7 +50819,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ExecProcedure(.ExecProcedureRequest) returns (.ExecProcedureResponse);
+       * rpc ExecProcedure(.hbase.pb.ExecProcedureRequest) returns (.hbase.pb.ExecProcedureResponse);
        *
        * 
        **
@@ -50832,7 +50832,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ExecProcedureWithRet(.ExecProcedureRequest) returns (.ExecProcedureResponse);
+       * rpc ExecProcedureWithRet(.hbase.pb.ExecProcedureRequest) returns (.hbase.pb.ExecProcedureResponse);
        *
        * 
        **
@@ -50845,7 +50845,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc IsProcedureDone(.IsProcedureDoneRequest) returns (.IsProcedureDoneResponse);
+       * rpc IsProcedureDone(.hbase.pb.IsProcedureDoneRequest) returns (.hbase.pb.IsProcedureDoneResponse);
        *
        * 
        **
@@ -50858,7 +50858,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ModifyNamespace(.ModifyNamespaceRequest) returns (.ModifyNamespaceResponse);
+       * rpc ModifyNamespace(.hbase.pb.ModifyNamespaceRequest) returns (.hbase.pb.ModifyNamespaceResponse);
        *
        * 
        ** Modify a namespace's metadata 
@@ -50870,7 +50870,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc CreateNamespace(.CreateNamespaceRequest) returns (.CreateNamespaceResponse);
+       * rpc CreateNamespace(.hbase.pb.CreateNamespaceRequest) returns (.hbase.pb.CreateNamespaceResponse);
        *
        * 
        ** Creates a new namespace synchronously 
@@ -50882,7 +50882,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc DeleteNamespace(.DeleteNamespaceRequest) returns (.DeleteNamespaceResponse);
+       * rpc DeleteNamespace(.hbase.pb.DeleteNamespaceRequest) returns (.hbase.pb.DeleteNamespaceResponse);
        *
        * 
        ** Deletes namespace synchronously 
@@ -50894,7 +50894,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetNamespaceDescriptor(.GetNamespaceDescriptorRequest) returns (.GetNamespaceDescriptorResponse);
+       * rpc GetNamespaceDescriptor(.hbase.pb.GetNamespaceDescriptorRequest) returns (.hbase.pb.GetNamespaceDescriptorResponse);
        *
        * 
        ** Get a namespace descriptor by name 
@@ -50906,7 +50906,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ListNamespaceDescriptors(.ListNamespaceDescriptorsRequest) returns (.ListNamespaceDescriptorsResponse);
+       * rpc ListNamespaceDescriptors(.hbase.pb.ListNamespaceDescriptorsRequest) returns (.hbase.pb.ListNamespaceDescriptorsResponse);
        *
        * 
        ** returns a list of namespaces 
@@ -50918,7 +50918,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ListTableDescriptorsByNamespace(.ListTableDescriptorsByNamespaceRequest) returns (.ListTableDescriptorsByNamespaceResponse);
+       * rpc ListTableDescriptorsByNamespace(.hbase.pb.ListTableDescriptorsByNamespaceRequest) returns (.hbase.pb.ListTableDescriptorsByNamespaceResponse);
        *
        * 
        ** returns a list of tables for a given namespace
@@ -50930,7 +50930,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ListTableNamesByNamespace(.ListTableNamesByNamespaceRequest) returns (.ListTableNamesByNamespaceResponse);
+       * rpc ListTableNamesByNamespace(.hbase.pb.ListTableNamesByNamespaceRequest) returns (.hbase.pb.ListTableNamesByNamespaceResponse);
        *
        * 
        ** returns a list of tables for a given namespace
@@ -50942,7 +50942,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetTableState(.GetTableStateRequest) returns (.GetTableStateResponse);
+       * rpc GetTableState(.hbase.pb.GetTableStateRequest) returns (.hbase.pb.GetTableStateResponse);
        *
        * 
        ** returns table state 
@@ -50954,7 +50954,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc SetQuota(.SetQuotaRequest) returns (.SetQuotaResponse);
+       * rpc SetQuota(.hbase.pb.SetQuotaRequest) returns (.hbase.pb.SetQuotaResponse);
        *
        * 
        ** Apply the new quota settings 
@@ -50966,7 +50966,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc getLastMajorCompactionTimestamp(.MajorCompactionTimestampRequest) returns (.MajorCompactionTimestampResponse);
+       * rpc getLastMajorCompactionTimestamp(.hbase.pb.MajorCompactionTimestampRequest) returns (.hbase.pb.MajorCompactionTimestampResponse);
        *
        * 
        ** Returns the timestamp of the last major compaction 
@@ -50978,7 +50978,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc getLastMajorCompactionTimestampForRegion(.MajorCompactionTimestampForRegionRequest) returns (.MajorCompactionTimestampResponse);
+       * rpc getLastMajorCompactionTimestampForRegion(.hbase.pb.MajorCompactionTimestampForRegionRequest) returns (.hbase.pb.MajorCompactionTimestampResponse);
        *
        * 
        ** Returns the timestamp of the last major compaction 
@@ -50990,7 +50990,7 @@ public final class MasterProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc getProcedureResult(.GetProcedureResultRequest) returns (.GetProcedureResultResponse);
+       * rpc getProcedureResult(.hbase.pb.GetProcedureResultRequest) returns (.hbase.pb.GetProcedureResultResponse);
        */
       public abstract void getProcedureResult(
           com.google.protobuf.RpcController controller,
@@ -51747,7 +51747,7 @@ public final class MasterProtos {
     }
 
     /**
-     * rpc GetSchemaAlterStatus(.GetSchemaAlterStatusRequest) returns (.GetSchemaAlterStatusResponse);
+     * rpc GetSchemaAlterStatus(.hbase.pb.GetSchemaAlterStatusRequest) returns (.hbase.pb.GetSchemaAlterStatusResponse);
      *
      * 
      ** Used by the client to get the number of regions that have received the updated schema 
@@ -51759,7 +51759,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetTableDescriptors(.GetTableDescriptorsRequest) returns (.GetTableDescriptorsResponse);
+     * rpc GetTableDescriptors(.hbase.pb.GetTableDescriptorsRequest) returns (.hbase.pb.GetTableDescriptorsResponse);
      *
      * 
      ** Get list of TableDescriptors for requested tables. 
@@ -51771,7 +51771,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetTableNames(.GetTableNamesRequest) returns (.GetTableNamesResponse);
+     * rpc GetTableNames(.hbase.pb.GetTableNamesRequest) returns (.hbase.pb.GetTableNamesResponse);
      *
      * 
      ** Get the list of table names. 
@@ -51783,7 +51783,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetClusterStatus(.GetClusterStatusRequest) returns (.GetClusterStatusResponse);
+     * rpc GetClusterStatus(.hbase.pb.GetClusterStatusRequest) returns (.hbase.pb.GetClusterStatusResponse);
      *
      * 
      ** Return cluster status. 
@@ -51795,7 +51795,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc IsMasterRunning(.IsMasterRunningRequest) returns (.IsMasterRunningResponse);
+     * rpc IsMasterRunning(.hbase.pb.IsMasterRunningRequest) returns (.hbase.pb.IsMasterRunningResponse);
      *
      * 
      ** return true if master is available 
@@ -51807,7 +51807,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc AddColumn(.AddColumnRequest) returns (.AddColumnResponse);
+     * rpc AddColumn(.hbase.pb.AddColumnRequest) returns (.hbase.pb.AddColumnResponse);
      *
      * 
      ** Adds a column to the specified table. 
@@ -51819,7 +51819,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc DeleteColumn(.DeleteColumnRequest) returns (.DeleteColumnResponse);
+     * rpc DeleteColumn(.hbase.pb.DeleteColumnRequest) returns (.hbase.pb.DeleteColumnResponse);
      *
      * 
      ** Deletes a column from the specified table. Table must be disabled. 
@@ -51831,7 +51831,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ModifyColumn(.ModifyColumnRequest) returns (.ModifyColumnResponse);
+     * rpc ModifyColumn(.hbase.pb.ModifyColumnRequest) returns (.hbase.pb.ModifyColumnResponse);
      *
      * 
      ** Modifies an existing column on the specified table. 
@@ -51843,7 +51843,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc MoveRegion(.MoveRegionRequest) returns (.MoveRegionResponse);
+     * rpc MoveRegion(.hbase.pb.MoveRegionRequest) returns (.hbase.pb.MoveRegionResponse);
      *
      * 
      ** Move the region region to the destination server. 
@@ -51855,7 +51855,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc DispatchMergingRegions(.DispatchMergingRegionsRequest) returns (.DispatchMergingRegionsResponse);
+     * rpc DispatchMergingRegions(.hbase.pb.DispatchMergingRegionsRequest) returns (.hbase.pb.DispatchMergingRegionsResponse);
      *
      * 
      ** Master dispatch merging the regions 
@@ -51867,7 +51867,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc AssignRegion(.AssignRegionRequest) returns (.AssignRegionResponse);
+     * rpc AssignRegion(.hbase.pb.AssignRegionRequest) returns (.hbase.pb.AssignRegionResponse);
      *
      * 
      ** Assign a region to a server chosen at random. 
@@ -51879,7 +51879,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc UnassignRegion(.UnassignRegionRequest) returns (.UnassignRegionResponse);
+     * rpc UnassignRegion(.hbase.pb.UnassignRegionRequest) returns (.hbase.pb.UnassignRegionResponse);
      *
      * 
      **
@@ -51895,7 +51895,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc OfflineRegion(.OfflineRegionRequest) returns (.OfflineRegionResponse);
+     * rpc OfflineRegion(.hbase.pb.OfflineRegionRequest) returns (.hbase.pb.OfflineRegionResponse);
      *
      * 
      **
@@ -51911,7 +51911,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc DeleteTable(.DeleteTableRequest) returns (.DeleteTableResponse);
+     * rpc DeleteTable(.hbase.pb.DeleteTableRequest) returns (.hbase.pb.DeleteTableResponse);
      *
      * 
      ** Deletes a table 
@@ -51923,7 +51923,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc truncateTable(.TruncateTableRequest) returns (.TruncateTableResponse);
+     * rpc truncateTable(.hbase.pb.TruncateTableRequest) returns (.hbase.pb.TruncateTableResponse);
      *
      * 
      ** Truncate a table 
@@ -51935,7 +51935,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc EnableTable(.EnableTableRequest) returns (.EnableTableResponse);
+     * rpc EnableTable(.hbase.pb.EnableTableRequest) returns (.hbase.pb.EnableTableResponse);
      *
      * 
      ** Puts the table on-line (only needed if table has been previously taken offline) 
@@ -51947,7 +51947,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc DisableTable(.DisableTableRequest) returns (.DisableTableResponse);
+     * rpc DisableTable(.hbase.pb.DisableTableRequest) returns (.hbase.pb.DisableTableResponse);
      *
      * 
      ** Take table offline 
@@ -51959,7 +51959,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ModifyTable(.ModifyTableRequest) returns (.ModifyTableResponse);
+     * rpc ModifyTable(.hbase.pb.ModifyTableRequest) returns (.hbase.pb.ModifyTableResponse);
      *
      * 
      ** Modify a table's metadata 
@@ -51971,7 +51971,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc CreateTable(.CreateTableRequest) returns (.CreateTableResponse);
+     * rpc CreateTable(.hbase.pb.CreateTableRequest) returns (.hbase.pb.CreateTableResponse);
      *
      * 
      ** Creates a new table asynchronously 
@@ -51983,7 +51983,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Shutdown(.ShutdownRequest) returns (.ShutdownResponse);
+     * rpc Shutdown(.hbase.pb.ShutdownRequest) returns (.hbase.pb.ShutdownResponse);
      *
      * 
      ** Shutdown an HBase cluster. 
@@ -51995,7 +51995,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc StopMaster(.StopMasterRequest) returns (.StopMasterResponse);
+     * rpc StopMaster(.hbase.pb.StopMasterRequest) returns (.hbase.pb.StopMasterResponse);
      *
      * 
      ** Stop HBase Master only.  Does not shutdown the cluster. 
@@ -52007,7 +52007,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Balance(.BalanceRequest) returns (.BalanceResponse);
+     * rpc Balance(.hbase.pb.BalanceRequest) returns (.hbase.pb.BalanceResponse);
      *
      * 
      **
@@ -52022,7 +52022,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc SetBalancerRunning(.SetBalancerRunningRequest) returns (.SetBalancerRunningResponse);
+     * rpc SetBalancerRunning(.hbase.pb.SetBalancerRunningRequest) returns (.hbase.pb.SetBalancerRunningResponse);
      *
      * 
      **
@@ -52036,7 +52036,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc IsBalancerEnabled(.IsBalancerEnabledRequest) returns (.IsBalancerEnabledResponse);
+     * rpc IsBalancerEnabled(.hbase.pb.IsBalancerEnabledRequest) returns (.hbase.pb.IsBalancerEnabledResponse);
      *
      * 
      **
@@ -52049,7 +52049,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc RunCatalogScan(.RunCatalogScanRequest) returns (.RunCatalogScanResponse);
+     * rpc RunCatalogScan(.hbase.pb.RunCatalogScanRequest) returns (.hbase.pb.RunCatalogScanResponse);
      *
      * 
      ** Get a run of the catalog janitor 
@@ -52061,7 +52061,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc EnableCatalogJanitor(.EnableCatalogJanitorRequest) returns (.EnableCatalogJanitorResponse);
+     * rpc EnableCatalogJanitor(.hbase.pb.EnableCatalogJanitorRequest) returns (.hbase.pb.EnableCatalogJanitorResponse);
      *
      * 
      **
@@ -52074,7 +52074,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc IsCatalogJanitorEnabled(.IsCatalogJanitorEnabledRequest) returns (.IsCatalogJanitorEnabledResponse);
+     * rpc IsCatalogJanitorEnabled(.hbase.pb.IsCatalogJanitorEnabledRequest) returns (.hbase.pb.IsCatalogJanitorEnabledResponse);
      *
      * 
      **
@@ -52087,7 +52087,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ExecMasterService(.CoprocessorServiceRequest) returns (.CoprocessorServiceResponse);
+     * rpc ExecMasterService(.hbase.pb.CoprocessorServiceRequest) returns (.hbase.pb.CoprocessorServiceResponse);
      *
      * 
      **
@@ -52100,7 +52100,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc Snapshot(.SnapshotRequest) returns (.SnapshotResponse);
+     * rpc Snapshot(.hbase.pb.SnapshotRequest) returns (.hbase.pb.SnapshotResponse);
      *
      * 
      **
@@ -52113,7 +52113,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetCompletedSnapshots(.GetCompletedSnapshotsRequest) returns (.GetCompletedSnapshotsResponse);
+     * rpc GetCompletedSnapshots(.hbase.pb.GetCompletedSnapshotsRequest) returns (.hbase.pb.GetCompletedSnapshotsResponse);
      *
      * 
      **
@@ -52127,7 +52127,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc DeleteSnapshot(.DeleteSnapshotRequest) returns (.DeleteSnapshotResponse);
+     * rpc DeleteSnapshot(.hbase.pb.DeleteSnapshotRequest) returns (.hbase.pb.DeleteSnapshotResponse);
      *
      * 
      **
@@ -52140,7 +52140,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc IsSnapshotDone(.IsSnapshotDoneRequest) returns (.IsSnapshotDoneResponse);
+     * rpc IsSnapshotDone(.hbase.pb.IsSnapshotDoneRequest) returns (.hbase.pb.IsSnapshotDoneResponse);
      *
      * 
      **
@@ -52153,7 +52153,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc RestoreSnapshot(.RestoreSnapshotRequest) returns (.RestoreSnapshotResponse);
+     * rpc RestoreSnapshot(.hbase.pb.RestoreSnapshotRequest) returns (.hbase.pb.RestoreSnapshotResponse);
      *
      * 
      **
@@ -52166,7 +52166,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc IsRestoreSnapshotDone(.IsRestoreSnapshotDoneRequest) returns (.IsRestoreSnapshotDoneResponse);
+     * rpc IsRestoreSnapshotDone(.hbase.pb.IsRestoreSnapshotDoneRequest) returns (.hbase.pb.IsRestoreSnapshotDoneResponse);
      *
      * 
      **
@@ -52179,7 +52179,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ExecProcedure(.ExecProcedureRequest) returns (.ExecProcedureResponse);
+     * rpc ExecProcedure(.hbase.pb.ExecProcedureRequest) returns (.hbase.pb.ExecProcedureResponse);
      *
      * 
      **
@@ -52192,7 +52192,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ExecProcedureWithRet(.ExecProcedureRequest) returns (.ExecProcedureResponse);
+     * rpc ExecProcedureWithRet(.hbase.pb.ExecProcedureRequest) returns (.hbase.pb.ExecProcedureResponse);
      *
      * 
      **
@@ -52205,7 +52205,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc IsProcedureDone(.IsProcedureDoneRequest) returns (.IsProcedureDoneResponse);
+     * rpc IsProcedureDone(.hbase.pb.IsProcedureDoneRequest) returns (.hbase.pb.IsProcedureDoneResponse);
      *
      * 
      **
@@ -52218,7 +52218,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ModifyNamespace(.ModifyNamespaceRequest) returns (.ModifyNamespaceResponse);
+     * rpc ModifyNamespace(.hbase.pb.ModifyNamespaceRequest) returns (.hbase.pb.ModifyNamespaceResponse);
      *
      * 
      ** Modify a namespace's metadata 
@@ -52230,7 +52230,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc CreateNamespace(.CreateNamespaceRequest) returns (.CreateNamespaceResponse);
+     * rpc CreateNamespace(.hbase.pb.CreateNamespaceRequest) returns (.hbase.pb.CreateNamespaceResponse);
      *
      * 
      ** Creates a new namespace synchronously 
@@ -52242,7 +52242,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc DeleteNamespace(.DeleteNamespaceRequest) returns (.DeleteNamespaceResponse);
+     * rpc DeleteNamespace(.hbase.pb.DeleteNamespaceRequest) returns (.hbase.pb.DeleteNamespaceResponse);
      *
      * 
      ** Deletes namespace synchronously 
@@ -52254,7 +52254,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetNamespaceDescriptor(.GetNamespaceDescriptorRequest) returns (.GetNamespaceDescriptorResponse);
+     * rpc GetNamespaceDescriptor(.hbase.pb.GetNamespaceDescriptorRequest) returns (.hbase.pb.GetNamespaceDescriptorResponse);
      *
      * 
      ** Get a namespace descriptor by name 
@@ -52266,7 +52266,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ListNamespaceDescriptors(.ListNamespaceDescriptorsRequest) returns (.ListNamespaceDescriptorsResponse);
+     * rpc ListNamespaceDescriptors(.hbase.pb.ListNamespaceDescriptorsRequest) returns (.hbase.pb.ListNamespaceDescriptorsResponse);
      *
      * 
      ** returns a list of namespaces 
@@ -52278,7 +52278,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ListTableDescriptorsByNamespace(.ListTableDescriptorsByNamespaceRequest) returns (.ListTableDescriptorsByNamespaceResponse);
+     * rpc ListTableDescriptorsByNamespace(.hbase.pb.ListTableDescriptorsByNamespaceRequest) returns (.hbase.pb.ListTableDescriptorsByNamespaceResponse);
      *
      * 
      ** returns a list of tables for a given namespace
@@ -52290,7 +52290,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ListTableNamesByNamespace(.ListTableNamesByNamespaceRequest) returns (.ListTableNamesByNamespaceResponse);
+     * rpc ListTableNamesByNamespace(.hbase.pb.ListTableNamesByNamespaceRequest) returns (.hbase.pb.ListTableNamesByNamespaceResponse);
      *
      * 
      ** returns a list of tables for a given namespace
@@ -52302,7 +52302,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetTableState(.GetTableStateRequest) returns (.GetTableStateResponse);
+     * rpc GetTableState(.hbase.pb.GetTableStateRequest) returns (.hbase.pb.GetTableStateResponse);
      *
      * 
      ** returns table state 
@@ -52314,7 +52314,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc SetQuota(.SetQuotaRequest) returns (.SetQuotaResponse);
+     * rpc SetQuota(.hbase.pb.SetQuotaRequest) returns (.hbase.pb.SetQuotaResponse);
      *
      * 
      ** Apply the new quota settings 
@@ -52326,7 +52326,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc getLastMajorCompactionTimestamp(.MajorCompactionTimestampRequest) returns (.MajorCompactionTimestampResponse);
+     * rpc getLastMajorCompactionTimestamp(.hbase.pb.MajorCompactionTimestampRequest) returns (.hbase.pb.MajorCompactionTimestampResponse);
      *
      * 
      ** Returns the timestamp of the last major compaction 
@@ -52338,7 +52338,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc getLastMajorCompactionTimestampForRegion(.MajorCompactionTimestampForRegionRequest) returns (.MajorCompactionTimestampResponse);
+     * rpc getLastMajorCompactionTimestampForRegion(.hbase.pb.MajorCompactionTimestampForRegionRequest) returns (.hbase.pb.MajorCompactionTimestampResponse);
      *
      * 
      ** Returns the timestamp of the last major compaction 
@@ -52350,7 +52350,7 @@ public final class MasterProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc getProcedureResult(.GetProcedureResultRequest) returns (.GetProcedureResultResponse);
+     * rpc getProcedureResult(.hbase.pb.GetProcedureResultRequest) returns (.hbase.pb.GetProcedureResultResponse);
      */
     public abstract void getProcedureResult(
         com.google.protobuf.RpcController controller,
@@ -54453,474 +54453,474 @@ public final class MasterProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:MasterService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MasterService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AddColumnRequest_descriptor;
+    internal_static_hbase_pb_AddColumnRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AddColumnRequest_fieldAccessorTable;
+      internal_static_hbase_pb_AddColumnRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AddColumnResponse_descriptor;
+    internal_static_hbase_pb_AddColumnResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AddColumnResponse_fieldAccessorTable;
+      internal_static_hbase_pb_AddColumnResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteColumnRequest_descriptor;
+    internal_static_hbase_pb_DeleteColumnRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteColumnRequest_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteColumnRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteColumnResponse_descriptor;
+    internal_static_hbase_pb_DeleteColumnResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteColumnResponse_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteColumnResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyColumnRequest_descriptor;
+    internal_static_hbase_pb_ModifyColumnRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyColumnRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyColumnRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyColumnResponse_descriptor;
+    internal_static_hbase_pb_ModifyColumnResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyColumnResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyColumnResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MoveRegionRequest_descriptor;
+    internal_static_hbase_pb_MoveRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MoveRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MoveRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MoveRegionResponse_descriptor;
+    internal_static_hbase_pb_MoveRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MoveRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MoveRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DispatchMergingRegionsRequest_descriptor;
+    internal_static_hbase_pb_DispatchMergingRegionsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DispatchMergingRegionsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_DispatchMergingRegionsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DispatchMergingRegionsResponse_descriptor;
+    internal_static_hbase_pb_DispatchMergingRegionsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DispatchMergingRegionsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_DispatchMergingRegionsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AssignRegionRequest_descriptor;
+    internal_static_hbase_pb_AssignRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AssignRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_AssignRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AssignRegionResponse_descriptor;
+    internal_static_hbase_pb_AssignRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AssignRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_AssignRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UnassignRegionRequest_descriptor;
+    internal_static_hbase_pb_UnassignRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UnassignRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_UnassignRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UnassignRegionResponse_descriptor;
+    internal_static_hbase_pb_UnassignRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UnassignRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_UnassignRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_OfflineRegionRequest_descriptor;
+    internal_static_hbase_pb_OfflineRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_OfflineRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_OfflineRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_OfflineRegionResponse_descriptor;
+    internal_static_hbase_pb_OfflineRegionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_OfflineRegionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_OfflineRegionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CreateTableRequest_descriptor;
+    internal_static_hbase_pb_CreateTableRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CreateTableRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CreateTableRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CreateTableResponse_descriptor;
+    internal_static_hbase_pb_CreateTableResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CreateTableResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CreateTableResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteTableRequest_descriptor;
+    internal_static_hbase_pb_DeleteTableRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteTableRequest_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteTableRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteTableResponse_descriptor;
+    internal_static_hbase_pb_DeleteTableResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteTableResponse_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteTableResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TruncateTableRequest_descriptor;
+    internal_static_hbase_pb_TruncateTableRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TruncateTableRequest_fieldAccessorTable;
+      internal_static_hbase_pb_TruncateTableRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TruncateTableResponse_descriptor;
+    internal_static_hbase_pb_TruncateTableResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TruncateTableResponse_fieldAccessorTable;
+      internal_static_hbase_pb_TruncateTableResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_EnableTableRequest_descriptor;
+    internal_static_hbase_pb_EnableTableRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_EnableTableRequest_fieldAccessorTable;
+      internal_static_hbase_pb_EnableTableRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_EnableTableResponse_descriptor;
+    internal_static_hbase_pb_EnableTableResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_EnableTableResponse_fieldAccessorTable;
+      internal_static_hbase_pb_EnableTableResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DisableTableRequest_descriptor;
+    internal_static_hbase_pb_DisableTableRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DisableTableRequest_fieldAccessorTable;
+      internal_static_hbase_pb_DisableTableRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DisableTableResponse_descriptor;
+    internal_static_hbase_pb_DisableTableResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DisableTableResponse_fieldAccessorTable;
+      internal_static_hbase_pb_DisableTableResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyTableRequest_descriptor;
+    internal_static_hbase_pb_ModifyTableRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyTableRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyTableRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyTableResponse_descriptor;
+    internal_static_hbase_pb_ModifyTableResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyTableResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyTableResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CreateNamespaceRequest_descriptor;
+    internal_static_hbase_pb_CreateNamespaceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CreateNamespaceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CreateNamespaceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CreateNamespaceResponse_descriptor;
+    internal_static_hbase_pb_CreateNamespaceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CreateNamespaceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CreateNamespaceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteNamespaceRequest_descriptor;
+    internal_static_hbase_pb_DeleteNamespaceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteNamespaceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteNamespaceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteNamespaceResponse_descriptor;
+    internal_static_hbase_pb_DeleteNamespaceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteNamespaceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteNamespaceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyNamespaceRequest_descriptor;
+    internal_static_hbase_pb_ModifyNamespaceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyNamespaceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyNamespaceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ModifyNamespaceResponse_descriptor;
+    internal_static_hbase_pb_ModifyNamespaceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ModifyNamespaceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ModifyNamespaceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetNamespaceDescriptorRequest_descriptor;
+    internal_static_hbase_pb_GetNamespaceDescriptorRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetNamespaceDescriptorRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetNamespaceDescriptorRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetNamespaceDescriptorResponse_descriptor;
+    internal_static_hbase_pb_GetNamespaceDescriptorResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetNamespaceDescriptorResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetNamespaceDescriptorResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListNamespaceDescriptorsRequest_descriptor;
+    internal_static_hbase_pb_ListNamespaceDescriptorsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListNamespaceDescriptorsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ListNamespaceDescriptorsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListNamespaceDescriptorsResponse_descriptor;
+    internal_static_hbase_pb_ListNamespaceDescriptorsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListNamespaceDescriptorsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ListNamespaceDescriptorsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListTableDescriptorsByNamespaceRequest_descriptor;
+    internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListTableDescriptorsByNamespaceResponse_descriptor;
+    internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListTableNamesByNamespaceRequest_descriptor;
+    internal_static_hbase_pb_ListTableNamesByNamespaceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListTableNamesByNamespaceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ListTableNamesByNamespaceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListTableNamesByNamespaceResponse_descriptor;
+    internal_static_hbase_pb_ListTableNamesByNamespaceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListTableNamesByNamespaceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ListTableNamesByNamespaceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ShutdownRequest_descriptor;
+    internal_static_hbase_pb_ShutdownRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ShutdownRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ShutdownRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ShutdownResponse_descriptor;
+    internal_static_hbase_pb_ShutdownResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ShutdownResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ShutdownResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StopMasterRequest_descriptor;
+    internal_static_hbase_pb_StopMasterRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StopMasterRequest_fieldAccessorTable;
+      internal_static_hbase_pb_StopMasterRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StopMasterResponse_descriptor;
+    internal_static_hbase_pb_StopMasterResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StopMasterResponse_fieldAccessorTable;
+      internal_static_hbase_pb_StopMasterResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BalanceRequest_descriptor;
+    internal_static_hbase_pb_BalanceRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BalanceRequest_fieldAccessorTable;
+      internal_static_hbase_pb_BalanceRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BalanceResponse_descriptor;
+    internal_static_hbase_pb_BalanceResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BalanceResponse_fieldAccessorTable;
+      internal_static_hbase_pb_BalanceResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SetBalancerRunningRequest_descriptor;
+    internal_static_hbase_pb_SetBalancerRunningRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SetBalancerRunningRequest_fieldAccessorTable;
+      internal_static_hbase_pb_SetBalancerRunningRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SetBalancerRunningResponse_descriptor;
+    internal_static_hbase_pb_SetBalancerRunningResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SetBalancerRunningResponse_fieldAccessorTable;
+      internal_static_hbase_pb_SetBalancerRunningResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsBalancerEnabledRequest_descriptor;
+    internal_static_hbase_pb_IsBalancerEnabledRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsBalancerEnabledRequest_fieldAccessorTable;
+      internal_static_hbase_pb_IsBalancerEnabledRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsBalancerEnabledResponse_descriptor;
+    internal_static_hbase_pb_IsBalancerEnabledResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsBalancerEnabledResponse_fieldAccessorTable;
+      internal_static_hbase_pb_IsBalancerEnabledResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RunCatalogScanRequest_descriptor;
+    internal_static_hbase_pb_RunCatalogScanRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RunCatalogScanRequest_fieldAccessorTable;
+      internal_static_hbase_pb_RunCatalogScanRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RunCatalogScanResponse_descriptor;
+    internal_static_hbase_pb_RunCatalogScanResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RunCatalogScanResponse_fieldAccessorTable;
+      internal_static_hbase_pb_RunCatalogScanResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_EnableCatalogJanitorRequest_descriptor;
+    internal_static_hbase_pb_EnableCatalogJanitorRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_EnableCatalogJanitorRequest_fieldAccessorTable;
+      internal_static_hbase_pb_EnableCatalogJanitorRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_EnableCatalogJanitorResponse_descriptor;
+    internal_static_hbase_pb_EnableCatalogJanitorResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_EnableCatalogJanitorResponse_fieldAccessorTable;
+      internal_static_hbase_pb_EnableCatalogJanitorResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsCatalogJanitorEnabledRequest_descriptor;
+    internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsCatalogJanitorEnabledRequest_fieldAccessorTable;
+      internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsCatalogJanitorEnabledResponse_descriptor;
+    internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsCatalogJanitorEnabledResponse_fieldAccessorTable;
+      internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SnapshotRequest_descriptor;
+    internal_static_hbase_pb_SnapshotRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SnapshotRequest_fieldAccessorTable;
+      internal_static_hbase_pb_SnapshotRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SnapshotResponse_descriptor;
+    internal_static_hbase_pb_SnapshotResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SnapshotResponse_fieldAccessorTable;
+      internal_static_hbase_pb_SnapshotResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetCompletedSnapshotsRequest_descriptor;
+    internal_static_hbase_pb_GetCompletedSnapshotsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetCompletedSnapshotsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetCompletedSnapshotsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetCompletedSnapshotsResponse_descriptor;
+    internal_static_hbase_pb_GetCompletedSnapshotsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetCompletedSnapshotsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetCompletedSnapshotsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteSnapshotRequest_descriptor;
+    internal_static_hbase_pb_DeleteSnapshotRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteSnapshotRequest_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteSnapshotRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeleteSnapshotResponse_descriptor;
+    internal_static_hbase_pb_DeleteSnapshotResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeleteSnapshotResponse_fieldAccessorTable;
+      internal_static_hbase_pb_DeleteSnapshotResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RestoreSnapshotRequest_descriptor;
+    internal_static_hbase_pb_RestoreSnapshotRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RestoreSnapshotRequest_fieldAccessorTable;
+      internal_static_hbase_pb_RestoreSnapshotRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RestoreSnapshotResponse_descriptor;
+    internal_static_hbase_pb_RestoreSnapshotResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RestoreSnapshotResponse_fieldAccessorTable;
+      internal_static_hbase_pb_RestoreSnapshotResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsSnapshotDoneRequest_descriptor;
+    internal_static_hbase_pb_IsSnapshotDoneRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsSnapshotDoneRequest_fieldAccessorTable;
+      internal_static_hbase_pb_IsSnapshotDoneRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsSnapshotDoneResponse_descriptor;
+    internal_static_hbase_pb_IsSnapshotDoneResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsSnapshotDoneResponse_fieldAccessorTable;
+      internal_static_hbase_pb_IsSnapshotDoneResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsRestoreSnapshotDoneRequest_descriptor;
+    internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsRestoreSnapshotDoneRequest_fieldAccessorTable;
+      internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsRestoreSnapshotDoneResponse_descriptor;
+    internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsRestoreSnapshotDoneResponse_fieldAccessorTable;
+      internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetSchemaAlterStatusRequest_descriptor;
+    internal_static_hbase_pb_GetSchemaAlterStatusRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetSchemaAlterStatusRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetSchemaAlterStatusRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetSchemaAlterStatusResponse_descriptor;
+    internal_static_hbase_pb_GetSchemaAlterStatusResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetSchemaAlterStatusResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetSchemaAlterStatusResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetTableDescriptorsRequest_descriptor;
+    internal_static_hbase_pb_GetTableDescriptorsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetTableDescriptorsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetTableDescriptorsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetTableDescriptorsResponse_descriptor;
+    internal_static_hbase_pb_GetTableDescriptorsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetTableDescriptorsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetTableDescriptorsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetTableNamesRequest_descriptor;
+    internal_static_hbase_pb_GetTableNamesRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetTableNamesRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetTableNamesRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetTableNamesResponse_descriptor;
+    internal_static_hbase_pb_GetTableNamesResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetTableNamesResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetTableNamesResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetTableStateRequest_descriptor;
+    internal_static_hbase_pb_GetTableStateRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetTableStateRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetTableStateRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetTableStateResponse_descriptor;
+    internal_static_hbase_pb_GetTableStateResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetTableStateResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetTableStateResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetClusterStatusRequest_descriptor;
+    internal_static_hbase_pb_GetClusterStatusRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetClusterStatusRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetClusterStatusRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetClusterStatusResponse_descriptor;
+    internal_static_hbase_pb_GetClusterStatusResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetClusterStatusResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetClusterStatusResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsMasterRunningRequest_descriptor;
+    internal_static_hbase_pb_IsMasterRunningRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsMasterRunningRequest_fieldAccessorTable;
+      internal_static_hbase_pb_IsMasterRunningRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsMasterRunningResponse_descriptor;
+    internal_static_hbase_pb_IsMasterRunningResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsMasterRunningResponse_fieldAccessorTable;
+      internal_static_hbase_pb_IsMasterRunningResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ExecProcedureRequest_descriptor;
+    internal_static_hbase_pb_ExecProcedureRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ExecProcedureRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ExecProcedureRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ExecProcedureResponse_descriptor;
+    internal_static_hbase_pb_ExecProcedureResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ExecProcedureResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ExecProcedureResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsProcedureDoneRequest_descriptor;
+    internal_static_hbase_pb_IsProcedureDoneRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsProcedureDoneRequest_fieldAccessorTable;
+      internal_static_hbase_pb_IsProcedureDoneRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_IsProcedureDoneResponse_descriptor;
+    internal_static_hbase_pb_IsProcedureDoneResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_IsProcedureDoneResponse_fieldAccessorTable;
+      internal_static_hbase_pb_IsProcedureDoneResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetProcedureResultRequest_descriptor;
+    internal_static_hbase_pb_GetProcedureResultRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetProcedureResultRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetProcedureResultRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetProcedureResultResponse_descriptor;
+    internal_static_hbase_pb_GetProcedureResultResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetProcedureResultResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetProcedureResultResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SetQuotaRequest_descriptor;
+    internal_static_hbase_pb_SetQuotaRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SetQuotaRequest_fieldAccessorTable;
+      internal_static_hbase_pb_SetQuotaRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SetQuotaResponse_descriptor;
+    internal_static_hbase_pb_SetQuotaResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SetQuotaResponse_fieldAccessorTable;
+      internal_static_hbase_pb_SetQuotaResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MajorCompactionTimestampRequest_descriptor;
+    internal_static_hbase_pb_MajorCompactionTimestampRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MajorCompactionTimestampRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MajorCompactionTimestampRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MajorCompactionTimestampForRegionRequest_descriptor;
+    internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MajorCompactionTimestampForRegionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MajorCompactionTimestampResponse_descriptor;
+    internal_static_hbase_pb_MajorCompactionTimestampResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MajorCompactionTimestampResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MajorCompactionTimestampResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -54930,808 +54930,841 @@ public final class MasterProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014Master.proto\032\013HBase.proto\032\014Client.prot" +
-      "o\032\023ClusterStatus.proto\032\023ErrorHandling.pr" +
-      "oto\032\013Quota.proto\"\212\001\n\020AddColumnRequest\022\036\n" +
-      "\ntable_name\030\001 \002(\0132\n.TableName\022,\n\017column_" +
-      "families\030\002 \002(\0132\023.ColumnFamilySchema\022\026\n\013n" +
-      "once_group\030\003 \001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010\"\023\n" +
-      "\021AddColumnResponse\"t\n\023DeleteColumnReques" +
-      "t\022\036\n\ntable_name\030\001 \002(\0132\n.TableName\022\023\n\013col" +
-      "umn_name\030\002 \002(\014\022\026\n\013nonce_group\030\003 \001(\004:\0010\022\020" +
-      "\n\005nonce\030\004 \001(\004:\0010\"\026\n\024DeleteColumnResponse",
-      "\"\215\001\n\023ModifyColumnRequest\022\036\n\ntable_name\030\001" +
-      " \002(\0132\n.TableName\022,\n\017column_families\030\002 \002(" +
-      "\0132\023.ColumnFamilySchema\022\026\n\013nonce_group\030\003 " +
-      "\001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010\"\026\n\024ModifyColumn" +
-      "Response\"\\\n\021MoveRegionRequest\022 \n\006region\030" +
-      "\001 \002(\0132\020.RegionSpecifier\022%\n\020dest_server_n" +
-      "ame\030\002 \001(\0132\013.ServerName\"\024\n\022MoveRegionResp" +
-      "onse\"\200\001\n\035DispatchMergingRegionsRequest\022\"" +
-      "\n\010region_a\030\001 \002(\0132\020.RegionSpecifier\022\"\n\010re" +
-      "gion_b\030\002 \002(\0132\020.RegionSpecifier\022\027\n\010forcib",
-      "le\030\003 \001(\010:\005false\" \n\036DispatchMergingRegion" +
-      "sResponse\"7\n\023AssignRegionRequest\022 \n\006regi" +
-      "on\030\001 \002(\0132\020.RegionSpecifier\"\026\n\024AssignRegi" +
-      "onResponse\"O\n\025UnassignRegionRequest\022 \n\006r" +
-      "egion\030\001 \002(\0132\020.RegionSpecifier\022\024\n\005force\030\002" +
-      " \001(\010:\005false\"\030\n\026UnassignRegionResponse\"8\n" +
-      "\024OfflineRegionRequest\022 \n\006region\030\001 \002(\0132\020." +
-      "RegionSpecifier\"\027\n\025OfflineRegionResponse" +
-      "\"v\n\022CreateTableRequest\022\"\n\014table_schema\030\001" +
-      " \002(\0132\014.TableSchema\022\022\n\nsplit_keys\030\002 \003(\014\022\026",
-      "\n\013nonce_group\030\003 \001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010" +
-      "\"&\n\023CreateTableResponse\022\017\n\007proc_id\030\001 \001(\004" +
-      "\"^\n\022DeleteTableRequest\022\036\n\ntable_name\030\001 \002" +
-      "(\0132\n.TableName\022\026\n\013nonce_group\030\002 \001(\004:\0010\022\020" +
-      "\n\005nonce\030\003 \001(\004:\0010\"&\n\023DeleteTableResponse\022" +
-      "\017\n\007proc_id\030\001 \001(\004\"~\n\024TruncateTableRequest" +
-      "\022\035\n\ttableName\030\001 \002(\0132\n.TableName\022\035\n\016prese" +
-      "rveSplits\030\002 \001(\010:\005false\022\026\n\013nonce_group\030\003 " +
-      "\001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010\"(\n\025TruncateTabl" +
-      "eResponse\022\017\n\007proc_id\030\001 \001(\004\"^\n\022EnableTabl",
-      "eRequest\022\036\n\ntable_name\030\001 \002(\0132\n.TableName" +
-      "\022\026\n\013nonce_group\030\002 \001(\004:\0010\022\020\n\005nonce\030\003 \001(\004:" +
-      "\0010\"&\n\023EnableTableResponse\022\017\n\007proc_id\030\001 \001" +
-      "(\004\"_\n\023DisableTableRequest\022\036\n\ntable_name\030" +
-      "\001 \002(\0132\n.TableName\022\026\n\013nonce_group\030\002 \001(\004:\001" +
-      "0\022\020\n\005nonce\030\003 \001(\004:\0010\"\'\n\024DisableTableRespo" +
-      "nse\022\017\n\007proc_id\030\001 \001(\004\"\202\001\n\022ModifyTableRequ" +
-      "est\022\036\n\ntable_name\030\001 \002(\0132\n.TableName\022\"\n\014t" +
-      "able_schema\030\002 \002(\0132\014.TableSchema\022\026\n\013nonce" +
-      "_group\030\003 \001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010\"&\n\023Mod",
-      "ifyTableResponse\022\017\n\007proc_id\030\001 \001(\004\"K\n\026Cre" +
-      "ateNamespaceRequest\0221\n\023namespaceDescript" +
-      "or\030\001 \002(\0132\024.NamespaceDescriptor\"\031\n\027Create" +
-      "NamespaceResponse\"/\n\026DeleteNamespaceRequ" +
-      "est\022\025\n\rnamespaceName\030\001 \002(\t\"\031\n\027DeleteName" +
-      "spaceResponse\"K\n\026ModifyNamespaceRequest\022" +
-      "1\n\023namespaceDescriptor\030\001 \002(\0132\024.Namespace" +
+      "\n\014Master.proto\022\010hbase.pb\032\013HBase.proto\032\014C" +
+      "lient.proto\032\023ClusterStatus.proto\032\023ErrorH" +
+      "andling.proto\032\013Quota.proto\"\234\001\n\020AddColumn" +
+      "Request\022\'\n\ntable_name\030\001 \002(\0132\023.hbase.pb.T" +
+      "ableName\0225\n\017column_families\030\002 \002(\0132\034.hbas" +
+      "e.pb.ColumnFamilySchema\022\026\n\013nonce_group\030\003" +
+      " \001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010\"\023\n\021AddColumnRe" +
+      "sponse\"}\n\023DeleteColumnRequest\022\'\n\ntable_n" +
+      "ame\030\001 \002(\0132\023.hbase.pb.TableName\022\023\n\013column" +
+      "_name\030\002 \002(\014\022\026\n\013nonce_group\030\003 \001(\004:\0010\022\020\n\005n",
+      "once\030\004 \001(\004:\0010\"\026\n\024DeleteColumnResponse\"\237\001" +
+      "\n\023ModifyColumnRequest\022\'\n\ntable_name\030\001 \002(" +
+      "\0132\023.hbase.pb.TableName\0225\n\017column_familie" +
+      "s\030\002 \002(\0132\034.hbase.pb.ColumnFamilySchema\022\026\n" +
+      "\013nonce_group\030\003 \001(\004:\0010\022\020\n\005nonce\030\004 \001(\004:\0010\"" +
+      "\026\n\024ModifyColumnResponse\"n\n\021MoveRegionReq" +
+      "uest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionSp" +
+      "ecifier\022.\n\020dest_server_name\030\002 \001(\0132\024.hbas" +
+      "e.pb.ServerName\"\024\n\022MoveRegionResponse\"\222\001" +
+      "\n\035DispatchMergingRegionsRequest\022+\n\010regio",
+      "n_a\030\001 \002(\0132\031.hbase.pb.RegionSpecifier\022+\n\010" +
+      "region_b\030\002 \002(\0132\031.hbase.pb.RegionSpecifie" +
+      "r\022\027\n\010forcible\030\003 \001(\010:\005false\" \n\036DispatchMe" +
+      "rgingRegionsResponse\"@\n\023AssignRegionRequ" +
+      "est\022)\n\006region\030\001 \002(\0132\031.hbase.pb.RegionSpe" +
+      "cifier\"\026\n\024AssignRegionResponse\"X\n\025Unassi" +
+      "gnRegionRequest\022)\n\006region\030\001 \002(\0132\031.hbase." +
+      "pb.RegionSpecifier\022\024\n\005force\030\002 \001(\010:\005false" +
+      "\"\030\n\026UnassignRegionResponse\"A\n\024OfflineReg" +
+      "ionRequest\022)\n\006region\030\001 \002(\0132\031.hbase.pb.Re",
+      "gionSpecifier\"\027\n\025OfflineRegionResponse\"\177" +
+      "\n\022CreateTableRequest\022+\n\014table_schema\030\001 \002" +
+      "(\0132\025.hbase.pb.TableSchema\022\022\n\nsplit_keys\030" +
+      "\002 \003(\014\022\026\n\013nonce_group\030\003 \001(\004:\0010\022\020\n\005nonce\030\004" +
+      " \001(\004:\0010\"&\n\023CreateTableResponse\022\017\n\007proc_i" +
+      "d\030\001 \001(\004\"g\n\022DeleteTableRequest\022\'\n\ntable_n" +
+      "ame\030\001 \002(\0132\023.hbase.pb.TableName\022\026\n\013nonce_" +
+      "group\030\002 \001(\004:\0010\022\020\n\005nonce\030\003 \001(\004:\0010\"&\n\023Dele" +
+      "teTableResponse\022\017\n\007proc_id\030\001 \001(\004\"\207\001\n\024Tru" +
+      "ncateTableRequest\022&\n\ttableName\030\001 \002(\0132\023.h",
+      "base.pb.TableName\022\035\n\016preserveSplits\030\002 \001(" +
+      "\010:\005false\022\026\n\013nonce_group\030\003 \001(\004:\0010\022\020\n\005nonc" +
+      "e\030\004 \001(\004:\0010\"(\n\025TruncateTableResponse\022\017\n\007p" +
+      "roc_id\030\001 \001(\004\"g\n\022EnableTableRequest\022\'\n\nta" +
+      "ble_name\030\001 \002(\0132\023.hbase.pb.TableName\022\026\n\013n" +
+      "once_group\030\002 \001(\004:\0010\022\020\n\005nonce\030\003 \001(\004:\0010\"&\n" +
+      "\023EnableTableResponse\022\017\n\007proc_id\030\001 \001(\004\"h\n" +
+      "\023DisableTableRequest\022\'\n\ntable_name\030\001 \002(\013" +
+      "2\023.hbase.pb.TableName\022\026\n\013nonce_group\030\002 \001" +
+      "(\004:\0010\022\020\n\005nonce\030\003 \001(\004:\0010\"\'\n\024DisableTableR",
+      "esponse\022\017\n\007proc_id\030\001 \001(\004\"\224\001\n\022ModifyTable" +
+      "Request\022\'\n\ntable_name\030\001 \002(\0132\023.hbase.pb.T" +
+      "ableName\022+\n\014table_schema\030\002 \002(\0132\025.hbase.p" +
+      "b.TableSchema\022\026\n\013nonce_group\030\003 \001(\004:\0010\022\020\n" +
+      "\005nonce\030\004 \001(\004:\0010\"&\n\023ModifyTableResponse\022\017" +
+      "\n\007proc_id\030\001 \001(\004\"T\n\026CreateNamespaceReques" +
+      "t\022:\n\023namespaceDescriptor\030\001 \002(\0132\035.hbase.p" +
+      "b.NamespaceDescriptor\"\031\n\027CreateNamespace" +
+      "Response\"/\n\026DeleteNamespaceRequest\022\025\n\rna" +
+      "mespaceName\030\001 \002(\t\"\031\n\027DeleteNamespaceResp",
+      "onse\"T\n\026ModifyNamespaceRequest\022:\n\023namesp" +
+      "aceDescriptor\030\001 \002(\0132\035.hbase.pb.Namespace" +
       "Descriptor\"\031\n\027ModifyNamespaceResponse\"6\n" +
       "\035GetNamespaceDescriptorRequest\022\025\n\rnamesp" +
-      "aceName\030\001 \002(\t\"S\n\036GetNamespaceDescriptorR",
-      "esponse\0221\n\023namespaceDescriptor\030\001 \002(\0132\024.N" +
-      "amespaceDescriptor\"!\n\037ListNamespaceDescr" +
-      "iptorsRequest\"U\n ListNamespaceDescriptor" +
-      "sResponse\0221\n\023namespaceDescriptor\030\001 \003(\0132\024" +
-      ".NamespaceDescriptor\"?\n&ListTableDescrip" +
-      "torsByNamespaceRequest\022\025\n\rnamespaceName\030" +
-      "\001 \002(\t\"L\n\'ListTableDescriptorsByNamespace" +
-      "Response\022!\n\013tableSchema\030\001 \003(\0132\014.TableSch" +
-      "ema\"9\n ListTableNamesByNamespaceRequest\022" +
-      "\025\n\rnamespaceName\030\001 \002(\t\"B\n!ListTableNames",
-      "ByNamespaceResponse\022\035\n\ttableName\030\001 \003(\0132\n" +
-      ".TableName\"\021\n\017ShutdownRequest\"\022\n\020Shutdow" +
-      "nResponse\"\023\n\021StopMasterRequest\"\024\n\022StopMa" +
-      "sterResponse\"\020\n\016BalanceRequest\"\'\n\017Balanc" +
-      "eResponse\022\024\n\014balancer_ran\030\001 \002(\010\"<\n\031SetBa" +
-      "lancerRunningRequest\022\n\n\002on\030\001 \002(\010\022\023\n\013sync" +
-      "hronous\030\002 \001(\010\"8\n\032SetBalancerRunningRespo" +
-      "nse\022\032\n\022prev_balance_value\030\001 \001(\010\"\032\n\030IsBal" +
-      "ancerEnabledRequest\",\n\031IsBalancerEnabled" +
-      "Response\022\017\n\007enabled\030\001 \002(\010\"\027\n\025RunCatalogS",
-      "canRequest\"-\n\026RunCatalogScanResponse\022\023\n\013" +
-      "scan_result\030\001 \001(\005\"-\n\033EnableCatalogJanito" +
-      "rRequest\022\016\n\006enable\030\001 \002(\010\"2\n\034EnableCatalo" +
-      "gJanitorResponse\022\022\n\nprev_value\030\001 \001(\010\" \n\036" +
-      "IsCatalogJanitorEnabledRequest\"0\n\037IsCata" +
-      "logJanitorEnabledResponse\022\r\n\005value\030\001 \002(\010" +
-      "\"9\n\017SnapshotRequest\022&\n\010snapshot\030\001 \002(\0132\024." +
-      "SnapshotDescription\",\n\020SnapshotResponse\022" +
-      "\030\n\020expected_timeout\030\001 \002(\003\"\036\n\034GetComplete" +
-      "dSnapshotsRequest\"H\n\035GetCompletedSnapsho",
-      "tsResponse\022\'\n\tsnapshots\030\001 \003(\0132\024.Snapshot" +
-      "Description\"?\n\025DeleteSnapshotRequest\022&\n\010" +
-      "snapshot\030\001 \002(\0132\024.SnapshotDescription\"\030\n\026" +
-      "DeleteSnapshotResponse\"@\n\026RestoreSnapsho" +
-      "tRequest\022&\n\010snapshot\030\001 \002(\0132\024.SnapshotDes" +
-      "cription\"\031\n\027RestoreSnapshotResponse\"?\n\025I" +
-      "sSnapshotDoneRequest\022&\n\010snapshot\030\001 \001(\0132\024" +
-      ".SnapshotDescription\"U\n\026IsSnapshotDoneRe" +
-      "sponse\022\023\n\004done\030\001 \001(\010:\005false\022&\n\010snapshot\030" +
-      "\002 \001(\0132\024.SnapshotDescription\"F\n\034IsRestore",
-      "SnapshotDoneRequest\022&\n\010snapshot\030\001 \001(\0132\024." +
-      "SnapshotDescription\"4\n\035IsRestoreSnapshot" +
-      "DoneResponse\022\023\n\004done\030\001 \001(\010:\005false\"=\n\033Get" +
-      "SchemaAlterStatusRequest\022\036\n\ntable_name\030\001" +
-      " \002(\0132\n.TableName\"T\n\034GetSchemaAlterStatus" +
-      "Response\022\035\n\025yet_to_update_regions\030\001 \001(\r\022" +
-      "\025\n\rtotal_regions\030\002 \001(\r\"\202\001\n\032GetTableDescr" +
-      "iptorsRequest\022\037\n\013table_names\030\001 \003(\0132\n.Tab" +
-      "leName\022\r\n\005regex\030\002 \001(\t\022!\n\022include_sys_tab" +
-      "les\030\003 \001(\010:\005false\022\021\n\tnamespace\030\004 \001(\t\"A\n\033G",
-      "etTableDescriptorsResponse\022\"\n\014table_sche" +
-      "ma\030\001 \003(\0132\014.TableSchema\"[\n\024GetTableNamesR" +
-      "equest\022\r\n\005regex\030\001 \001(\t\022!\n\022include_sys_tab" +
-      "les\030\002 \001(\010:\005false\022\021\n\tnamespace\030\003 \001(\t\"8\n\025G" +
-      "etTableNamesResponse\022\037\n\013table_names\030\001 \003(" +
-      "\0132\n.TableName\"6\n\024GetTableStateRequest\022\036\n" +
-      "\ntable_name\030\001 \002(\0132\n.TableName\"9\n\025GetTabl" +
-      "eStateResponse\022 \n\013table_state\030\001 \002(\0132\013.Ta" +
-      "bleState\"\031\n\027GetClusterStatusRequest\"B\n\030G" +
-      "etClusterStatusResponse\022&\n\016cluster_statu",
-      "s\030\001 \002(\0132\016.ClusterStatus\"\030\n\026IsMasterRunni" +
-      "ngRequest\"4\n\027IsMasterRunningResponse\022\031\n\021" +
-      "is_master_running\030\001 \002(\010\"@\n\024ExecProcedure" +
-      "Request\022(\n\tprocedure\030\001 \002(\0132\025.ProcedureDe" +
-      "scription\"F\n\025ExecProcedureResponse\022\030\n\020ex" +
-      "pected_timeout\030\001 \001(\003\022\023\n\013return_data\030\002 \001(" +
-      "\014\"B\n\026IsProcedureDoneRequest\022(\n\tprocedure" +
-      "\030\001 \001(\0132\025.ProcedureDescription\"W\n\027IsProce" +
-      "dureDoneResponse\022\023\n\004done\030\001 \001(\010:\005false\022\'\n" +
-      "\010snapshot\030\002 \001(\0132\025.ProcedureDescription\",",
-      "\n\031GetProcedureResultRequest\022\017\n\007proc_id\030\001" +
-      " \002(\004\"\347\001\n\032GetProcedureResultResponse\0220\n\005s" +
-      "tate\030\001 \002(\0162!.GetProcedureResultResponse." +
-      "State\022\022\n\nstart_time\030\002 \001(\004\022\023\n\013last_update" +
-      "\030\003 \001(\004\022\016\n\006result\030\004 \001(\014\022+\n\texception\030\005 \001(" +
-      "\0132\030.ForeignExceptionMessage\"1\n\005State\022\r\n\t" +
-      "NOT_FOUND\020\000\022\013\n\007RUNNING\020\001\022\014\n\010FINISHED\020\002\"\273" +
-      "\001\n\017SetQuotaRequest\022\021\n\tuser_name\030\001 \001(\t\022\022\n" +
-      "\nuser_group\030\002 \001(\t\022\021\n\tnamespace\030\003 \001(\t\022\036\n\n" +
-      "table_name\030\004 \001(\0132\n.TableName\022\022\n\nremove_a",
-      "ll\030\005 \001(\010\022\026\n\016bypass_globals\030\006 \001(\010\022\"\n\010thro" +
-      "ttle\030\007 \001(\0132\020.ThrottleRequest\"\022\n\020SetQuota" +
-      "Response\"A\n\037MajorCompactionTimestampRequ" +
-      "est\022\036\n\ntable_name\030\001 \002(\0132\n.TableName\"L\n(M" +
-      "ajorCompactionTimestampForRegionRequest\022" +
-      " \n\006region\030\001 \002(\0132\020.RegionSpecifier\"@\n Maj" +
-      "orCompactionTimestampResponse\022\034\n\024compact" +
-      "ion_timestamp\030\001 \002(\0032\343\033\n\rMasterService\022S\n" +
-      "\024GetSchemaAlterStatus\022\034.GetSchemaAlterSt" +
-      "atusRequest\032\035.GetSchemaAlterStatusRespon",
-      "se\022P\n\023GetTableDescriptors\022\033.GetTableDesc" +
-      "riptorsRequest\032\034.GetTableDescriptorsResp" +
-      "onse\022>\n\rGetTableNames\022\025.GetTableNamesReq" +
-      "uest\032\026.GetTableNamesResponse\022G\n\020GetClust" +
-      "erStatus\022\030.GetClusterStatusRequest\032\031.Get" +
-      "ClusterStatusResponse\022D\n\017IsMasterRunning" +
-      "\022\027.IsMasterRunningRequest\032\030.IsMasterRunn" +
-      "ingResponse\0222\n\tAddColumn\022\021.AddColumnRequ" +
-      "est\032\022.AddColumnResponse\022;\n\014DeleteColumn\022" +
-      "\024.DeleteColumnRequest\032\025.DeleteColumnResp",
-      "onse\022;\n\014ModifyColumn\022\024.ModifyColumnReque" +
-      "st\032\025.ModifyColumnResponse\0225\n\nMoveRegion\022" +
-      "\022.MoveRegionRequest\032\023.MoveRegionResponse" +
-      "\022Y\n\026DispatchMergingRegions\022\036.DispatchMer" +
-      "gingRegionsRequest\032\037.DispatchMergingRegi" +
-      "onsResponse\022;\n\014AssignRegion\022\024.AssignRegi" +
-      "onRequest\032\025.AssignRegionResponse\022A\n\016Unas" +
-      "signRegion\022\026.UnassignRegionRequest\032\027.Una" +
-      "ssignRegionResponse\022>\n\rOfflineRegion\022\025.O" +
-      "fflineRegionRequest\032\026.OfflineRegionRespo",
-      "nse\0228\n\013DeleteTable\022\023.DeleteTableRequest\032" +
-      "\024.DeleteTableResponse\022>\n\rtruncateTable\022\025" +
-      ".TruncateTableRequest\032\026.TruncateTableRes" +
-      "ponse\0228\n\013EnableTable\022\023.EnableTableReques" +
-      "t\032\024.EnableTableResponse\022;\n\014DisableTable\022" +
-      "\024.DisableTableRequest\032\025.DisableTableResp" +
-      "onse\0228\n\013ModifyTable\022\023.ModifyTableRequest" +
-      "\032\024.ModifyTableResponse\0228\n\013CreateTable\022\023." +
-      "CreateTableRequest\032\024.CreateTableResponse" +
-      "\022/\n\010Shutdown\022\020.ShutdownRequest\032\021.Shutdow",
-      "nResponse\0225\n\nStopMaster\022\022.StopMasterRequ" +
-      "est\032\023.StopMasterResponse\022,\n\007Balance\022\017.Ba" +
-      "lanceRequest\032\020.BalanceResponse\022M\n\022SetBal" +
-      "ancerRunning\022\032.SetBalancerRunningRequest" +
-      "\032\033.SetBalancerRunningResponse\022J\n\021IsBalan" +
-      "cerEnabled\022\031.IsBalancerEnabledRequest\032\032." +
-      "IsBalancerEnabledResponse\022A\n\016RunCatalogS" +
-      "can\022\026.RunCatalogScanRequest\032\027.RunCatalog" +
-      "ScanResponse\022S\n\024EnableCatalogJanitor\022\034.E" +
-      "nableCatalogJanitorRequest\032\035.EnableCatal",
-      "ogJanitorResponse\022\\\n\027IsCatalogJanitorEna" +
-      "bled\022\037.IsCatalogJanitorEnabledRequest\032 ." +
-      "IsCatalogJanitorEnabledResponse\022L\n\021ExecM" +
-      "asterService\022\032.CoprocessorServiceRequest" +
-      "\032\033.CoprocessorServiceResponse\022/\n\010Snapsho" +
-      "t\022\020.SnapshotRequest\032\021.SnapshotResponse\022V" +
-      "\n\025GetCompletedSnapshots\022\035.GetCompletedSn" +
-      "apshotsRequest\032\036.GetCompletedSnapshotsRe" +
-      "sponse\022A\n\016DeleteSnapshot\022\026.DeleteSnapsho" +
-      "tRequest\032\027.DeleteSnapshotResponse\022A\n\016IsS",
-      "napshotDone\022\026.IsSnapshotDoneRequest\032\027.Is" +
-      "SnapshotDoneResponse\022D\n\017RestoreSnapshot\022" +
-      "\027.RestoreSnapshotRequest\032\030.RestoreSnapsh" +
-      "otResponse\022V\n\025IsRestoreSnapshotDone\022\035.Is" +
-      "RestoreSnapshotDoneRequest\032\036.IsRestoreSn" +
-      "apshotDoneResponse\022>\n\rExecProcedure\022\025.Ex" +
-      "ecProcedureRequest\032\026.ExecProcedureRespon" +
-      "se\022E\n\024ExecProcedureWithRet\022\025.ExecProcedu" +
-      "reRequest\032\026.ExecProcedureResponse\022D\n\017IsP" +
-      "rocedureDone\022\027.IsProcedureDoneRequest\032\030.",
-      "IsProcedureDoneResponse\022D\n\017ModifyNamespa" +
-      "ce\022\027.ModifyNamespaceRequest\032\030.ModifyName" +
-      "spaceResponse\022D\n\017CreateNamespace\022\027.Creat" +
-      "eNamespaceRequest\032\030.CreateNamespaceRespo" +
-      "nse\022D\n\017DeleteNamespace\022\027.DeleteNamespace" +
-      "Request\032\030.DeleteNamespaceResponse\022Y\n\026Get" +
-      "NamespaceDescriptor\022\036.GetNamespaceDescri" +
-      "ptorRequest\032\037.GetNamespaceDescriptorResp" +
-      "onse\022_\n\030ListNamespaceDescriptors\022 .ListN" +
-      "amespaceDescriptorsRequest\032!.ListNamespa",
-      "ceDescriptorsResponse\022t\n\037ListTableDescri" +
-      "ptorsByNamespace\022\'.ListTableDescriptorsB" +
-      "yNamespaceRequest\032(.ListTableDescriptors" +
-      "ByNamespaceResponse\022b\n\031ListTableNamesByN" +
-      "amespace\022!.ListTableNamesByNamespaceRequ" +
-      "est\032\".ListTableNamesByNamespaceResponse\022" +
-      ">\n\rGetTableState\022\025.GetTableStateRequest\032" +
-      "\026.GetTableStateResponse\022/\n\010SetQuota\022\020.Se" +
-      "tQuotaRequest\032\021.SetQuotaResponse\022f\n\037getL" +
-      "astMajorCompactionTimestamp\022 .MajorCompa",
-      "ctionTimestampRequest\032!.MajorCompactionT" +
-      "imestampResponse\022x\n(getLastMajorCompacti" +
-      "onTimestampForRegion\022).MajorCompactionTi" +
-      "mestampForRegionRequest\032!.MajorCompactio" +
-      "nTimestampResponse\022M\n\022getProcedureResult" +
-      "\022\032.GetProcedureResultRequest\032\033.GetProced" +
-      "ureResultResponseBB\n*org.apache.hadoop.h" +
-      "base.protobuf.generatedB\014MasterProtosH\001\210" +
-      "\001\001\240\001\001"
+      "aceName\030\001 \002(\t\"\\\n\036GetNamespaceDescriptorR" +
+      "esponse\022:\n\023namespaceDescriptor\030\001 \002(\0132\035.h" +
+      "base.pb.NamespaceDescriptor\"!\n\037ListNames" +
+      "paceDescriptorsRequest\"^\n ListNamespaceD" +
+      "escriptorsResponse\022:\n\023namespaceDescripto" +
+      "r\030\001 \003(\0132\035.hbase.pb.NamespaceDescriptor\"?",
+      "\n&ListTableDescriptorsByNamespaceRequest" +
+      "\022\025\n\rnamespaceName\030\001 \002(\t\"U\n\'ListTableDesc" +
+      "riptorsByNamespaceResponse\022*\n\013tableSchem" +
+      "a\030\001 \003(\0132\025.hbase.pb.TableSchema\"9\n ListTa" +
+      "bleNamesByNamespaceRequest\022\025\n\rnamespaceN" +
+      "ame\030\001 \002(\t\"K\n!ListTableNamesByNamespaceRe" +
+      "sponse\022&\n\ttableName\030\001 \003(\0132\023.hbase.pb.Tab" +
+      "leName\"\021\n\017ShutdownRequest\"\022\n\020ShutdownRes" +
+      "ponse\"\023\n\021StopMasterRequest\"\024\n\022StopMaster" +
+      "Response\"\020\n\016BalanceRequest\"\'\n\017BalanceRes",
+      "ponse\022\024\n\014balancer_ran\030\001 \002(\010\"<\n\031SetBalanc" +
+      "erRunningRequest\022\n\n\002on\030\001 \002(\010\022\023\n\013synchron" +
+      "ous\030\002 \001(\010\"8\n\032SetBalancerRunningResponse\022" +
+      "\032\n\022prev_balance_value\030\001 \001(\010\"\032\n\030IsBalance" +
+      "rEnabledRequest\",\n\031IsBalancerEnabledResp" +
+      "onse\022\017\n\007enabled\030\001 \002(\010\"\027\n\025RunCatalogScanR" +
+      "equest\"-\n\026RunCatalogScanResponse\022\023\n\013scan" +
+      "_result\030\001 \001(\005\"-\n\033EnableCatalogJanitorReq" +
+      "uest\022\016\n\006enable\030\001 \002(\010\"2\n\034EnableCatalogJan" +
+      "itorResponse\022\022\n\nprev_value\030\001 \001(\010\" \n\036IsCa",
+      "talogJanitorEnabledRequest\"0\n\037IsCatalogJ" +
+      "anitorEnabledResponse\022\r\n\005value\030\001 \002(\010\"B\n\017" +
+      "SnapshotRequest\022/\n\010snapshot\030\001 \002(\0132\035.hbas" +
+      "e.pb.SnapshotDescription\",\n\020SnapshotResp" +
+      "onse\022\030\n\020expected_timeout\030\001 \002(\003\"\036\n\034GetCom" +
+      "pletedSnapshotsRequest\"Q\n\035GetCompletedSn" +
+      "apshotsResponse\0220\n\tsnapshots\030\001 \003(\0132\035.hba" +
+      "se.pb.SnapshotDescription\"H\n\025DeleteSnaps" +
+      "hotRequest\022/\n\010snapshot\030\001 \002(\0132\035.hbase.pb." +
+      "SnapshotDescription\"\030\n\026DeleteSnapshotRes",
+      "ponse\"I\n\026RestoreSnapshotRequest\022/\n\010snaps" +
+      "hot\030\001 \002(\0132\035.hbase.pb.SnapshotDescription" +
+      "\"\031\n\027RestoreSnapshotResponse\"H\n\025IsSnapsho" +
+      "tDoneRequest\022/\n\010snapshot\030\001 \001(\0132\035.hbase.p" +
+      "b.SnapshotDescription\"^\n\026IsSnapshotDoneR" +
+      "esponse\022\023\n\004done\030\001 \001(\010:\005false\022/\n\010snapshot" +
+      "\030\002 \001(\0132\035.hbase.pb.SnapshotDescription\"O\n" +
+      "\034IsRestoreSnapshotDoneRequest\022/\n\010snapsho" +
+      "t\030\001 \001(\0132\035.hbase.pb.SnapshotDescription\"4" +
+      "\n\035IsRestoreSnapshotDoneResponse\022\023\n\004done\030",
+      "\001 \001(\010:\005false\"F\n\033GetSchemaAlterStatusRequ" +
+      "est\022\'\n\ntable_name\030\001 \002(\0132\023.hbase.pb.Table" +
+      "Name\"T\n\034GetSchemaAlterStatusResponse\022\035\n\025" +
+      "yet_to_update_regions\030\001 \001(\r\022\025\n\rtotal_reg" +
+      "ions\030\002 \001(\r\"\213\001\n\032GetTableDescriptorsReques" +
+      "t\022(\n\013table_names\030\001 \003(\0132\023.hbase.pb.TableN" +
+      "ame\022\r\n\005regex\030\002 \001(\t\022!\n\022include_sys_tables" +
+      "\030\003 \001(\010:\005false\022\021\n\tnamespace\030\004 \001(\t\"J\n\033GetT" +
+      "ableDescriptorsResponse\022+\n\014table_schema\030" +
+      "\001 \003(\0132\025.hbase.pb.TableSchema\"[\n\024GetTable",
+      "NamesRequest\022\r\n\005regex\030\001 \001(\t\022!\n\022include_s" +
+      "ys_tables\030\002 \001(\010:\005false\022\021\n\tnamespace\030\003 \001(" +
+      "\t\"A\n\025GetTableNamesResponse\022(\n\013table_name" +
+      "s\030\001 \003(\0132\023.hbase.pb.TableName\"?\n\024GetTable" +
+      "StateRequest\022\'\n\ntable_name\030\001 \002(\0132\023.hbase" +
+      ".pb.TableName\"B\n\025GetTableStateResponse\022)" +
+      "\n\013table_state\030\001 \002(\0132\024.hbase.pb.TableStat" +
+      "e\"\031\n\027GetClusterStatusRequest\"K\n\030GetClust" +
+      "erStatusResponse\022/\n\016cluster_status\030\001 \002(\013" +
+      "2\027.hbase.pb.ClusterStatus\"\030\n\026IsMasterRun",
+      "ningRequest\"4\n\027IsMasterRunningResponse\022\031" +
+      "\n\021is_master_running\030\001 \002(\010\"I\n\024ExecProcedu" +
+      "reRequest\0221\n\tprocedure\030\001 \002(\0132\036.hbase.pb." +
+      "ProcedureDescription\"F\n\025ExecProcedureRes" +
+      "ponse\022\030\n\020expected_timeout\030\001 \001(\003\022\023\n\013retur" +
+      "n_data\030\002 \001(\014\"K\n\026IsProcedureDoneRequest\0221" +
+      "\n\tprocedure\030\001 \001(\0132\036.hbase.pb.ProcedureDe" +
+      "scription\"`\n\027IsProcedureDoneResponse\022\023\n\004" +
+      "done\030\001 \001(\010:\005false\0220\n\010snapshot\030\002 \001(\0132\036.hb" +
+      "ase.pb.ProcedureDescription\",\n\031GetProced",
+      "ureResultRequest\022\017\n\007proc_id\030\001 \002(\004\"\371\001\n\032Ge" +
+      "tProcedureResultResponse\0229\n\005state\030\001 \002(\0162" +
+      "*.hbase.pb.GetProcedureResultResponse.St" +
+      "ate\022\022\n\nstart_time\030\002 \001(\004\022\023\n\013last_update\030\003" +
+      " \001(\004\022\016\n\006result\030\004 \001(\014\0224\n\texception\030\005 \001(\0132" +
+      "!.hbase.pb.ForeignExceptionMessage\"1\n\005St" +
+      "ate\022\r\n\tNOT_FOUND\020\000\022\013\n\007RUNNING\020\001\022\014\n\010FINIS" +
+      "HED\020\002\"\315\001\n\017SetQuotaRequest\022\021\n\tuser_name\030\001" +
+      " \001(\t\022\022\n\nuser_group\030\002 \001(\t\022\021\n\tnamespace\030\003 " +
+      "\001(\t\022\'\n\ntable_name\030\004 \001(\0132\023.hbase.pb.Table",
+      "Name\022\022\n\nremove_all\030\005 \001(\010\022\026\n\016bypass_globa" +
+      "ls\030\006 \001(\010\022+\n\010throttle\030\007 \001(\0132\031.hbase.pb.Th" +
+      "rottleRequest\"\022\n\020SetQuotaResponse\"J\n\037Maj" +
+      "orCompactionTimestampRequest\022\'\n\ntable_na" +
+      "me\030\001 \002(\0132\023.hbase.pb.TableName\"U\n(MajorCo" +
+      "mpactionTimestampForRegionRequest\022)\n\006reg" +
+      "ion\030\001 \002(\0132\031.hbase.pb.RegionSpecifier\"@\n " +
+      "MajorCompactionTimestampResponse\022\034\n\024comp" +
+      "action_timestamp\030\001 \002(\0032\327\"\n\rMasterService" +
+      "\022e\n\024GetSchemaAlterStatus\022%.hbase.pb.GetS",
+      "chemaAlterStatusRequest\032&.hbase.pb.GetSc" +
+      "hemaAlterStatusResponse\022b\n\023GetTableDescr" +
+      "iptors\022$.hbase.pb.GetTableDescriptorsReq" +
+      "uest\032%.hbase.pb.GetTableDescriptorsRespo" +
+      "nse\022P\n\rGetTableNames\022\036.hbase.pb.GetTable" +
+      "NamesRequest\032\037.hbase.pb.GetTableNamesRes" +
+      "ponse\022Y\n\020GetClusterStatus\022!.hbase.pb.Get" +
+      "ClusterStatusRequest\032\".hbase.pb.GetClust" +
+      "erStatusResponse\022V\n\017IsMasterRunning\022 .hb" +
+      "ase.pb.IsMasterRunningRequest\032!.hbase.pb",
+      ".IsMasterRunningResponse\022D\n\tAddColumn\022\032." +
+      "hbase.pb.AddColumnRequest\032\033.hbase.pb.Add" +
+      "ColumnResponse\022M\n\014DeleteColumn\022\035.hbase.p" +
+      "b.DeleteColumnRequest\032\036.hbase.pb.DeleteC" +
+      "olumnResponse\022M\n\014ModifyColumn\022\035.hbase.pb" +
+      ".ModifyColumnRequest\032\036.hbase.pb.ModifyCo" +
+      "lumnResponse\022G\n\nMoveRegion\022\033.hbase.pb.Mo" +
+      "veRegionRequest\032\034.hbase.pb.MoveRegionRes" +
+      "ponse\022k\n\026DispatchMergingRegions\022\'.hbase." +
+      "pb.DispatchMergingRegionsRequest\032(.hbase",
+      ".pb.DispatchMergingRegionsResponse\022M\n\014As" +
+      "signRegion\022\035.hbase.pb.AssignRegionReques" +
+      "t\032\036.hbase.pb.AssignRegionResponse\022S\n\016Una" +
+      "ssignRegion\022\037.hbase.pb.UnassignRegionReq" +
+      "uest\032 .hbase.pb.UnassignRegionResponse\022P" +
+      "\n\rOfflineRegion\022\036.hbase.pb.OfflineRegion" +
+      "Request\032\037.hbase.pb.OfflineRegionResponse" +
+      "\022J\n\013DeleteTable\022\034.hbase.pb.DeleteTableRe" +
+      "quest\032\035.hbase.pb.DeleteTableResponse\022P\n\r" +
+      "truncateTable\022\036.hbase.pb.TruncateTableRe",
+      "quest\032\037.hbase.pb.TruncateTableResponse\022J" +
+      "\n\013EnableTable\022\034.hbase.pb.EnableTableRequ" +
+      "est\032\035.hbase.pb.EnableTableResponse\022M\n\014Di" +
+      "sableTable\022\035.hbase.pb.DisableTableReques" +
+      "t\032\036.hbase.pb.DisableTableResponse\022J\n\013Mod" +
+      "ifyTable\022\034.hbase.pb.ModifyTableRequest\032\035" +
+      ".hbase.pb.ModifyTableResponse\022J\n\013CreateT" +
+      "able\022\034.hbase.pb.CreateTableRequest\032\035.hba" +
+      "se.pb.CreateTableResponse\022A\n\010Shutdown\022\031." +
+      "hbase.pb.ShutdownRequest\032\032.hbase.pb.Shut",
+      "downResponse\022G\n\nStopMaster\022\033.hbase.pb.St" +
+      "opMasterRequest\032\034.hbase.pb.StopMasterRes" +
+      "ponse\022>\n\007Balance\022\030.hbase.pb.BalanceReque" +
+      "st\032\031.hbase.pb.BalanceResponse\022_\n\022SetBala" +
+      "ncerRunning\022#.hbase.pb.SetBalancerRunnin" +
+      "gRequest\032$.hbase.pb.SetBalancerRunningRe" +
+      "sponse\022\\\n\021IsBalancerEnabled\022\".hbase.pb.I" +
+      "sBalancerEnabledRequest\032#.hbase.pb.IsBal" +
+      "ancerEnabledResponse\022S\n\016RunCatalogScan\022\037" +
+      ".hbase.pb.RunCatalogScanRequest\032 .hbase.",
+      "pb.RunCatalogScanResponse\022e\n\024EnableCatal" +
+      "ogJanitor\022%.hbase.pb.EnableCatalogJanito" +
+      "rRequest\032&.hbase.pb.EnableCatalogJanitor" +
+      "Response\022n\n\027IsCatalogJanitorEnabled\022(.hb" +
+      "ase.pb.IsCatalogJanitorEnabledRequest\032)." +
+      "hbase.pb.IsCatalogJanitorEnabledResponse" +
+      "\022^\n\021ExecMasterService\022#.hbase.pb.Coproce" +
+      "ssorServiceRequest\032$.hbase.pb.Coprocesso" +
+      "rServiceResponse\022A\n\010Snapshot\022\031.hbase.pb." +
+      "SnapshotRequest\032\032.hbase.pb.SnapshotRespo",
+      "nse\022h\n\025GetCompletedSnapshots\022&.hbase.pb." +
+      "GetCompletedSnapshotsRequest\032\'.hbase.pb." +
+      "GetCompletedSnapshotsResponse\022S\n\016DeleteS" +
+      "napshot\022\037.hbase.pb.DeleteSnapshotRequest" +
+      "\032 .hbase.pb.DeleteSnapshotResponse\022S\n\016Is" +
+      "SnapshotDone\022\037.hbase.pb.IsSnapshotDoneRe" +
+      "quest\032 .hbase.pb.IsSnapshotDoneResponse\022" +
+      "V\n\017RestoreSnapshot\022 .hbase.pb.RestoreSna" +
+      "pshotRequest\032!.hbase.pb.RestoreSnapshotR" +
+      "esponse\022h\n\025IsRestoreSnapshotDone\022&.hbase",
+      ".pb.IsRestoreSnapshotDoneRequest\032\'.hbase" +
+      ".pb.IsRestoreSnapshotDoneResponse\022P\n\rExe" +
+      "cProcedure\022\036.hbase.pb.ExecProcedureReque" +
+      "st\032\037.hbase.pb.ExecProcedureResponse\022W\n\024E" +
+      "xecProcedureWithRet\022\036.hbase.pb.ExecProce" +
+      "dureRequest\032\037.hbase.pb.ExecProcedureResp" +
+      "onse\022V\n\017IsProcedureDone\022 .hbase.pb.IsPro" +
+      "cedureDoneRequest\032!.hbase.pb.IsProcedure" +
+      "DoneResponse\022V\n\017ModifyNamespace\022 .hbase." +
+      "pb.ModifyNamespaceRequest\032!.hbase.pb.Mod",
+      "ifyNamespaceResponse\022V\n\017CreateNamespace\022" +
+      " .hbase.pb.CreateNamespaceRequest\032!.hbas" +
+      "e.pb.CreateNamespaceResponse\022V\n\017DeleteNa" +
+      "mespace\022 .hbase.pb.DeleteNamespaceReques" +
+      "t\032!.hbase.pb.DeleteNamespaceResponse\022k\n\026" +
+      "GetNamespaceDescriptor\022\'.hbase.pb.GetNam" +
+      "espaceDescriptorRequest\032(.hbase.pb.GetNa" +
+      "mespaceDescriptorResponse\022q\n\030ListNamespa" +
+      "ceDescriptors\022).hbase.pb.ListNamespaceDe" +
+      "scriptorsRequest\032*.hbase.pb.ListNamespac",
+      "eDescriptorsResponse\022\206\001\n\037ListTableDescri" +
+      "ptorsByNamespace\0220.hbase.pb.ListTableDes" +
+      "criptorsByNamespaceRequest\0321.hbase.pb.Li" +
+      "stTableDescriptorsByNamespaceResponse\022t\n" +
+      "\031ListTableNamesByNamespace\022*.hbase.pb.Li" +
+      "stTableNamesByNamespaceRequest\032+.hbase.p" +
+      "b.ListTableNamesByNamespaceResponse\022P\n\rG" +
+      "etTableState\022\036.hbase.pb.GetTableStateReq" +
+      "uest\032\037.hbase.pb.GetTableStateResponse\022A\n" +
+      "\010SetQuota\022\031.hbase.pb.SetQuotaRequest\032\032.h",
+      "base.pb.SetQuotaResponse\022x\n\037getLastMajor" +
+      "CompactionTimestamp\022).hbase.pb.MajorComp" +
+      "actionTimestampRequest\032*.hbase.pb.MajorC" +
+      "ompactionTimestampResponse\022\212\001\n(getLastMa" +
+      "jorCompactionTimestampForRegion\0222.hbase." +
+      "pb.MajorCompactionTimestampForRegionRequ" +
+      "est\032*.hbase.pb.MajorCompactionTimestampR" +
+      "esponse\022_\n\022getProcedureResult\022#.hbase.pb" +
+      ".GetProcedureResultRequest\032$.hbase.pb.Ge" +
+      "tProcedureResultResponseBB\n*org.apache.h",
+      "adoop.hbase.protobuf.generatedB\014MasterPr" +
+      "otosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_AddColumnRequest_descriptor =
+          internal_static_hbase_pb_AddColumnRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_AddColumnRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_AddColumnRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AddColumnRequest_descriptor,
+              internal_static_hbase_pb_AddColumnRequest_descriptor,
               new java.lang.String[] { "TableName", "ColumnFamilies", "NonceGroup", "Nonce", });
-          internal_static_AddColumnResponse_descriptor =
+          internal_static_hbase_pb_AddColumnResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_AddColumnResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_AddColumnResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AddColumnResponse_descriptor,
+              internal_static_hbase_pb_AddColumnResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_DeleteColumnRequest_descriptor =
+          internal_static_hbase_pb_DeleteColumnRequest_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_DeleteColumnRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteColumnRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteColumnRequest_descriptor,
+              internal_static_hbase_pb_DeleteColumnRequest_descriptor,
               new java.lang.String[] { "TableName", "ColumnName", "NonceGroup", "Nonce", });
-          internal_static_DeleteColumnResponse_descriptor =
+          internal_static_hbase_pb_DeleteColumnResponse_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_DeleteColumnResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteColumnResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteColumnResponse_descriptor,
+              internal_static_hbase_pb_DeleteColumnResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_ModifyColumnRequest_descriptor =
+          internal_static_hbase_pb_ModifyColumnRequest_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_ModifyColumnRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyColumnRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyColumnRequest_descriptor,
+              internal_static_hbase_pb_ModifyColumnRequest_descriptor,
               new java.lang.String[] { "TableName", "ColumnFamilies", "NonceGroup", "Nonce", });
-          internal_static_ModifyColumnResponse_descriptor =
+          internal_static_hbase_pb_ModifyColumnResponse_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_ModifyColumnResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyColumnResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyColumnResponse_descriptor,
+              internal_static_hbase_pb_ModifyColumnResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_MoveRegionRequest_descriptor =
+          internal_static_hbase_pb_MoveRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_MoveRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MoveRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MoveRegionRequest_descriptor,
+              internal_static_hbase_pb_MoveRegionRequest_descriptor,
               new java.lang.String[] { "Region", "DestServerName", });
-          internal_static_MoveRegionResponse_descriptor =
+          internal_static_hbase_pb_MoveRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_MoveRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MoveRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MoveRegionResponse_descriptor,
+              internal_static_hbase_pb_MoveRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_DispatchMergingRegionsRequest_descriptor =
+          internal_static_hbase_pb_DispatchMergingRegionsRequest_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_DispatchMergingRegionsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_DispatchMergingRegionsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DispatchMergingRegionsRequest_descriptor,
+              internal_static_hbase_pb_DispatchMergingRegionsRequest_descriptor,
               new java.lang.String[] { "RegionA", "RegionB", "Forcible", });
-          internal_static_DispatchMergingRegionsResponse_descriptor =
+          internal_static_hbase_pb_DispatchMergingRegionsResponse_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_DispatchMergingRegionsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_DispatchMergingRegionsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DispatchMergingRegionsResponse_descriptor,
+              internal_static_hbase_pb_DispatchMergingRegionsResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_AssignRegionRequest_descriptor =
+          internal_static_hbase_pb_AssignRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_AssignRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_AssignRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AssignRegionRequest_descriptor,
+              internal_static_hbase_pb_AssignRegionRequest_descriptor,
               new java.lang.String[] { "Region", });
-          internal_static_AssignRegionResponse_descriptor =
+          internal_static_hbase_pb_AssignRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_AssignRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_AssignRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AssignRegionResponse_descriptor,
+              internal_static_hbase_pb_AssignRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_UnassignRegionRequest_descriptor =
+          internal_static_hbase_pb_UnassignRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_UnassignRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_UnassignRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UnassignRegionRequest_descriptor,
+              internal_static_hbase_pb_UnassignRegionRequest_descriptor,
               new java.lang.String[] { "Region", "Force", });
-          internal_static_UnassignRegionResponse_descriptor =
+          internal_static_hbase_pb_UnassignRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_UnassignRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_UnassignRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UnassignRegionResponse_descriptor,
+              internal_static_hbase_pb_UnassignRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_OfflineRegionRequest_descriptor =
+          internal_static_hbase_pb_OfflineRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(14);
-          internal_static_OfflineRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_OfflineRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_OfflineRegionRequest_descriptor,
+              internal_static_hbase_pb_OfflineRegionRequest_descriptor,
               new java.lang.String[] { "Region", });
-          internal_static_OfflineRegionResponse_descriptor =
+          internal_static_hbase_pb_OfflineRegionResponse_descriptor =
             getDescriptor().getMessageTypes().get(15);
-          internal_static_OfflineRegionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_OfflineRegionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_OfflineRegionResponse_descriptor,
+              internal_static_hbase_pb_OfflineRegionResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_CreateTableRequest_descriptor =
+          internal_static_hbase_pb_CreateTableRequest_descriptor =
             getDescriptor().getMessageTypes().get(16);
-          internal_static_CreateTableRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CreateTableRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CreateTableRequest_descriptor,
+              internal_static_hbase_pb_CreateTableRequest_descriptor,
               new java.lang.String[] { "TableSchema", "SplitKeys", "NonceGroup", "Nonce", });
-          internal_static_CreateTableResponse_descriptor =
+          internal_static_hbase_pb_CreateTableResponse_descriptor =
             getDescriptor().getMessageTypes().get(17);
-          internal_static_CreateTableResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CreateTableResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CreateTableResponse_descriptor,
+              internal_static_hbase_pb_CreateTableResponse_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_DeleteTableRequest_descriptor =
+          internal_static_hbase_pb_DeleteTableRequest_descriptor =
             getDescriptor().getMessageTypes().get(18);
-          internal_static_DeleteTableRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteTableRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteTableRequest_descriptor,
+              internal_static_hbase_pb_DeleteTableRequest_descriptor,
               new java.lang.String[] { "TableName", "NonceGroup", "Nonce", });
-          internal_static_DeleteTableResponse_descriptor =
+          internal_static_hbase_pb_DeleteTableResponse_descriptor =
             getDescriptor().getMessageTypes().get(19);
-          internal_static_DeleteTableResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteTableResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteTableResponse_descriptor,
+              internal_static_hbase_pb_DeleteTableResponse_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_TruncateTableRequest_descriptor =
+          internal_static_hbase_pb_TruncateTableRequest_descriptor =
             getDescriptor().getMessageTypes().get(20);
-          internal_static_TruncateTableRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_TruncateTableRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TruncateTableRequest_descriptor,
+              internal_static_hbase_pb_TruncateTableRequest_descriptor,
               new java.lang.String[] { "TableName", "PreserveSplits", "NonceGroup", "Nonce", });
-          internal_static_TruncateTableResponse_descriptor =
+          internal_static_hbase_pb_TruncateTableResponse_descriptor =
             getDescriptor().getMessageTypes().get(21);
-          internal_static_TruncateTableResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_TruncateTableResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TruncateTableResponse_descriptor,
+              internal_static_hbase_pb_TruncateTableResponse_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_EnableTableRequest_descriptor =
+          internal_static_hbase_pb_EnableTableRequest_descriptor =
             getDescriptor().getMessageTypes().get(22);
-          internal_static_EnableTableRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_EnableTableRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_EnableTableRequest_descriptor,
+              internal_static_hbase_pb_EnableTableRequest_descriptor,
               new java.lang.String[] { "TableName", "NonceGroup", "Nonce", });
-          internal_static_EnableTableResponse_descriptor =
+          internal_static_hbase_pb_EnableTableResponse_descriptor =
             getDescriptor().getMessageTypes().get(23);
-          internal_static_EnableTableResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_EnableTableResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_EnableTableResponse_descriptor,
+              internal_static_hbase_pb_EnableTableResponse_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_DisableTableRequest_descriptor =
+          internal_static_hbase_pb_DisableTableRequest_descriptor =
             getDescriptor().getMessageTypes().get(24);
-          internal_static_DisableTableRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_DisableTableRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DisableTableRequest_descriptor,
+              internal_static_hbase_pb_DisableTableRequest_descriptor,
               new java.lang.String[] { "TableName", "NonceGroup", "Nonce", });
-          internal_static_DisableTableResponse_descriptor =
+          internal_static_hbase_pb_DisableTableResponse_descriptor =
             getDescriptor().getMessageTypes().get(25);
-          internal_static_DisableTableResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_DisableTableResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DisableTableResponse_descriptor,
+              internal_static_hbase_pb_DisableTableResponse_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_ModifyTableRequest_descriptor =
+          internal_static_hbase_pb_ModifyTableRequest_descriptor =
             getDescriptor().getMessageTypes().get(26);
-          internal_static_ModifyTableRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyTableRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyTableRequest_descriptor,
+              internal_static_hbase_pb_ModifyTableRequest_descriptor,
               new java.lang.String[] { "TableName", "TableSchema", "NonceGroup", "Nonce", });
-          internal_static_ModifyTableResponse_descriptor =
+          internal_static_hbase_pb_ModifyTableResponse_descriptor =
             getDescriptor().getMessageTypes().get(27);
-          internal_static_ModifyTableResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyTableResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyTableResponse_descriptor,
+              internal_static_hbase_pb_ModifyTableResponse_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_CreateNamespaceRequest_descriptor =
+          internal_static_hbase_pb_CreateNamespaceRequest_descriptor =
             getDescriptor().getMessageTypes().get(28);
-          internal_static_CreateNamespaceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CreateNamespaceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CreateNamespaceRequest_descriptor,
+              internal_static_hbase_pb_CreateNamespaceRequest_descriptor,
               new java.lang.String[] { "NamespaceDescriptor", });
-          internal_static_CreateNamespaceResponse_descriptor =
+          internal_static_hbase_pb_CreateNamespaceResponse_descriptor =
             getDescriptor().getMessageTypes().get(29);
-          internal_static_CreateNamespaceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CreateNamespaceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CreateNamespaceResponse_descriptor,
+              internal_static_hbase_pb_CreateNamespaceResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_DeleteNamespaceRequest_descriptor =
+          internal_static_hbase_pb_DeleteNamespaceRequest_descriptor =
             getDescriptor().getMessageTypes().get(30);
-          internal_static_DeleteNamespaceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteNamespaceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteNamespaceRequest_descriptor,
+              internal_static_hbase_pb_DeleteNamespaceRequest_descriptor,
               new java.lang.String[] { "NamespaceName", });
-          internal_static_DeleteNamespaceResponse_descriptor =
+          internal_static_hbase_pb_DeleteNamespaceResponse_descriptor =
             getDescriptor().getMessageTypes().get(31);
-          internal_static_DeleteNamespaceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteNamespaceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteNamespaceResponse_descriptor,
+              internal_static_hbase_pb_DeleteNamespaceResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_ModifyNamespaceRequest_descriptor =
+          internal_static_hbase_pb_ModifyNamespaceRequest_descriptor =
             getDescriptor().getMessageTypes().get(32);
-          internal_static_ModifyNamespaceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyNamespaceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyNamespaceRequest_descriptor,
+              internal_static_hbase_pb_ModifyNamespaceRequest_descriptor,
               new java.lang.String[] { "NamespaceDescriptor", });
-          internal_static_ModifyNamespaceResponse_descriptor =
+          internal_static_hbase_pb_ModifyNamespaceResponse_descriptor =
             getDescriptor().getMessageTypes().get(33);
-          internal_static_ModifyNamespaceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ModifyNamespaceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ModifyNamespaceResponse_descriptor,
+              internal_static_hbase_pb_ModifyNamespaceResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_GetNamespaceDescriptorRequest_descriptor =
+          internal_static_hbase_pb_GetNamespaceDescriptorRequest_descriptor =
             getDescriptor().getMessageTypes().get(34);
-          internal_static_GetNamespaceDescriptorRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetNamespaceDescriptorRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetNamespaceDescriptorRequest_descriptor,
+              internal_static_hbase_pb_GetNamespaceDescriptorRequest_descriptor,
               new java.lang.String[] { "NamespaceName", });
-          internal_static_GetNamespaceDescriptorResponse_descriptor =
+          internal_static_hbase_pb_GetNamespaceDescriptorResponse_descriptor =
             getDescriptor().getMessageTypes().get(35);
-          internal_static_GetNamespaceDescriptorResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetNamespaceDescriptorResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetNamespaceDescriptorResponse_descriptor,
+              internal_static_hbase_pb_GetNamespaceDescriptorResponse_descriptor,
               new java.lang.String[] { "NamespaceDescriptor", });
-          internal_static_ListNamespaceDescriptorsRequest_descriptor =
+          internal_static_hbase_pb_ListNamespaceDescriptorsRequest_descriptor =
             getDescriptor().getMessageTypes().get(36);
-          internal_static_ListNamespaceDescriptorsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ListNamespaceDescriptorsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListNamespaceDescriptorsRequest_descriptor,
+              internal_static_hbase_pb_ListNamespaceDescriptorsRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_ListNamespaceDescriptorsResponse_descriptor =
+          internal_static_hbase_pb_ListNamespaceDescriptorsResponse_descriptor =
             getDescriptor().getMessageTypes().get(37);
-          internal_static_ListNamespaceDescriptorsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ListNamespaceDescriptorsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListNamespaceDescriptorsResponse_descriptor,
+              internal_static_hbase_pb_ListNamespaceDescriptorsResponse_descriptor,
               new java.lang.String[] { "NamespaceDescriptor", });
-          internal_static_ListTableDescriptorsByNamespaceRequest_descriptor =
+          internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_descriptor =
             getDescriptor().getMessageTypes().get(38);
-          internal_static_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListTableDescriptorsByNamespaceRequest_descriptor,
+              internal_static_hbase_pb_ListTableDescriptorsByNamespaceRequest_descriptor,
               new java.lang.String[] { "NamespaceName", });
-          internal_static_ListTableDescriptorsByNamespaceResponse_descriptor =
+          internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_descriptor =
             getDescriptor().getMessageTypes().get(39);
-          internal_static_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListTableDescriptorsByNamespaceResponse_descriptor,
+              internal_static_hbase_pb_ListTableDescriptorsByNamespaceResponse_descriptor,
               new java.lang.String[] { "TableSchema", });
-          internal_static_ListTableNamesByNamespaceRequest_descriptor =
+          internal_static_hbase_pb_ListTableNamesByNamespaceRequest_descriptor =
             getDescriptor().getMessageTypes().get(40);
-          internal_static_ListTableNamesByNamespaceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ListTableNamesByNamespaceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListTableNamesByNamespaceRequest_descriptor,
+              internal_static_hbase_pb_ListTableNamesByNamespaceRequest_descriptor,
               new java.lang.String[] { "NamespaceName", });
-          internal_static_ListTableNamesByNamespaceResponse_descriptor =
+          internal_static_hbase_pb_ListTableNamesByNamespaceResponse_descriptor =
             getDescriptor().getMessageTypes().get(41);
-          internal_static_ListTableNamesByNamespaceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ListTableNamesByNamespaceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListTableNamesByNamespaceResponse_descriptor,
+              internal_static_hbase_pb_ListTableNamesByNamespaceResponse_descriptor,
               new java.lang.String[] { "TableName", });
-          internal_static_ShutdownRequest_descriptor =
+          internal_static_hbase_pb_ShutdownRequest_descriptor =
             getDescriptor().getMessageTypes().get(42);
-          internal_static_ShutdownRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ShutdownRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ShutdownRequest_descriptor,
+              internal_static_hbase_pb_ShutdownRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_ShutdownResponse_descriptor =
+          internal_static_hbase_pb_ShutdownResponse_descriptor =
             getDescriptor().getMessageTypes().get(43);
-          internal_static_ShutdownResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ShutdownResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ShutdownResponse_descriptor,
+              internal_static_hbase_pb_ShutdownResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_StopMasterRequest_descriptor =
+          internal_static_hbase_pb_StopMasterRequest_descriptor =
             getDescriptor().getMessageTypes().get(44);
-          internal_static_StopMasterRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_StopMasterRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StopMasterRequest_descriptor,
+              internal_static_hbase_pb_StopMasterRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_StopMasterResponse_descriptor =
+          internal_static_hbase_pb_StopMasterResponse_descriptor =
             getDescriptor().getMessageTypes().get(45);
-          internal_static_StopMasterResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_StopMasterResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StopMasterResponse_descriptor,
+              internal_static_hbase_pb_StopMasterResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_BalanceRequest_descriptor =
+          internal_static_hbase_pb_BalanceRequest_descriptor =
             getDescriptor().getMessageTypes().get(46);
-          internal_static_BalanceRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_BalanceRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BalanceRequest_descriptor,
+              internal_static_hbase_pb_BalanceRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_BalanceResponse_descriptor =
+          internal_static_hbase_pb_BalanceResponse_descriptor =
             getDescriptor().getMessageTypes().get(47);
-          internal_static_BalanceResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_BalanceResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BalanceResponse_descriptor,
+              internal_static_hbase_pb_BalanceResponse_descriptor,
               new java.lang.String[] { "BalancerRan", });
-          internal_static_SetBalancerRunningRequest_descriptor =
+          internal_static_hbase_pb_SetBalancerRunningRequest_descriptor =
             getDescriptor().getMessageTypes().get(48);
-          internal_static_SetBalancerRunningRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_SetBalancerRunningRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SetBalancerRunningRequest_descriptor,
+              internal_static_hbase_pb_SetBalancerRunningRequest_descriptor,
               new java.lang.String[] { "On", "Synchronous", });
-          internal_static_SetBalancerRunningResponse_descriptor =
+          internal_static_hbase_pb_SetBalancerRunningResponse_descriptor =
             getDescriptor().getMessageTypes().get(49);
-          internal_static_SetBalancerRunningResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_SetBalancerRunningResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SetBalancerRunningResponse_descriptor,
+              internal_static_hbase_pb_SetBalancerRunningResponse_descriptor,
               new java.lang.String[] { "PrevBalanceValue", });
-          internal_static_IsBalancerEnabledRequest_descriptor =
+          internal_static_hbase_pb_IsBalancerEnabledRequest_descriptor =
             getDescriptor().getMessageTypes().get(50);
-          internal_static_IsBalancerEnabledRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_IsBalancerEnabledRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsBalancerEnabledRequest_descriptor,
+              internal_static_hbase_pb_IsBalancerEnabledRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_IsBalancerEnabledResponse_descriptor =
+          internal_static_hbase_pb_IsBalancerEnabledResponse_descriptor =
             getDescriptor().getMessageTypes().get(51);
-          internal_static_IsBalancerEnabledResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_IsBalancerEnabledResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsBalancerEnabledResponse_descriptor,
+              internal_static_hbase_pb_IsBalancerEnabledResponse_descriptor,
               new java.lang.String[] { "Enabled", });
-          internal_static_RunCatalogScanRequest_descriptor =
+          internal_static_hbase_pb_RunCatalogScanRequest_descriptor =
             getDescriptor().getMessageTypes().get(52);
-          internal_static_RunCatalogScanRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_RunCatalogScanRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RunCatalogScanRequest_descriptor,
+              internal_static_hbase_pb_RunCatalogScanRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_RunCatalogScanResponse_descriptor =
+          internal_static_hbase_pb_RunCatalogScanResponse_descriptor =
             getDescriptor().getMessageTypes().get(53);
-          internal_static_RunCatalogScanResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_RunCatalogScanResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RunCatalogScanResponse_descriptor,
+              internal_static_hbase_pb_RunCatalogScanResponse_descriptor,
               new java.lang.String[] { "ScanResult", });
-          internal_static_EnableCatalogJanitorRequest_descriptor =
+          internal_static_hbase_pb_EnableCatalogJanitorRequest_descriptor =
             getDescriptor().getMessageTypes().get(54);
-          internal_static_EnableCatalogJanitorRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_EnableCatalogJanitorRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_EnableCatalogJanitorRequest_descriptor,
+              internal_static_hbase_pb_EnableCatalogJanitorRequest_descriptor,
               new java.lang.String[] { "Enable", });
-          internal_static_EnableCatalogJanitorResponse_descriptor =
+          internal_static_hbase_pb_EnableCatalogJanitorResponse_descriptor =
             getDescriptor().getMessageTypes().get(55);
-          internal_static_EnableCatalogJanitorResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_EnableCatalogJanitorResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_EnableCatalogJanitorResponse_descriptor,
+              internal_static_hbase_pb_EnableCatalogJanitorResponse_descriptor,
               new java.lang.String[] { "PrevValue", });
-          internal_static_IsCatalogJanitorEnabledRequest_descriptor =
+          internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_descriptor =
             getDescriptor().getMessageTypes().get(56);
-          internal_static_IsCatalogJanitorEnabledRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsCatalogJanitorEnabledRequest_descriptor,
+              internal_static_hbase_pb_IsCatalogJanitorEnabledRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_IsCatalogJanitorEnabledResponse_descriptor =
+          internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_descriptor =
             getDescriptor().getMessageTypes().get(57);
-          internal_static_IsCatalogJanitorEnabledResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsCatalogJanitorEnabledResponse_descriptor,
+              internal_static_hbase_pb_IsCatalogJanitorEnabledResponse_descriptor,
               new java.lang.String[] { "Value", });
-          internal_static_SnapshotRequest_descriptor =
+          internal_static_hbase_pb_SnapshotRequest_descriptor =
             getDescriptor().getMessageTypes().get(58);
-          internal_static_SnapshotRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_SnapshotRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SnapshotRequest_descriptor,
+              internal_static_hbase_pb_SnapshotRequest_descriptor,
               new java.lang.String[] { "Snapshot", });
-          internal_static_SnapshotResponse_descriptor =
+          internal_static_hbase_pb_SnapshotResponse_descriptor =
             getDescriptor().getMessageTypes().get(59);
-          internal_static_SnapshotResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_SnapshotResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SnapshotResponse_descriptor,
+              internal_static_hbase_pb_SnapshotResponse_descriptor,
               new java.lang.String[] { "ExpectedTimeout", });
-          internal_static_GetCompletedSnapshotsRequest_descriptor =
+          internal_static_hbase_pb_GetCompletedSnapshotsRequest_descriptor =
             getDescriptor().getMessageTypes().get(60);
-          internal_static_GetCompletedSnapshotsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetCompletedSnapshotsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetCompletedSnapshotsRequest_descriptor,
+              internal_static_hbase_pb_GetCompletedSnapshotsRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_GetCompletedSnapshotsResponse_descriptor =
+          internal_static_hbase_pb_GetCompletedSnapshotsResponse_descriptor =
             getDescriptor().getMessageTypes().get(61);
-          internal_static_GetCompletedSnapshotsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetCompletedSnapshotsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetCompletedSnapshotsResponse_descriptor,
+              internal_static_hbase_pb_GetCompletedSnapshotsResponse_descriptor,
               new java.lang.String[] { "Snapshots", });
-          internal_static_DeleteSnapshotRequest_descriptor =
+          internal_static_hbase_pb_DeleteSnapshotRequest_descriptor =
             getDescriptor().getMessageTypes().get(62);
-          internal_static_DeleteSnapshotRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteSnapshotRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteSnapshotRequest_descriptor,
+              internal_static_hbase_pb_DeleteSnapshotRequest_descriptor,
               new java.lang.String[] { "Snapshot", });
-          internal_static_DeleteSnapshotResponse_descriptor =
+          internal_static_hbase_pb_DeleteSnapshotResponse_descriptor =
             getDescriptor().getMessageTypes().get(63);
-          internal_static_DeleteSnapshotResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_DeleteSnapshotResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeleteSnapshotResponse_descriptor,
+              internal_static_hbase_pb_DeleteSnapshotResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_RestoreSnapshotRequest_descriptor =
+          internal_static_hbase_pb_RestoreSnapshotRequest_descriptor =
             getDescriptor().getMessageTypes().get(64);
-          internal_static_RestoreSnapshotRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_RestoreSnapshotRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RestoreSnapshotRequest_descriptor,
+              internal_static_hbase_pb_RestoreSnapshotRequest_descriptor,
               new java.lang.String[] { "Snapshot", });
-          internal_static_RestoreSnapshotResponse_descriptor =
+          internal_static_hbase_pb_RestoreSnapshotResponse_descriptor =
             getDescriptor().getMessageTypes().get(65);
-          internal_static_RestoreSnapshotResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_RestoreSnapshotResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RestoreSnapshotResponse_descriptor,
+              internal_static_hbase_pb_RestoreSnapshotResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_IsSnapshotDoneRequest_descriptor =
+          internal_static_hbase_pb_IsSnapshotDoneRequest_descriptor =
             getDescriptor().getMessageTypes().get(66);
-          internal_static_IsSnapshotDoneRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_IsSnapshotDoneRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsSnapshotDoneRequest_descriptor,
+              internal_static_hbase_pb_IsSnapshotDoneRequest_descriptor,
               new java.lang.String[] { "Snapshot", });
-          internal_static_IsSnapshotDoneResponse_descriptor =
+          internal_static_hbase_pb_IsSnapshotDoneResponse_descriptor =
             getDescriptor().getMessageTypes().get(67);
-          internal_static_IsSnapshotDoneResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_IsSnapshotDoneResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsSnapshotDoneResponse_descriptor,
+              internal_static_hbase_pb_IsSnapshotDoneResponse_descriptor,
               new java.lang.String[] { "Done", "Snapshot", });
-          internal_static_IsRestoreSnapshotDoneRequest_descriptor =
+          internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_descriptor =
             getDescriptor().getMessageTypes().get(68);
-          internal_static_IsRestoreSnapshotDoneRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsRestoreSnapshotDoneRequest_descriptor,
+              internal_static_hbase_pb_IsRestoreSnapshotDoneRequest_descriptor,
               new java.lang.String[] { "Snapshot", });
-          internal_static_IsRestoreSnapshotDoneResponse_descriptor =
+          internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_descriptor =
             getDescriptor().getMessageTypes().get(69);
-          internal_static_IsRestoreSnapshotDoneResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsRestoreSnapshotDoneResponse_descriptor,
+              internal_static_hbase_pb_IsRestoreSnapshotDoneResponse_descriptor,
               new java.lang.String[] { "Done", });
-          internal_static_GetSchemaAlterStatusRequest_descriptor =
+          internal_static_hbase_pb_GetSchemaAlterStatusRequest_descriptor =
             getDescriptor().getMessageTypes().get(70);
-          internal_static_GetSchemaAlterStatusRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetSchemaAlterStatusRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetSchemaAlterStatusRequest_descriptor,
+              internal_static_hbase_pb_GetSchemaAlterStatusRequest_descriptor,
               new java.lang.String[] { "TableName", });
-          internal_static_GetSchemaAlterStatusResponse_descriptor =
+          internal_static_hbase_pb_GetSchemaAlterStatusResponse_descriptor =
             getDescriptor().getMessageTypes().get(71);
-          internal_static_GetSchemaAlterStatusResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetSchemaAlterStatusResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetSchemaAlterStatusResponse_descriptor,
+              internal_static_hbase_pb_GetSchemaAlterStatusResponse_descriptor,
               new java.lang.String[] { "YetToUpdateRegions", "TotalRegions", });
-          internal_static_GetTableDescriptorsRequest_descriptor =
+          internal_static_hbase_pb_GetTableDescriptorsRequest_descriptor =
             getDescriptor().getMessageTypes().get(72);
-          internal_static_GetTableDescriptorsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetTableDescriptorsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetTableDescriptorsRequest_descriptor,
+              internal_static_hbase_pb_GetTableDescriptorsRequest_descriptor,
               new java.lang.String[] { "TableNames", "Regex", "IncludeSysTables", "Namespace", });
-          internal_static_GetTableDescriptorsResponse_descriptor =
+          internal_static_hbase_pb_GetTableDescriptorsResponse_descriptor =
             getDescriptor().getMessageTypes().get(73);
-          internal_static_GetTableDescriptorsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetTableDescriptorsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetTableDescriptorsResponse_descriptor,
+              internal_static_hbase_pb_GetTableDescriptorsResponse_descriptor,
               new java.lang.String[] { "TableSchema", });
-          internal_static_GetTableNamesRequest_descriptor =
+          internal_static_hbase_pb_GetTableNamesRequest_descriptor =
             getDescriptor().getMessageTypes().get(74);
-          internal_static_GetTableNamesRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetTableNamesRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetTableNamesRequest_descriptor,
+              internal_static_hbase_pb_GetTableNamesRequest_descriptor,
               new java.lang.String[] { "Regex", "IncludeSysTables", "Namespace", });
-          internal_static_GetTableNamesResponse_descriptor =
+          internal_static_hbase_pb_GetTableNamesResponse_descriptor =
             getDescriptor().getMessageTypes().get(75);
-          internal_static_GetTableNamesResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetTableNamesResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetTableNamesResponse_descriptor,
+              internal_static_hbase_pb_GetTableNamesResponse_descriptor,
               new java.lang.String[] { "TableNames", });
-          internal_static_GetTableStateRequest_descriptor =
+          internal_static_hbase_pb_GetTableStateRequest_descriptor =
             getDescriptor().getMessageTypes().get(76);
-          internal_static_GetTableStateRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetTableStateRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetTableStateRequest_descriptor,
+              internal_static_hbase_pb_GetTableStateRequest_descriptor,
               new java.lang.String[] { "TableName", });
-          internal_static_GetTableStateResponse_descriptor =
+          internal_static_hbase_pb_GetTableStateResponse_descriptor =
             getDescriptor().getMessageTypes().get(77);
-          internal_static_GetTableStateResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetTableStateResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetTableStateResponse_descriptor,
+              internal_static_hbase_pb_GetTableStateResponse_descriptor,
               new java.lang.String[] { "TableState", });
-          internal_static_GetClusterStatusRequest_descriptor =
+          internal_static_hbase_pb_GetClusterStatusRequest_descriptor =
             getDescriptor().getMessageTypes().get(78);
-          internal_static_GetClusterStatusRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetClusterStatusRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetClusterStatusRequest_descriptor,
+              internal_static_hbase_pb_GetClusterStatusRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_GetClusterStatusResponse_descriptor =
+          internal_static_hbase_pb_GetClusterStatusResponse_descriptor =
             getDescriptor().getMessageTypes().get(79);
-          internal_static_GetClusterStatusResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetClusterStatusResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetClusterStatusResponse_descriptor,
+              internal_static_hbase_pb_GetClusterStatusResponse_descriptor,
               new java.lang.String[] { "ClusterStatus", });
-          internal_static_IsMasterRunningRequest_descriptor =
+          internal_static_hbase_pb_IsMasterRunningRequest_descriptor =
             getDescriptor().getMessageTypes().get(80);
-          internal_static_IsMasterRunningRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_IsMasterRunningRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsMasterRunningRequest_descriptor,
+              internal_static_hbase_pb_IsMasterRunningRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_IsMasterRunningResponse_descriptor =
+          internal_static_hbase_pb_IsMasterRunningResponse_descriptor =
             getDescriptor().getMessageTypes().get(81);
-          internal_static_IsMasterRunningResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_IsMasterRunningResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsMasterRunningResponse_descriptor,
+              internal_static_hbase_pb_IsMasterRunningResponse_descriptor,
               new java.lang.String[] { "IsMasterRunning", });
-          internal_static_ExecProcedureRequest_descriptor =
+          internal_static_hbase_pb_ExecProcedureRequest_descriptor =
             getDescriptor().getMessageTypes().get(82);
-          internal_static_ExecProcedureRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ExecProcedureRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ExecProcedureRequest_descriptor,
+              internal_static_hbase_pb_ExecProcedureRequest_descriptor,
               new java.lang.String[] { "Procedure", });
-          internal_static_ExecProcedureResponse_descriptor =
+          internal_static_hbase_pb_ExecProcedureResponse_descriptor =
             getDescriptor().getMessageTypes().get(83);
-          internal_static_ExecProcedureResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ExecProcedureResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ExecProcedureResponse_descriptor,
+              internal_static_hbase_pb_ExecProcedureResponse_descriptor,
               new java.lang.String[] { "ExpectedTimeout", "ReturnData", });
-          internal_static_IsProcedureDoneRequest_descriptor =
+          internal_static_hbase_pb_IsProcedureDoneRequest_descriptor =
             getDescriptor().getMessageTypes().get(84);
-          internal_static_IsProcedureDoneRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_IsProcedureDoneRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsProcedureDoneRequest_descriptor,
+              internal_static_hbase_pb_IsProcedureDoneRequest_descriptor,
               new java.lang.String[] { "Procedure", });
-          internal_static_IsProcedureDoneResponse_descriptor =
+          internal_static_hbase_pb_IsProcedureDoneResponse_descriptor =
             getDescriptor().getMessageTypes().get(85);
-          internal_static_IsProcedureDoneResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_IsProcedureDoneResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_IsProcedureDoneResponse_descriptor,
+              internal_static_hbase_pb_IsProcedureDoneResponse_descriptor,
               new java.lang.String[] { "Done", "Snapshot", });
-          internal_static_GetProcedureResultRequest_descriptor =
+          internal_static_hbase_pb_GetProcedureResultRequest_descriptor =
             getDescriptor().getMessageTypes().get(86);
-          internal_static_GetProcedureResultRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetProcedureResultRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetProcedureResultRequest_descriptor,
+              internal_static_hbase_pb_GetProcedureResultRequest_descriptor,
               new java.lang.String[] { "ProcId", });
-          internal_static_GetProcedureResultResponse_descriptor =
+          internal_static_hbase_pb_GetProcedureResultResponse_descriptor =
             getDescriptor().getMessageTypes().get(87);
-          internal_static_GetProcedureResultResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetProcedureResultResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetProcedureResultResponse_descriptor,
+              internal_static_hbase_pb_GetProcedureResultResponse_descriptor,
               new java.lang.String[] { "State", "StartTime", "LastUpdate", "Result", "Exception", });
-          internal_static_SetQuotaRequest_descriptor =
+          internal_static_hbase_pb_SetQuotaRequest_descriptor =
             getDescriptor().getMessageTypes().get(88);
-          internal_static_SetQuotaRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_SetQuotaRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SetQuotaRequest_descriptor,
+              internal_static_hbase_pb_SetQuotaRequest_descriptor,
               new java.lang.String[] { "UserName", "UserGroup", "Namespace", "TableName", "RemoveAll", "BypassGlobals", "Throttle", });
-          internal_static_SetQuotaResponse_descriptor =
+          internal_static_hbase_pb_SetQuotaResponse_descriptor =
             getDescriptor().getMessageTypes().get(89);
-          internal_static_SetQuotaResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_SetQuotaResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SetQuotaResponse_descriptor,
+              internal_static_hbase_pb_SetQuotaResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_MajorCompactionTimestampRequest_descriptor =
+          internal_static_hbase_pb_MajorCompactionTimestampRequest_descriptor =
             getDescriptor().getMessageTypes().get(90);
-          internal_static_MajorCompactionTimestampRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MajorCompactionTimestampRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MajorCompactionTimestampRequest_descriptor,
+              internal_static_hbase_pb_MajorCompactionTimestampRequest_descriptor,
               new java.lang.String[] { "TableName", });
-          internal_static_MajorCompactionTimestampForRegionRequest_descriptor =
+          internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_descriptor =
             getDescriptor().getMessageTypes().get(91);
-          internal_static_MajorCompactionTimestampForRegionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MajorCompactionTimestampForRegionRequest_descriptor,
+              internal_static_hbase_pb_MajorCompactionTimestampForRegionRequest_descriptor,
               new java.lang.String[] { "Region", });
-          internal_static_MajorCompactionTimestampResponse_descriptor =
+          internal_static_hbase_pb_MajorCompactionTimestampResponse_descriptor =
             getDescriptor().getMessageTypes().get(92);
-          internal_static_MajorCompactionTimestampResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MajorCompactionTimestampResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MajorCompactionTimestampResponse_descriptor,
+              internal_static_hbase_pb_MajorCompactionTimestampResponse_descriptor,
               new java.lang.String[] { "CompactionTimestamp", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutationProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutationProtos.java
index 3010ff98206..37b8f3b4ac8 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutationProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutationProtos.java
@@ -12,7 +12,7 @@ public final class MultiRowMutationProtos {
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code MultiRowMutationProcessorRequest}
+   * Protobuf type {@code hbase.pb.MultiRowMutationProcessorRequest}
    */
   public static final class MultiRowMutationProcessorRequest extends
       com.google.protobuf.GeneratedMessage
@@ -75,12 +75,12 @@ public final class MultiRowMutationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorRequest.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorRequest.Builder.class);
     }
@@ -231,19 +231,19 @@ public final class MultiRowMutationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultiRowMutationProcessorRequest}
+     * Protobuf type {@code hbase.pb.MultiRowMutationProcessorRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorRequest.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorRequest.Builder.class);
       }
@@ -277,7 +277,7 @@ public final class MultiRowMutationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorRequest getDefaultInstanceForType() {
@@ -335,7 +335,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultiRowMutationProcessorRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultiRowMutationProcessorRequest)
     }
 
     static {
@@ -343,14 +343,14 @@ public final class MultiRowMutationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultiRowMutationProcessorRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiRowMutationProcessorRequest)
   }
 
   public interface MultiRowMutationProcessorResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code MultiRowMutationProcessorResponse}
+   * Protobuf type {@code hbase.pb.MultiRowMutationProcessorResponse}
    */
   public static final class MultiRowMutationProcessorResponse extends
       com.google.protobuf.GeneratedMessage
@@ -413,12 +413,12 @@ public final class MultiRowMutationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorResponse.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorResponse.Builder.class);
     }
@@ -569,19 +569,19 @@ public final class MultiRowMutationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultiRowMutationProcessorResponse}
+     * Protobuf type {@code hbase.pb.MultiRowMutationProcessorResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorResponse.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorResponse.Builder.class);
       }
@@ -615,7 +615,7 @@ public final class MultiRowMutationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MultiRowMutationProcessorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MultiRowMutationProcessorResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MultiRowMutationProcessorResponse getDefaultInstanceForType() {
@@ -673,7 +673,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultiRowMutationProcessorResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultiRowMutationProcessorResponse)
     }
 
     static {
@@ -681,33 +681,33 @@ public final class MultiRowMutationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultiRowMutationProcessorResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiRowMutationProcessorResponse)
   }
 
   public interface MutateRowsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .MutationProto mutation_request = 1;
+    // repeated .hbase.pb.MutationProto mutation_request = 1;
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     java.util.List 
         getMutationRequestList();
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutationRequest(int index);
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     int getMutationRequestCount();
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     java.util.List 
         getMutationRequestOrBuilderList();
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationRequestOrBuilder(
         int index);
@@ -733,7 +733,7 @@ public final class MultiRowMutationProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code MutateRowsRequest}
+   * Protobuf type {@code hbase.pb.MutateRowsRequest}
    */
   public static final class MutateRowsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -818,12 +818,12 @@ public final class MultiRowMutationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsRequest.Builder.class);
     }
@@ -844,36 +844,36 @@ public final class MultiRowMutationProtos {
     }
 
     private int bitField0_;
-    // repeated .MutationProto mutation_request = 1;
+    // repeated .hbase.pb.MutationProto mutation_request = 1;
     public static final int MUTATION_REQUEST_FIELD_NUMBER = 1;
     private java.util.List mutationRequest_;
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     public java.util.List getMutationRequestList() {
       return mutationRequest_;
     }
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     public java.util.List 
         getMutationRequestOrBuilderList() {
       return mutationRequest_;
     }
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     public int getMutationRequestCount() {
       return mutationRequest_.size();
     }
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutationRequest(int index) {
       return mutationRequest_.get(index);
     }
     /**
-     * repeated .MutationProto mutation_request = 1;
+     * repeated .hbase.pb.MutationProto mutation_request = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationRequestOrBuilder(
         int index) {
@@ -1097,19 +1097,19 @@ public final class MultiRowMutationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MutateRowsRequest}
+     * Protobuf type {@code hbase.pb.MutateRowsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsRequest.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsRequest.Builder.class);
       }
@@ -1154,7 +1154,7 @@ public final class MultiRowMutationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsRequest getDefaultInstanceForType() {
@@ -1271,7 +1271,7 @@ public final class MultiRowMutationProtos {
       }
       private int bitField0_;
 
-      // repeated .MutationProto mutation_request = 1;
+      // repeated .hbase.pb.MutationProto mutation_request = 1;
       private java.util.List mutationRequest_ =
         java.util.Collections.emptyList();
       private void ensureMutationRequestIsMutable() {
@@ -1285,7 +1285,7 @@ public final class MultiRowMutationProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder> mutationRequestBuilder_;
 
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public java.util.List getMutationRequestList() {
         if (mutationRequestBuilder_ == null) {
@@ -1295,7 +1295,7 @@ public final class MultiRowMutationProtos {
         }
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public int getMutationRequestCount() {
         if (mutationRequestBuilder_ == null) {
@@ -1305,7 +1305,7 @@ public final class MultiRowMutationProtos {
         }
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto getMutationRequest(int index) {
         if (mutationRequestBuilder_ == null) {
@@ -1315,7 +1315,7 @@ public final class MultiRowMutationProtos {
         }
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder setMutationRequest(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
@@ -1332,7 +1332,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder setMutationRequest(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder builderForValue) {
@@ -1346,7 +1346,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder addMutationRequest(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
         if (mutationRequestBuilder_ == null) {
@@ -1362,7 +1362,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder addMutationRequest(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto value) {
@@ -1379,7 +1379,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder addMutationRequest(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder builderForValue) {
@@ -1393,7 +1393,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder addMutationRequest(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder builderForValue) {
@@ -1407,7 +1407,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder addAllMutationRequest(
           java.lang.Iterable values) {
@@ -1421,7 +1421,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder clearMutationRequest() {
         if (mutationRequestBuilder_ == null) {
@@ -1434,7 +1434,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public Builder removeMutationRequest(int index) {
         if (mutationRequestBuilder_ == null) {
@@ -1447,14 +1447,14 @@ public final class MultiRowMutationProtos {
         return this;
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder getMutationRequestBuilder(
           int index) {
         return getMutationRequestFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProtoOrBuilder getMutationRequestOrBuilder(
           int index) {
@@ -1464,7 +1464,7 @@ public final class MultiRowMutationProtos {
         }
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public java.util.List 
            getMutationRequestOrBuilderList() {
@@ -1475,14 +1475,14 @@ public final class MultiRowMutationProtos {
         }
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder addMutationRequestBuilder() {
         return getMutationRequestFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.getDefaultInstance());
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Builder addMutationRequestBuilder(
           int index) {
@@ -1490,7 +1490,7 @@ public final class MultiRowMutationProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.getDefaultInstance());
       }
       /**
-       * repeated .MutationProto mutation_request = 1;
+       * repeated .hbase.pb.MutationProto mutation_request = 1;
        */
       public java.util.List 
            getMutationRequestBuilderList() {
@@ -1577,7 +1577,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MutateRowsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MutateRowsRequest)
     }
 
     static {
@@ -1585,14 +1585,14 @@ public final class MultiRowMutationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MutateRowsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MutateRowsRequest)
   }
 
   public interface MutateRowsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code MutateRowsResponse}
+   * Protobuf type {@code hbase.pb.MutateRowsResponse}
    */
   public static final class MutateRowsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1655,12 +1655,12 @@ public final class MultiRowMutationProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsResponse.Builder.class);
     }
@@ -1811,19 +1811,19 @@ public final class MultiRowMutationProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MutateRowsResponse}
+     * Protobuf type {@code hbase.pb.MutateRowsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsResponse.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsResponse.Builder.class);
       }
@@ -1857,7 +1857,7 @@ public final class MultiRowMutationProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_MutateRowsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.internal_static_hbase_pb_MutateRowsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.MultiRowMutationProtos.MutateRowsResponse getDefaultInstanceForType() {
@@ -1915,7 +1915,7 @@ public final class MultiRowMutationProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MutateRowsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MutateRowsResponse)
     }
 
     static {
@@ -1923,11 +1923,11 @@ public final class MultiRowMutationProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MutateRowsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MutateRowsResponse)
   }
 
   /**
-   * Protobuf service {@code MultiRowMutationService}
+   * Protobuf service {@code hbase.pb.MultiRowMutationService}
    */
   public static abstract class MultiRowMutationService
       implements com.google.protobuf.Service {
@@ -1935,7 +1935,7 @@ public final class MultiRowMutationProtos {
 
     public interface Interface {
       /**
-       * rpc MutateRows(.MutateRowsRequest) returns (.MutateRowsResponse);
+       * rpc MutateRows(.hbase.pb.MutateRowsRequest) returns (.hbase.pb.MutateRowsResponse);
        */
       public abstract void mutateRows(
           com.google.protobuf.RpcController controller,
@@ -2020,7 +2020,7 @@ public final class MultiRowMutationProtos {
     }
 
     /**
-     * rpc MutateRows(.MutateRowsRequest) returns (.MutateRowsResponse);
+     * rpc MutateRows(.hbase.pb.MutateRowsRequest) returns (.hbase.pb.MutateRowsResponse);
      */
     public abstract void mutateRows(
         com.google.protobuf.RpcController controller,
@@ -2155,29 +2155,29 @@ public final class MultiRowMutationProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:MultiRowMutationService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiRowMutationService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultiRowMutationProcessorRequest_descriptor;
+    internal_static_hbase_pb_MultiRowMutationProcessorRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultiRowMutationProcessorRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MultiRowMutationProcessorRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultiRowMutationProcessorResponse_descriptor;
+    internal_static_hbase_pb_MultiRowMutationProcessorResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultiRowMutationProcessorResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MultiRowMutationProcessorResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutateRowsRequest_descriptor;
+    internal_static_hbase_pb_MutateRowsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutateRowsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_MutateRowsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MutateRowsResponse_descriptor;
+    internal_static_hbase_pb_MutateRowsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MutateRowsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_MutateRowsResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2187,45 +2187,46 @@ public final class MultiRowMutationProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026MultiRowMutation.proto\032\014Client.proto\"\"" +
-      "\n MultiRowMutationProcessorRequest\"#\n!Mu" +
-      "ltiRowMutationProcessorResponse\"a\n\021Mutat" +
-      "eRowsRequest\022(\n\020mutation_request\030\001 \003(\0132\016" +
-      ".MutationProto\022\023\n\013nonce_group\030\002 \001(\004\022\r\n\005n" +
-      "once\030\003 \001(\004\"\024\n\022MutateRowsResponse2P\n\027Mult" +
-      "iRowMutationService\0225\n\nMutateRows\022\022.Muta" +
-      "teRowsRequest\032\023.MutateRowsResponseBL\n*or" +
-      "g.apache.hadoop.hbase.protobuf.generated" +
-      "B\026MultiRowMutationProtosH\001\210\001\001\240\001\001"
+      "\n\026MultiRowMutation.proto\022\010hbase.pb\032\014Clie" +
+      "nt.proto\"\"\n MultiRowMutationProcessorReq" +
+      "uest\"#\n!MultiRowMutationProcessorRespons" +
+      "e\"j\n\021MutateRowsRequest\0221\n\020mutation_reque" +
+      "st\030\001 \003(\0132\027.hbase.pb.MutationProto\022\023\n\013non" +
+      "ce_group\030\002 \001(\004\022\r\n\005nonce\030\003 \001(\004\"\024\n\022MutateR" +
+      "owsResponse2b\n\027MultiRowMutationService\022G" +
+      "\n\nMutateRows\022\033.hbase.pb.MutateRowsReques" +
+      "t\032\034.hbase.pb.MutateRowsResponseBL\n*org.a" +
+      "pache.hadoop.hbase.protobuf.generatedB\026M",
+      "ultiRowMutationProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_MultiRowMutationProcessorRequest_descriptor =
+          internal_static_hbase_pb_MultiRowMutationProcessorRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_MultiRowMutationProcessorRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MultiRowMutationProcessorRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultiRowMutationProcessorRequest_descriptor,
+              internal_static_hbase_pb_MultiRowMutationProcessorRequest_descriptor,
               new java.lang.String[] { });
-          internal_static_MultiRowMutationProcessorResponse_descriptor =
+          internal_static_hbase_pb_MultiRowMutationProcessorResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_MultiRowMutationProcessorResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MultiRowMutationProcessorResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultiRowMutationProcessorResponse_descriptor,
+              internal_static_hbase_pb_MultiRowMutationProcessorResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_MutateRowsRequest_descriptor =
+          internal_static_hbase_pb_MutateRowsRequest_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_MutateRowsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_MutateRowsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutateRowsRequest_descriptor,
+              internal_static_hbase_pb_MutateRowsRequest_descriptor,
               new java.lang.String[] { "MutationRequest", "NonceGroup", "Nonce", });
-          internal_static_MutateRowsResponse_descriptor =
+          internal_static_hbase_pb_MutateRowsResponse_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_MutateRowsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_MutateRowsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MutateRowsResponse_descriptor,
+              internal_static_hbase_pb_MutateRowsResponse_descriptor,
               new java.lang.String[] { });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ProcedureProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ProcedureProtos.java
index d9d6ccb8dae..89f6f1b66cd 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ProcedureProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ProcedureProtos.java
@@ -9,7 +9,7 @@ public final class ProcedureProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code ProcedureState}
+   * Protobuf enum {@code hbase.pb.ProcedureState}
    */
   public enum ProcedureState
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -171,7 +171,7 @@ public final class ProcedureProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:ProcedureState)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.ProcedureState)
   }
 
   public interface ProcedureOrBuilder
@@ -257,9 +257,9 @@ public final class ProcedureProtos {
     com.google.protobuf.ByteString
         getOwnerBytes();
 
-    // required .ProcedureState state = 6;
+    // required .hbase.pb.ProcedureState state = 6;
     /**
-     * required .ProcedureState state = 6;
+     * required .hbase.pb.ProcedureState state = 6;
      *
      * 
      * internal "runtime" state
@@ -267,7 +267,7 @@ public final class ProcedureProtos {
      */
     boolean hasState();
     /**
-     * required .ProcedureState state = 6;
+     * required .hbase.pb.ProcedureState state = 6;
      *
      * 
      * internal "runtime" state
@@ -321,9 +321,9 @@ public final class ProcedureProtos {
      */
     int getTimeout();
 
-    // optional .ForeignExceptionMessage exception = 10;
+    // optional .hbase.pb.ForeignExceptionMessage exception = 10;
     /**
-     * optional .ForeignExceptionMessage exception = 10;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 10;
      *
      * 
      * user state/results
@@ -331,7 +331,7 @@ public final class ProcedureProtos {
      */
     boolean hasException();
     /**
-     * optional .ForeignExceptionMessage exception = 10;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 10;
      *
      * 
      * user state/results
@@ -339,7 +339,7 @@ public final class ProcedureProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage getException();
     /**
-     * optional .ForeignExceptionMessage exception = 10;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 10;
      *
      * 
      * user state/results
@@ -412,7 +412,7 @@ public final class ProcedureProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code Procedure}
+   * Protobuf type {@code hbase.pb.Procedure}
    *
    * 
    **
@@ -584,12 +584,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_Procedure_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_Procedure_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_Procedure_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_Procedure_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder.class);
     }
@@ -764,11 +764,11 @@ public final class ProcedureProtos {
       }
     }
 
-    // required .ProcedureState state = 6;
+    // required .hbase.pb.ProcedureState state = 6;
     public static final int STATE_FIELD_NUMBER = 6;
     private org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureState state_;
     /**
-     * required .ProcedureState state = 6;
+     * required .hbase.pb.ProcedureState state = 6;
      *
      * 
      * internal "runtime" state
@@ -778,7 +778,7 @@ public final class ProcedureProtos {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * required .ProcedureState state = 6;
+     * required .hbase.pb.ProcedureState state = 6;
      *
      * 
      * internal "runtime" state
@@ -855,11 +855,11 @@ public final class ProcedureProtos {
       return timeout_;
     }
 
-    // optional .ForeignExceptionMessage exception = 10;
+    // optional .hbase.pb.ForeignExceptionMessage exception = 10;
     public static final int EXCEPTION_FIELD_NUMBER = 10;
     private org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage exception_;
     /**
-     * optional .ForeignExceptionMessage exception = 10;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 10;
      *
      * 
      * user state/results
@@ -869,7 +869,7 @@ public final class ProcedureProtos {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * optional .ForeignExceptionMessage exception = 10;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 10;
      *
      * 
      * user state/results
@@ -879,7 +879,7 @@ public final class ProcedureProtos {
       return exception_;
     }
     /**
-     * optional .ForeignExceptionMessage exception = 10;
+     * optional .hbase.pb.ForeignExceptionMessage exception = 10;
      *
      * 
      * user state/results
@@ -1368,7 +1368,7 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Procedure}
+     * Protobuf type {@code hbase.pb.Procedure}
      *
      * 
      **
@@ -1380,12 +1380,12 @@ public final class ProcedureProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_Procedure_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_Procedure_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_Procedure_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_Procedure_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder.class);
       }
@@ -1452,7 +1452,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_Procedure_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_Procedure_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure getDefaultInstanceForType() {
@@ -1935,10 +1935,10 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // required .ProcedureState state = 6;
+      // required .hbase.pb.ProcedureState state = 6;
       private org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureState state_ = org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureState.INITIALIZING;
       /**
-       * required .ProcedureState state = 6;
+       * required .hbase.pb.ProcedureState state = 6;
        *
        * 
        * internal "runtime" state
@@ -1948,7 +1948,7 @@ public final class ProcedureProtos {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * required .ProcedureState state = 6;
+       * required .hbase.pb.ProcedureState state = 6;
        *
        * 
        * internal "runtime" state
@@ -1958,7 +1958,7 @@ public final class ProcedureProtos {
         return state_;
       }
       /**
-       * required .ProcedureState state = 6;
+       * required .hbase.pb.ProcedureState state = 6;
        *
        * 
        * internal "runtime" state
@@ -1974,7 +1974,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * required .ProcedureState state = 6;
+       * required .hbase.pb.ProcedureState state = 6;
        *
        * 
        * internal "runtime" state
@@ -2147,12 +2147,12 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // optional .ForeignExceptionMessage exception = 10;
+      // optional .hbase.pb.ForeignExceptionMessage exception = 10;
       private org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage exception_ = org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage.Builder, org.apache.hadoop.hbase.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessageOrBuilder> exceptionBuilder_;
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2162,7 +2162,7 @@ public final class ProcedureProtos {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2176,7 +2176,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2196,7 +2196,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2214,7 +2214,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2237,7 +2237,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2254,7 +2254,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2266,7 +2266,7 @@ public final class ProcedureProtos {
         return getExceptionFieldBuilder().getBuilder();
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2280,7 +2280,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * optional .ForeignExceptionMessage exception = 10;
+       * optional .hbase.pb.ForeignExceptionMessage exception = 10;
        *
        * 
        * user state/results
@@ -2486,7 +2486,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Procedure)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Procedure)
     }
 
     static {
@@ -2494,7 +2494,7 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Procedure)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Procedure)
   }
 
   public interface SequentialProcedureDataOrBuilder
@@ -2511,7 +2511,7 @@ public final class ProcedureProtos {
     boolean getExecuted();
   }
   /**
-   * Protobuf type {@code SequentialProcedureData}
+   * Protobuf type {@code hbase.pb.SequentialProcedureData}
    *
    * 
    **
@@ -2585,12 +2585,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_SequentialProcedureData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_SequentialProcedureData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_SequentialProcedureData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_SequentialProcedureData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.SequentialProcedureData.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.SequentialProcedureData.Builder.class);
     }
@@ -2779,7 +2779,7 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SequentialProcedureData}
+     * Protobuf type {@code hbase.pb.SequentialProcedureData}
      *
      * 
      **
@@ -2791,12 +2791,12 @@ public final class ProcedureProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.SequentialProcedureDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_SequentialProcedureData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_SequentialProcedureData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_SequentialProcedureData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_SequentialProcedureData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.SequentialProcedureData.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.SequentialProcedureData.Builder.class);
       }
@@ -2832,7 +2832,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_SequentialProcedureData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_SequentialProcedureData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.SequentialProcedureData getDefaultInstanceForType() {
@@ -2938,7 +2938,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SequentialProcedureData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SequentialProcedureData)
     }
 
     static {
@@ -2946,7 +2946,7 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SequentialProcedureData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SequentialProcedureData)
   }
 
   public interface StateMachineProcedureDataOrBuilder
@@ -2967,7 +2967,7 @@ public final class ProcedureProtos {
     int getState(int index);
   }
   /**
-   * Protobuf type {@code StateMachineProcedureData}
+   * Protobuf type {@code hbase.pb.StateMachineProcedureData}
    *
    * 
    **
@@ -3060,12 +3060,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_StateMachineProcedureData_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_StateMachineProcedureData_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_StateMachineProcedureData_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_StateMachineProcedureData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData.Builder.class);
     }
@@ -3258,7 +3258,7 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StateMachineProcedureData}
+     * Protobuf type {@code hbase.pb.StateMachineProcedureData}
      *
      * 
      **
@@ -3270,12 +3270,12 @@ public final class ProcedureProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_StateMachineProcedureData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_StateMachineProcedureData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_StateMachineProcedureData_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_StateMachineProcedureData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData.Builder.class);
       }
@@ -3311,7 +3311,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_StateMachineProcedureData_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_StateMachineProcedureData_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData getDefaultInstanceForType() {
@@ -3452,7 +3452,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StateMachineProcedureData)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StateMachineProcedureData)
     }
 
     static {
@@ -3460,7 +3460,7 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StateMachineProcedureData)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StateMachineProcedureData)
   }
 
   public interface ProcedureWALHeaderOrBuilder
@@ -3507,7 +3507,7 @@ public final class ProcedureProtos {
     long getMinProcId();
   }
   /**
-   * Protobuf type {@code ProcedureWALHeader}
+   * Protobuf type {@code hbase.pb.ProcedureWALHeader}
    *
    * 
    **
@@ -3596,12 +3596,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALHeader_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALHeader_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALHeader_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALHeader.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALHeader.Builder.class);
     }
@@ -3901,7 +3901,7 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcedureWALHeader}
+     * Protobuf type {@code hbase.pb.ProcedureWALHeader}
      *
      * 
      **
@@ -3913,12 +3913,12 @@ public final class ProcedureProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALHeaderOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALHeader_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALHeader_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALHeader_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALHeader.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALHeader.Builder.class);
       }
@@ -3960,7 +3960,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALHeader_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALHeader getDefaultInstanceForType() {
@@ -4198,7 +4198,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcedureWALHeader)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcedureWALHeader)
     }
 
     static {
@@ -4206,7 +4206,7 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcedureWALHeader)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcedureWALHeader)
   }
 
   public interface ProcedureWALTrailerOrBuilder
@@ -4233,7 +4233,7 @@ public final class ProcedureProtos {
     long getTrackerPos();
   }
   /**
-   * Protobuf type {@code ProcedureWALTrailer}
+   * Protobuf type {@code hbase.pb.ProcedureWALTrailer}
    *
    * 
    **
@@ -4312,12 +4312,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALTrailer_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALTrailer_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALTrailer_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALTrailer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALTrailer.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALTrailer.Builder.class);
     }
@@ -4543,7 +4543,7 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcedureWALTrailer}
+     * Protobuf type {@code hbase.pb.ProcedureWALTrailer}
      *
      * 
      **
@@ -4555,12 +4555,12 @@ public final class ProcedureProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALTrailerOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALTrailer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALTrailer_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALTrailer_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALTrailer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALTrailer.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALTrailer.Builder.class);
       }
@@ -4598,7 +4598,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALTrailer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALTrailer_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALTrailer getDefaultInstanceForType() {
@@ -4748,7 +4748,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcedureWALTrailer)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcedureWALTrailer)
     }
 
     static {
@@ -4756,39 +4756,39 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcedureWALTrailer)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcedureWALTrailer)
   }
 
   public interface ProcedureStoreTrackerOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .ProcedureStoreTracker.TrackerNode node = 1;
+    // repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     java.util.List 
         getNodeList();
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode getNode(int index);
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     int getNodeCount();
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     java.util.List 
         getNodeOrBuilderList();
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNodeOrBuilder getNodeOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ProcedureStoreTracker}
+   * Protobuf type {@code hbase.pb.ProcedureStoreTracker}
    */
   public static final class ProcedureStoreTracker extends
       com.google.protobuf.GeneratedMessage
@@ -4863,12 +4863,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.Builder.class);
     }
@@ -4930,7 +4930,7 @@ public final class ProcedureProtos {
       long getDeleted(int index);
     }
     /**
-     * Protobuf type {@code ProcedureStoreTracker.TrackerNode}
+     * Protobuf type {@code hbase.pb.ProcedureStoreTracker.TrackerNode}
      */
     public static final class TrackerNode extends
         com.google.protobuf.GeneratedMessage
@@ -5047,12 +5047,12 @@ public final class ProcedureProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_TrackerNode_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_TrackerNode_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder.class);
       }
@@ -5325,19 +5325,19 @@ public final class ProcedureProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code ProcedureStoreTracker.TrackerNode}
+       * Protobuf type {@code hbase.pb.ProcedureStoreTracker.TrackerNode}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNodeOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_TrackerNode_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_TrackerNode_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder.class);
         }
@@ -5377,7 +5377,7 @@ public final class ProcedureProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_TrackerNode_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode getDefaultInstanceForType() {
@@ -5645,7 +5645,7 @@ public final class ProcedureProtos {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:ProcedureStoreTracker.TrackerNode)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.ProcedureStoreTracker.TrackerNode)
       }
 
       static {
@@ -5653,39 +5653,39 @@ public final class ProcedureProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:ProcedureStoreTracker.TrackerNode)
+      // @@protoc_insertion_point(class_scope:hbase.pb.ProcedureStoreTracker.TrackerNode)
     }
 
-    // repeated .ProcedureStoreTracker.TrackerNode node = 1;
+    // repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
     public static final int NODE_FIELD_NUMBER = 1;
     private java.util.List node_;
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     public java.util.List getNodeList() {
       return node_;
     }
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     public java.util.List 
         getNodeOrBuilderList() {
       return node_;
     }
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     public int getNodeCount() {
       return node_.size();
     }
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode getNode(int index) {
       return node_.get(index);
     }
     /**
-     * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+     * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNodeOrBuilder getNodeOrBuilder(
         int index) {
@@ -5843,19 +5843,19 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcedureStoreTracker}
+     * Protobuf type {@code hbase.pb.ProcedureStoreTracker}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTrackerOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.Builder.class);
       }
@@ -5896,7 +5896,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureStoreTracker_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureStoreTracker_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker getDefaultInstanceForType() {
@@ -5997,7 +5997,7 @@ public final class ProcedureProtos {
       }
       private int bitField0_;
 
-      // repeated .ProcedureStoreTracker.TrackerNode node = 1;
+      // repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
       private java.util.List node_ =
         java.util.Collections.emptyList();
       private void ensureNodeIsMutable() {
@@ -6011,7 +6011,7 @@ public final class ProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNodeOrBuilder> nodeBuilder_;
 
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public java.util.List getNodeList() {
         if (nodeBuilder_ == null) {
@@ -6021,7 +6021,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public int getNodeCount() {
         if (nodeBuilder_ == null) {
@@ -6031,7 +6031,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode getNode(int index) {
         if (nodeBuilder_ == null) {
@@ -6041,7 +6041,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder setNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode value) {
@@ -6058,7 +6058,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder setNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder builderForValue) {
@@ -6072,7 +6072,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder addNode(org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode value) {
         if (nodeBuilder_ == null) {
@@ -6088,7 +6088,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder addNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode value) {
@@ -6105,7 +6105,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder addNode(
           org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder builderForValue) {
@@ -6119,7 +6119,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder addNode(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder builderForValue) {
@@ -6133,7 +6133,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder addAllNode(
           java.lang.Iterable values) {
@@ -6147,7 +6147,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder clearNode() {
         if (nodeBuilder_ == null) {
@@ -6160,7 +6160,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public Builder removeNode(int index) {
         if (nodeBuilder_ == null) {
@@ -6173,14 +6173,14 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder getNodeBuilder(
           int index) {
         return getNodeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNodeOrBuilder getNodeOrBuilder(
           int index) {
@@ -6190,7 +6190,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public java.util.List 
            getNodeOrBuilderList() {
@@ -6201,14 +6201,14 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder addNodeBuilder() {
         return getNodeFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.getDefaultInstance());
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.Builder addNodeBuilder(
           int index) {
@@ -6216,7 +6216,7 @@ public final class ProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker.TrackerNode.getDefaultInstance());
       }
       /**
-       * repeated .ProcedureStoreTracker.TrackerNode node = 1;
+       * repeated .hbase.pb.ProcedureStoreTracker.TrackerNode node = 1;
        */
       public java.util.List 
            getNodeBuilderList() {
@@ -6237,7 +6237,7 @@ public final class ProcedureProtos {
         return nodeBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcedureStoreTracker)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcedureStoreTracker)
     }
 
     static {
@@ -6245,43 +6245,43 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcedureStoreTracker)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcedureStoreTracker)
   }
 
   public interface ProcedureWALEntryOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ProcedureWALEntry.Type type = 1;
+    // required .hbase.pb.ProcedureWALEntry.Type type = 1;
     /**
-     * required .ProcedureWALEntry.Type type = 1;
+     * required .hbase.pb.ProcedureWALEntry.Type type = 1;
      */
     boolean hasType();
     /**
-     * required .ProcedureWALEntry.Type type = 1;
+     * required .hbase.pb.ProcedureWALEntry.Type type = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type getType();
 
-    // repeated .Procedure procedure = 2;
+    // repeated .hbase.pb.Procedure procedure = 2;
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     java.util.List 
         getProcedureList();
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure getProcedure(int index);
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     int getProcedureCount();
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     java.util.List 
         getProcedureOrBuilderList();
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureOrBuilder getProcedureOrBuilder(
         int index);
@@ -6297,7 +6297,7 @@ public final class ProcedureProtos {
     long getProcId();
   }
   /**
-   * Protobuf type {@code ProcedureWALEntry}
+   * Protobuf type {@code hbase.pb.ProcedureWALEntry}
    */
   public static final class ProcedureWALEntry extends
       com.google.protobuf.GeneratedMessage
@@ -6388,12 +6388,12 @@ public final class ProcedureProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALEntry_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALEntry_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALEntry_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Builder.class);
     }
@@ -6414,7 +6414,7 @@ public final class ProcedureProtos {
     }
 
     /**
-     * Protobuf enum {@code ProcedureWALEntry.Type}
+     * Protobuf enum {@code hbase.pb.ProcedureWALEntry.Type}
      */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -6528,56 +6528,56 @@ public final class ProcedureProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:ProcedureWALEntry.Type)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.ProcedureWALEntry.Type)
     }
 
     private int bitField0_;
-    // required .ProcedureWALEntry.Type type = 1;
+    // required .hbase.pb.ProcedureWALEntry.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type type_;
     /**
-     * required .ProcedureWALEntry.Type type = 1;
+     * required .hbase.pb.ProcedureWALEntry.Type type = 1;
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ProcedureWALEntry.Type type = 1;
+     * required .hbase.pb.ProcedureWALEntry.Type type = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type getType() {
       return type_;
     }
 
-    // repeated .Procedure procedure = 2;
+    // repeated .hbase.pb.Procedure procedure = 2;
     public static final int PROCEDURE_FIELD_NUMBER = 2;
     private java.util.List procedure_;
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     public java.util.List getProcedureList() {
       return procedure_;
     }
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     public java.util.List 
         getProcedureOrBuilderList() {
       return procedure_;
     }
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     public int getProcedureCount() {
       return procedure_.size();
     }
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure getProcedure(int index) {
       return procedure_.get(index);
     }
     /**
-     * repeated .Procedure procedure = 2;
+     * repeated .hbase.pb.Procedure procedure = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureOrBuilder getProcedureOrBuilder(
         int index) {
@@ -6789,19 +6789,19 @@ public final class ProcedureProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcedureWALEntry}
+     * Protobuf type {@code hbase.pb.ProcedureWALEntry}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntryOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALEntry_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALEntry_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALEntry_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.class, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Builder.class);
       }
@@ -6846,7 +6846,7 @@ public final class ProcedureProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_ProcedureWALEntry_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.internal_static_hbase_pb_ProcedureWALEntry_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry getDefaultInstanceForType() {
@@ -6967,22 +6967,22 @@ public final class ProcedureProtos {
       }
       private int bitField0_;
 
-      // required .ProcedureWALEntry.Type type = 1;
+      // required .hbase.pb.ProcedureWALEntry.Type type = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type type_ = org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type.EOF;
       /**
-       * required .ProcedureWALEntry.Type type = 1;
+       * required .hbase.pb.ProcedureWALEntry.Type type = 1;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ProcedureWALEntry.Type type = 1;
+       * required .hbase.pb.ProcedureWALEntry.Type type = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type getType() {
         return type_;
       }
       /**
-       * required .ProcedureWALEntry.Type type = 1;
+       * required .hbase.pb.ProcedureWALEntry.Type type = 1;
        */
       public Builder setType(org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureWALEntry.Type value) {
         if (value == null) {
@@ -6994,7 +6994,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * required .ProcedureWALEntry.Type type = 1;
+       * required .hbase.pb.ProcedureWALEntry.Type type = 1;
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -7003,7 +7003,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // repeated .Procedure procedure = 2;
+      // repeated .hbase.pb.Procedure procedure = 2;
       private java.util.List procedure_ =
         java.util.Collections.emptyList();
       private void ensureProcedureIsMutable() {
@@ -7017,7 +7017,7 @@ public final class ProcedureProtos {
           org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureOrBuilder> procedureBuilder_;
 
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public java.util.List getProcedureList() {
         if (procedureBuilder_ == null) {
@@ -7027,7 +7027,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public int getProcedureCount() {
         if (procedureBuilder_ == null) {
@@ -7037,7 +7037,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure getProcedure(int index) {
         if (procedureBuilder_ == null) {
@@ -7047,7 +7047,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder setProcedure(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure value) {
@@ -7064,7 +7064,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder setProcedure(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder builderForValue) {
@@ -7078,7 +7078,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder addProcedure(org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure value) {
         if (procedureBuilder_ == null) {
@@ -7094,7 +7094,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder addProcedure(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure value) {
@@ -7111,7 +7111,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder addProcedure(
           org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder builderForValue) {
@@ -7125,7 +7125,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder addProcedure(
           int index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder builderForValue) {
@@ -7139,7 +7139,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder addAllProcedure(
           java.lang.Iterable values) {
@@ -7153,7 +7153,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder clearProcedure() {
         if (procedureBuilder_ == null) {
@@ -7166,7 +7166,7 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public Builder removeProcedure(int index) {
         if (procedureBuilder_ == null) {
@@ -7179,14 +7179,14 @@ public final class ProcedureProtos {
         return this;
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder getProcedureBuilder(
           int index) {
         return getProcedureFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureOrBuilder getProcedureOrBuilder(
           int index) {
@@ -7196,7 +7196,7 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public java.util.List 
            getProcedureOrBuilderList() {
@@ -7207,14 +7207,14 @@ public final class ProcedureProtos {
         }
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder addProcedureBuilder() {
         return getProcedureFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.getDefaultInstance());
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.Builder addProcedureBuilder(
           int index) {
@@ -7222,7 +7222,7 @@ public final class ProcedureProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.Procedure.getDefaultInstance());
       }
       /**
-       * repeated .Procedure procedure = 2;
+       * repeated .hbase.pb.Procedure procedure = 2;
        */
       public java.util.List 
            getProcedureBuilderList() {
@@ -7276,7 +7276,7 @@ public final class ProcedureProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcedureWALEntry)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcedureWALEntry)
     }
 
     static {
@@ -7284,49 +7284,49 @@ public final class ProcedureProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcedureWALEntry)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcedureWALEntry)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Procedure_descriptor;
+    internal_static_hbase_pb_Procedure_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Procedure_fieldAccessorTable;
+      internal_static_hbase_pb_Procedure_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SequentialProcedureData_descriptor;
+    internal_static_hbase_pb_SequentialProcedureData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SequentialProcedureData_fieldAccessorTable;
+      internal_static_hbase_pb_SequentialProcedureData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StateMachineProcedureData_descriptor;
+    internal_static_hbase_pb_StateMachineProcedureData_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StateMachineProcedureData_fieldAccessorTable;
+      internal_static_hbase_pb_StateMachineProcedureData_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcedureWALHeader_descriptor;
+    internal_static_hbase_pb_ProcedureWALHeader_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcedureWALHeader_fieldAccessorTable;
+      internal_static_hbase_pb_ProcedureWALHeader_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcedureWALTrailer_descriptor;
+    internal_static_hbase_pb_ProcedureWALTrailer_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcedureWALTrailer_fieldAccessorTable;
+      internal_static_hbase_pb_ProcedureWALTrailer_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcedureStoreTracker_descriptor;
+    internal_static_hbase_pb_ProcedureStoreTracker_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcedureStoreTracker_fieldAccessorTable;
+      internal_static_hbase_pb_ProcedureStoreTracker_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcedureStoreTracker_TrackerNode_descriptor;
+    internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcedureStoreTracker_TrackerNode_fieldAccessorTable;
+      internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcedureWALEntry_descriptor;
+    internal_static_hbase_pb_ProcedureWALEntry_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcedureWALEntry_fieldAccessorTable;
+      internal_static_hbase_pb_ProcedureWALEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -7336,87 +7336,89 @@ public final class ProcedureProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017Procedure.proto\032\023ErrorHandling.proto\"\271" +
-      "\002\n\tProcedure\022\022\n\nclass_name\030\001 \002(\t\022\021\n\tpare" +
-      "nt_id\030\002 \001(\004\022\017\n\007proc_id\030\003 \002(\004\022\022\n\nstart_ti" +
-      "me\030\004 \002(\004\022\r\n\005owner\030\005 \001(\t\022\036\n\005state\030\006 \002(\0162\017" +
-      ".ProcedureState\022\020\n\010stack_id\030\007 \003(\r\022\023\n\013las" +
-      "t_update\030\010 \002(\004\022\017\n\007timeout\030\t \001(\r\022+\n\texcep" +
-      "tion\030\n \001(\0132\030.ForeignExceptionMessage\022\016\n\006" +
-      "result\030\013 \001(\014\022\022\n\nstate_data\030\014 \001(\014\022\026\n\013nonc" +
-      "e_group\030\r \001(\004:\0010\022\020\n\005nonce\030\016 \001(\004:\0010\"+\n\027Se" +
-      "quentialProcedureData\022\020\n\010executed\030\001 \002(\010\"",
-      "*\n\031StateMachineProcedureData\022\r\n\005state\030\001 " +
-      "\003(\r\"X\n\022ProcedureWALHeader\022\017\n\007version\030\001 \002" +
-      "(\r\022\014\n\004type\030\002 \002(\r\022\016\n\006log_id\030\003 \002(\004\022\023\n\013min_" +
-      "proc_id\030\004 \002(\004\";\n\023ProcedureWALTrailer\022\017\n\007" +
-      "version\030\001 \002(\r\022\023\n\013tracker_pos\030\002 \002(\004\"\214\001\n\025P" +
-      "rocedureStoreTracker\0220\n\004node\030\001 \003(\0132\".Pro" +
-      "cedureStoreTracker.TrackerNode\032A\n\013Tracke" +
-      "rNode\022\020\n\010start_id\030\001 \002(\004\022\017\n\007updated\030\002 \003(\004" +
-      "\022\017\n\007deleted\030\003 \003(\004\"\266\001\n\021ProcedureWALEntry\022" +
-      "%\n\004type\030\001 \002(\0162\027.ProcedureWALEntry.Type\022\035",
-      "\n\tprocedure\030\002 \003(\0132\n.Procedure\022\017\n\007proc_id" +
-      "\030\003 \001(\004\"J\n\004Type\022\007\n\003EOF\020\001\022\010\n\004INIT\020\002\022\n\n\006INS" +
-      "ERT\020\003\022\n\n\006UPDATE\020\004\022\n\n\006DELETE\020\005\022\013\n\007COMPACT" +
-      "\020\006*p\n\016ProcedureState\022\020\n\014INITIALIZING\020\001\022\014" +
-      "\n\010RUNNABLE\020\002\022\013\n\007WAITING\020\003\022\023\n\017WAITING_TIM" +
-      "EOUT\020\004\022\016\n\nROLLEDBACK\020\005\022\014\n\010FINISHED\020\006BE\n*" +
-      "org.apache.hadoop.hbase.protobuf.generat" +
-      "edB\017ProcedureProtosH\001\210\001\001\240\001\001"
+      "\n\017Procedure.proto\022\010hbase.pb\032\023ErrorHandli" +
+      "ng.proto\"\313\002\n\tProcedure\022\022\n\nclass_name\030\001 \002" +
+      "(\t\022\021\n\tparent_id\030\002 \001(\004\022\017\n\007proc_id\030\003 \002(\004\022\022" +
+      "\n\nstart_time\030\004 \002(\004\022\r\n\005owner\030\005 \001(\t\022\'\n\005sta" +
+      "te\030\006 \002(\0162\030.hbase.pb.ProcedureState\022\020\n\010st" +
+      "ack_id\030\007 \003(\r\022\023\n\013last_update\030\010 \002(\004\022\017\n\007tim" +
+      "eout\030\t \001(\r\0224\n\texception\030\n \001(\0132!.hbase.pb" +
+      ".ForeignExceptionMessage\022\016\n\006result\030\013 \001(\014" +
+      "\022\022\n\nstate_data\030\014 \001(\014\022\026\n\013nonce_group\030\r \001(" +
+      "\004:\0010\022\020\n\005nonce\030\016 \001(\004:\0010\"+\n\027SequentialProc",
+      "edureData\022\020\n\010executed\030\001 \002(\010\"*\n\031StateMach" +
+      "ineProcedureData\022\r\n\005state\030\001 \003(\r\"X\n\022Proce" +
+      "dureWALHeader\022\017\n\007version\030\001 \002(\r\022\014\n\004type\030\002" +
+      " \002(\r\022\016\n\006log_id\030\003 \002(\004\022\023\n\013min_proc_id\030\004 \002(" +
+      "\004\";\n\023ProcedureWALTrailer\022\017\n\007version\030\001 \002(" +
+      "\r\022\023\n\013tracker_pos\030\002 \002(\004\"\225\001\n\025ProcedureStor" +
+      "eTracker\0229\n\004node\030\001 \003(\0132+.hbase.pb.Proced" +
+      "ureStoreTracker.TrackerNode\032A\n\013TrackerNo" +
+      "de\022\020\n\010start_id\030\001 \002(\004\022\017\n\007updated\030\002 \003(\004\022\017\n" +
+      "\007deleted\030\003 \003(\004\"\310\001\n\021ProcedureWALEntry\022.\n\004",
+      "type\030\001 \002(\0162 .hbase.pb.ProcedureWALEntry." +
+      "Type\022&\n\tprocedure\030\002 \003(\0132\023.hbase.pb.Proce" +
+      "dure\022\017\n\007proc_id\030\003 \001(\004\"J\n\004Type\022\007\n\003EOF\020\001\022\010" +
+      "\n\004INIT\020\002\022\n\n\006INSERT\020\003\022\n\n\006UPDATE\020\004\022\n\n\006DELE" +
+      "TE\020\005\022\013\n\007COMPACT\020\006*p\n\016ProcedureState\022\020\n\014I" +
+      "NITIALIZING\020\001\022\014\n\010RUNNABLE\020\002\022\013\n\007WAITING\020\003" +
+      "\022\023\n\017WAITING_TIMEOUT\020\004\022\016\n\nROLLEDBACK\020\005\022\014\n" +
+      "\010FINISHED\020\006BE\n*org.apache.hadoop.hbase.p" +
+      "rotobuf.generatedB\017ProcedureProtosH\001\210\001\001\240" +
+      "\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_Procedure_descriptor =
+          internal_static_hbase_pb_Procedure_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_Procedure_fieldAccessorTable = new
+          internal_static_hbase_pb_Procedure_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Procedure_descriptor,
+              internal_static_hbase_pb_Procedure_descriptor,
               new java.lang.String[] { "ClassName", "ParentId", "ProcId", "StartTime", "Owner", "State", "StackId", "LastUpdate", "Timeout", "Exception", "Result", "StateData", "NonceGroup", "Nonce", });
-          internal_static_SequentialProcedureData_descriptor =
+          internal_static_hbase_pb_SequentialProcedureData_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_SequentialProcedureData_fieldAccessorTable = new
+          internal_static_hbase_pb_SequentialProcedureData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SequentialProcedureData_descriptor,
+              internal_static_hbase_pb_SequentialProcedureData_descriptor,
               new java.lang.String[] { "Executed", });
-          internal_static_StateMachineProcedureData_descriptor =
+          internal_static_hbase_pb_StateMachineProcedureData_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_StateMachineProcedureData_fieldAccessorTable = new
+          internal_static_hbase_pb_StateMachineProcedureData_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StateMachineProcedureData_descriptor,
+              internal_static_hbase_pb_StateMachineProcedureData_descriptor,
               new java.lang.String[] { "State", });
-          internal_static_ProcedureWALHeader_descriptor =
+          internal_static_hbase_pb_ProcedureWALHeader_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_ProcedureWALHeader_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcedureWALHeader_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcedureWALHeader_descriptor,
+              internal_static_hbase_pb_ProcedureWALHeader_descriptor,
               new java.lang.String[] { "Version", "Type", "LogId", "MinProcId", });
-          internal_static_ProcedureWALTrailer_descriptor =
+          internal_static_hbase_pb_ProcedureWALTrailer_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_ProcedureWALTrailer_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcedureWALTrailer_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcedureWALTrailer_descriptor,
+              internal_static_hbase_pb_ProcedureWALTrailer_descriptor,
               new java.lang.String[] { "Version", "TrackerPos", });
-          internal_static_ProcedureStoreTracker_descriptor =
+          internal_static_hbase_pb_ProcedureStoreTracker_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_ProcedureStoreTracker_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcedureStoreTracker_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcedureStoreTracker_descriptor,
+              internal_static_hbase_pb_ProcedureStoreTracker_descriptor,
               new java.lang.String[] { "Node", });
-          internal_static_ProcedureStoreTracker_TrackerNode_descriptor =
-            internal_static_ProcedureStoreTracker_descriptor.getNestedTypes().get(0);
-          internal_static_ProcedureStoreTracker_TrackerNode_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_descriptor =
+            internal_static_hbase_pb_ProcedureStoreTracker_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcedureStoreTracker_TrackerNode_descriptor,
+              internal_static_hbase_pb_ProcedureStoreTracker_TrackerNode_descriptor,
               new java.lang.String[] { "StartId", "Updated", "Deleted", });
-          internal_static_ProcedureWALEntry_descriptor =
+          internal_static_hbase_pb_ProcedureWALEntry_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_ProcedureWALEntry_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcedureWALEntry_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcedureWALEntry_descriptor,
+              internal_static_hbase_pb_ProcedureWALEntry_descriptor,
               new java.lang.String[] { "Type", "Procedure", "ProcId", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java
index 5eac1925bed..05894b97f0b 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/QuotaProtos.java
@@ -9,7 +9,7 @@ public final class QuotaProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code QuotaScope}
+   * Protobuf enum {@code hbase.pb.QuotaScope}
    */
   public enum QuotaScope
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -87,11 +87,11 @@ public final class QuotaProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:QuotaScope)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.QuotaScope)
   }
 
   /**
-   * Protobuf enum {@code ThrottleType}
+   * Protobuf enum {@code hbase.pb.ThrottleType}
    */
   public enum ThrottleType
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -205,11 +205,11 @@ public final class QuotaProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:ThrottleType)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.ThrottleType)
   }
 
   /**
-   * Protobuf enum {@code QuotaType}
+   * Protobuf enum {@code hbase.pb.QuotaType}
    */
   public enum QuotaType
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -278,19 +278,19 @@ public final class QuotaProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:QuotaType)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.QuotaType)
   }
 
   public interface TimedQuotaOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TimeUnit time_unit = 1;
+    // required .hbase.pb.TimeUnit time_unit = 1;
     /**
-     * required .TimeUnit time_unit = 1;
+     * required .hbase.pb.TimeUnit time_unit = 1;
      */
     boolean hasTimeUnit();
     /**
-     * required .TimeUnit time_unit = 1;
+     * required .hbase.pb.TimeUnit time_unit = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit getTimeUnit();
 
@@ -314,18 +314,18 @@ public final class QuotaProtos {
      */
     float getShare();
 
-    // optional .QuotaScope scope = 4 [default = MACHINE];
+    // optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
     /**
-     * optional .QuotaScope scope = 4 [default = MACHINE];
+     * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
      */
     boolean hasScope();
     /**
-     * optional .QuotaScope scope = 4 [default = MACHINE];
+     * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope getScope();
   }
   /**
-   * Protobuf type {@code TimedQuota}
+   * Protobuf type {@code hbase.pb.TimedQuota}
    */
   public static final class TimedQuota extends
       com.google.protobuf.GeneratedMessage
@@ -421,12 +421,12 @@ public final class QuotaProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_TimedQuota_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_TimedQuota_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_TimedQuota_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_TimedQuota_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder.class);
     }
@@ -447,17 +447,17 @@ public final class QuotaProtos {
     }
 
     private int bitField0_;
-    // required .TimeUnit time_unit = 1;
+    // required .hbase.pb.TimeUnit time_unit = 1;
     public static final int TIME_UNIT_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit timeUnit_;
     /**
-     * required .TimeUnit time_unit = 1;
+     * required .hbase.pb.TimeUnit time_unit = 1;
      */
     public boolean hasTimeUnit() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TimeUnit time_unit = 1;
+     * required .hbase.pb.TimeUnit time_unit = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit getTimeUnit() {
       return timeUnit_;
@@ -495,17 +495,17 @@ public final class QuotaProtos {
       return share_;
     }
 
-    // optional .QuotaScope scope = 4 [default = MACHINE];
+    // optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
     public static final int SCOPE_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope scope_;
     /**
-     * optional .QuotaScope scope = 4 [default = MACHINE];
+     * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
      */
     public boolean hasScope() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .QuotaScope scope = 4 [default = MACHINE];
+     * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope getScope() {
       return scope_;
@@ -714,19 +714,19 @@ public final class QuotaProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TimedQuota}
+     * Protobuf type {@code hbase.pb.TimedQuota}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_TimedQuota_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_TimedQuota_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_TimedQuota_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_TimedQuota_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder.class);
       }
@@ -768,7 +768,7 @@ public final class QuotaProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_TimedQuota_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_TimedQuota_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getDefaultInstanceForType() {
@@ -862,22 +862,22 @@ public final class QuotaProtos {
       }
       private int bitField0_;
 
-      // required .TimeUnit time_unit = 1;
+      // required .hbase.pb.TimeUnit time_unit = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit timeUnit_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit.NANOSECONDS;
       /**
-       * required .TimeUnit time_unit = 1;
+       * required .hbase.pb.TimeUnit time_unit = 1;
        */
       public boolean hasTimeUnit() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TimeUnit time_unit = 1;
+       * required .hbase.pb.TimeUnit time_unit = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit getTimeUnit() {
         return timeUnit_;
       }
       /**
-       * required .TimeUnit time_unit = 1;
+       * required .hbase.pb.TimeUnit time_unit = 1;
        */
       public Builder setTimeUnit(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TimeUnit value) {
         if (value == null) {
@@ -889,7 +889,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * required .TimeUnit time_unit = 1;
+       * required .hbase.pb.TimeUnit time_unit = 1;
        */
       public Builder clearTimeUnit() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -964,22 +964,22 @@ public final class QuotaProtos {
         return this;
       }
 
-      // optional .QuotaScope scope = 4 [default = MACHINE];
+      // optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope scope_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope.MACHINE;
       /**
-       * optional .QuotaScope scope = 4 [default = MACHINE];
+       * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
        */
       public boolean hasScope() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .QuotaScope scope = 4 [default = MACHINE];
+       * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope getScope() {
         return scope_;
       }
       /**
-       * optional .QuotaScope scope = 4 [default = MACHINE];
+       * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
        */
       public Builder setScope(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaScope value) {
         if (value == null) {
@@ -991,7 +991,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .QuotaScope scope = 4 [default = MACHINE];
+       * optional .hbase.pb.QuotaScope scope = 4 [default = MACHINE];
        */
       public Builder clearScope() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -1000,7 +1000,7 @@ public final class QuotaProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TimedQuota)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TimedQuota)
     }
 
     static {
@@ -1008,98 +1008,98 @@ public final class QuotaProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TimedQuota)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TimedQuota)
   }
 
   public interface ThrottleOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .TimedQuota req_num = 1;
+    // optional .hbase.pb.TimedQuota req_num = 1;
     /**
-     * optional .TimedQuota req_num = 1;
+     * optional .hbase.pb.TimedQuota req_num = 1;
      */
     boolean hasReqNum();
     /**
-     * optional .TimedQuota req_num = 1;
+     * optional .hbase.pb.TimedQuota req_num = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReqNum();
     /**
-     * optional .TimedQuota req_num = 1;
+     * optional .hbase.pb.TimedQuota req_num = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReqNumOrBuilder();
 
-    // optional .TimedQuota req_size = 2;
+    // optional .hbase.pb.TimedQuota req_size = 2;
     /**
-     * optional .TimedQuota req_size = 2;
+     * optional .hbase.pb.TimedQuota req_size = 2;
      */
     boolean hasReqSize();
     /**
-     * optional .TimedQuota req_size = 2;
+     * optional .hbase.pb.TimedQuota req_size = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReqSize();
     /**
-     * optional .TimedQuota req_size = 2;
+     * optional .hbase.pb.TimedQuota req_size = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReqSizeOrBuilder();
 
-    // optional .TimedQuota write_num = 3;
+    // optional .hbase.pb.TimedQuota write_num = 3;
     /**
-     * optional .TimedQuota write_num = 3;
+     * optional .hbase.pb.TimedQuota write_num = 3;
      */
     boolean hasWriteNum();
     /**
-     * optional .TimedQuota write_num = 3;
+     * optional .hbase.pb.TimedQuota write_num = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getWriteNum();
     /**
-     * optional .TimedQuota write_num = 3;
+     * optional .hbase.pb.TimedQuota write_num = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getWriteNumOrBuilder();
 
-    // optional .TimedQuota write_size = 4;
+    // optional .hbase.pb.TimedQuota write_size = 4;
     /**
-     * optional .TimedQuota write_size = 4;
+     * optional .hbase.pb.TimedQuota write_size = 4;
      */
     boolean hasWriteSize();
     /**
-     * optional .TimedQuota write_size = 4;
+     * optional .hbase.pb.TimedQuota write_size = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getWriteSize();
     /**
-     * optional .TimedQuota write_size = 4;
+     * optional .hbase.pb.TimedQuota write_size = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getWriteSizeOrBuilder();
 
-    // optional .TimedQuota read_num = 5;
+    // optional .hbase.pb.TimedQuota read_num = 5;
     /**
-     * optional .TimedQuota read_num = 5;
+     * optional .hbase.pb.TimedQuota read_num = 5;
      */
     boolean hasReadNum();
     /**
-     * optional .TimedQuota read_num = 5;
+     * optional .hbase.pb.TimedQuota read_num = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReadNum();
     /**
-     * optional .TimedQuota read_num = 5;
+     * optional .hbase.pb.TimedQuota read_num = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReadNumOrBuilder();
 
-    // optional .TimedQuota read_size = 6;
+    // optional .hbase.pb.TimedQuota read_size = 6;
     /**
-     * optional .TimedQuota read_size = 6;
+     * optional .hbase.pb.TimedQuota read_size = 6;
      */
     boolean hasReadSize();
     /**
-     * optional .TimedQuota read_size = 6;
+     * optional .hbase.pb.TimedQuota read_size = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReadSize();
     /**
-     * optional .TimedQuota read_size = 6;
+     * optional .hbase.pb.TimedQuota read_size = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReadSizeOrBuilder();
   }
   /**
-   * Protobuf type {@code Throttle}
+   * Protobuf type {@code hbase.pb.Throttle}
    */
   public static final class Throttle extends
       com.google.protobuf.GeneratedMessage
@@ -1241,12 +1241,12 @@ public final class QuotaProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Throttle_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Throttle_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Throttle_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Throttle_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.Builder.class);
     }
@@ -1267,133 +1267,133 @@ public final class QuotaProtos {
     }
 
     private int bitField0_;
-    // optional .TimedQuota req_num = 1;
+    // optional .hbase.pb.TimedQuota req_num = 1;
     public static final int REQ_NUM_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota reqNum_;
     /**
-     * optional .TimedQuota req_num = 1;
+     * optional .hbase.pb.TimedQuota req_num = 1;
      */
     public boolean hasReqNum() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .TimedQuota req_num = 1;
+     * optional .hbase.pb.TimedQuota req_num = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReqNum() {
       return reqNum_;
     }
     /**
-     * optional .TimedQuota req_num = 1;
+     * optional .hbase.pb.TimedQuota req_num = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReqNumOrBuilder() {
       return reqNum_;
     }
 
-    // optional .TimedQuota req_size = 2;
+    // optional .hbase.pb.TimedQuota req_size = 2;
     public static final int REQ_SIZE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota reqSize_;
     /**
-     * optional .TimedQuota req_size = 2;
+     * optional .hbase.pb.TimedQuota req_size = 2;
      */
     public boolean hasReqSize() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .TimedQuota req_size = 2;
+     * optional .hbase.pb.TimedQuota req_size = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReqSize() {
       return reqSize_;
     }
     /**
-     * optional .TimedQuota req_size = 2;
+     * optional .hbase.pb.TimedQuota req_size = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReqSizeOrBuilder() {
       return reqSize_;
     }
 
-    // optional .TimedQuota write_num = 3;
+    // optional .hbase.pb.TimedQuota write_num = 3;
     public static final int WRITE_NUM_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota writeNum_;
     /**
-     * optional .TimedQuota write_num = 3;
+     * optional .hbase.pb.TimedQuota write_num = 3;
      */
     public boolean hasWriteNum() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .TimedQuota write_num = 3;
+     * optional .hbase.pb.TimedQuota write_num = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getWriteNum() {
       return writeNum_;
     }
     /**
-     * optional .TimedQuota write_num = 3;
+     * optional .hbase.pb.TimedQuota write_num = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getWriteNumOrBuilder() {
       return writeNum_;
     }
 
-    // optional .TimedQuota write_size = 4;
+    // optional .hbase.pb.TimedQuota write_size = 4;
     public static final int WRITE_SIZE_FIELD_NUMBER = 4;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota writeSize_;
     /**
-     * optional .TimedQuota write_size = 4;
+     * optional .hbase.pb.TimedQuota write_size = 4;
      */
     public boolean hasWriteSize() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .TimedQuota write_size = 4;
+     * optional .hbase.pb.TimedQuota write_size = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getWriteSize() {
       return writeSize_;
     }
     /**
-     * optional .TimedQuota write_size = 4;
+     * optional .hbase.pb.TimedQuota write_size = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getWriteSizeOrBuilder() {
       return writeSize_;
     }
 
-    // optional .TimedQuota read_num = 5;
+    // optional .hbase.pb.TimedQuota read_num = 5;
     public static final int READ_NUM_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota readNum_;
     /**
-     * optional .TimedQuota read_num = 5;
+     * optional .hbase.pb.TimedQuota read_num = 5;
      */
     public boolean hasReadNum() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .TimedQuota read_num = 5;
+     * optional .hbase.pb.TimedQuota read_num = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReadNum() {
       return readNum_;
     }
     /**
-     * optional .TimedQuota read_num = 5;
+     * optional .hbase.pb.TimedQuota read_num = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReadNumOrBuilder() {
       return readNum_;
     }
 
-    // optional .TimedQuota read_size = 6;
+    // optional .hbase.pb.TimedQuota read_size = 6;
     public static final int READ_SIZE_FIELD_NUMBER = 6;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota readSize_;
     /**
-     * optional .TimedQuota read_size = 6;
+     * optional .hbase.pb.TimedQuota read_size = 6;
      */
     public boolean hasReadSize() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .TimedQuota read_size = 6;
+     * optional .hbase.pb.TimedQuota read_size = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReadSize() {
       return readSize_;
     }
     /**
-     * optional .TimedQuota read_size = 6;
+     * optional .hbase.pb.TimedQuota read_size = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReadSizeOrBuilder() {
       return readSize_;
@@ -1668,19 +1668,19 @@ public final class QuotaProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Throttle}
+     * Protobuf type {@code hbase.pb.Throttle}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Throttle_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Throttle_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Throttle_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Throttle_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.Builder.class);
       }
@@ -1756,7 +1756,7 @@ public final class QuotaProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Throttle_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Throttle_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle getDefaultInstanceForType() {
@@ -1920,18 +1920,18 @@ public final class QuotaProtos {
       }
       private int bitField0_;
 
-      // optional .TimedQuota req_num = 1;
+      // optional .hbase.pb.TimedQuota req_num = 1;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota reqNum_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> reqNumBuilder_;
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public boolean hasReqNum() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReqNum() {
         if (reqNumBuilder_ == null) {
@@ -1941,7 +1941,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public Builder setReqNum(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (reqNumBuilder_ == null) {
@@ -1957,7 +1957,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public Builder setReqNum(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -1971,7 +1971,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public Builder mergeReqNum(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (reqNumBuilder_ == null) {
@@ -1990,7 +1990,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public Builder clearReqNum() {
         if (reqNumBuilder_ == null) {
@@ -2003,7 +2003,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getReqNumBuilder() {
         bitField0_ |= 0x00000001;
@@ -2011,7 +2011,7 @@ public final class QuotaProtos {
         return getReqNumFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReqNumOrBuilder() {
         if (reqNumBuilder_ != null) {
@@ -2021,7 +2021,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota req_num = 1;
+       * optional .hbase.pb.TimedQuota req_num = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -2037,18 +2037,18 @@ public final class QuotaProtos {
         return reqNumBuilder_;
       }
 
-      // optional .TimedQuota req_size = 2;
+      // optional .hbase.pb.TimedQuota req_size = 2;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota reqSize_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> reqSizeBuilder_;
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public boolean hasReqSize() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReqSize() {
         if (reqSizeBuilder_ == null) {
@@ -2058,7 +2058,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public Builder setReqSize(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (reqSizeBuilder_ == null) {
@@ -2074,7 +2074,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public Builder setReqSize(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -2088,7 +2088,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public Builder mergeReqSize(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (reqSizeBuilder_ == null) {
@@ -2107,7 +2107,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public Builder clearReqSize() {
         if (reqSizeBuilder_ == null) {
@@ -2120,7 +2120,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getReqSizeBuilder() {
         bitField0_ |= 0x00000002;
@@ -2128,7 +2128,7 @@ public final class QuotaProtos {
         return getReqSizeFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReqSizeOrBuilder() {
         if (reqSizeBuilder_ != null) {
@@ -2138,7 +2138,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota req_size = 2;
+       * optional .hbase.pb.TimedQuota req_size = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -2154,18 +2154,18 @@ public final class QuotaProtos {
         return reqSizeBuilder_;
       }
 
-      // optional .TimedQuota write_num = 3;
+      // optional .hbase.pb.TimedQuota write_num = 3;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota writeNum_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> writeNumBuilder_;
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public boolean hasWriteNum() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getWriteNum() {
         if (writeNumBuilder_ == null) {
@@ -2175,7 +2175,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public Builder setWriteNum(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (writeNumBuilder_ == null) {
@@ -2191,7 +2191,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public Builder setWriteNum(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -2205,7 +2205,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public Builder mergeWriteNum(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (writeNumBuilder_ == null) {
@@ -2224,7 +2224,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public Builder clearWriteNum() {
         if (writeNumBuilder_ == null) {
@@ -2237,7 +2237,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getWriteNumBuilder() {
         bitField0_ |= 0x00000004;
@@ -2245,7 +2245,7 @@ public final class QuotaProtos {
         return getWriteNumFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getWriteNumOrBuilder() {
         if (writeNumBuilder_ != null) {
@@ -2255,7 +2255,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota write_num = 3;
+       * optional .hbase.pb.TimedQuota write_num = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -2271,18 +2271,18 @@ public final class QuotaProtos {
         return writeNumBuilder_;
       }
 
-      // optional .TimedQuota write_size = 4;
+      // optional .hbase.pb.TimedQuota write_size = 4;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota writeSize_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> writeSizeBuilder_;
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public boolean hasWriteSize() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getWriteSize() {
         if (writeSizeBuilder_ == null) {
@@ -2292,7 +2292,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public Builder setWriteSize(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (writeSizeBuilder_ == null) {
@@ -2308,7 +2308,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public Builder setWriteSize(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -2322,7 +2322,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public Builder mergeWriteSize(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (writeSizeBuilder_ == null) {
@@ -2341,7 +2341,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public Builder clearWriteSize() {
         if (writeSizeBuilder_ == null) {
@@ -2354,7 +2354,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getWriteSizeBuilder() {
         bitField0_ |= 0x00000008;
@@ -2362,7 +2362,7 @@ public final class QuotaProtos {
         return getWriteSizeFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getWriteSizeOrBuilder() {
         if (writeSizeBuilder_ != null) {
@@ -2372,7 +2372,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota write_size = 4;
+       * optional .hbase.pb.TimedQuota write_size = 4;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -2388,18 +2388,18 @@ public final class QuotaProtos {
         return writeSizeBuilder_;
       }
 
-      // optional .TimedQuota read_num = 5;
+      // optional .hbase.pb.TimedQuota read_num = 5;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota readNum_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> readNumBuilder_;
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public boolean hasReadNum() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReadNum() {
         if (readNumBuilder_ == null) {
@@ -2409,7 +2409,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public Builder setReadNum(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (readNumBuilder_ == null) {
@@ -2425,7 +2425,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public Builder setReadNum(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -2439,7 +2439,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public Builder mergeReadNum(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (readNumBuilder_ == null) {
@@ -2458,7 +2458,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public Builder clearReadNum() {
         if (readNumBuilder_ == null) {
@@ -2471,7 +2471,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getReadNumBuilder() {
         bitField0_ |= 0x00000010;
@@ -2479,7 +2479,7 @@ public final class QuotaProtos {
         return getReadNumFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReadNumOrBuilder() {
         if (readNumBuilder_ != null) {
@@ -2489,7 +2489,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota read_num = 5;
+       * optional .hbase.pb.TimedQuota read_num = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -2505,18 +2505,18 @@ public final class QuotaProtos {
         return readNumBuilder_;
       }
 
-      // optional .TimedQuota read_size = 6;
+      // optional .hbase.pb.TimedQuota read_size = 6;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota readSize_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> readSizeBuilder_;
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public boolean hasReadSize() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getReadSize() {
         if (readSizeBuilder_ == null) {
@@ -2526,7 +2526,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public Builder setReadSize(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (readSizeBuilder_ == null) {
@@ -2542,7 +2542,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public Builder setReadSize(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -2556,7 +2556,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public Builder mergeReadSize(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (readSizeBuilder_ == null) {
@@ -2575,7 +2575,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public Builder clearReadSize() {
         if (readSizeBuilder_ == null) {
@@ -2588,7 +2588,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getReadSizeBuilder() {
         bitField0_ |= 0x00000020;
@@ -2596,7 +2596,7 @@ public final class QuotaProtos {
         return getReadSizeFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getReadSizeOrBuilder() {
         if (readSizeBuilder_ != null) {
@@ -2606,7 +2606,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota read_size = 6;
+       * optional .hbase.pb.TimedQuota read_size = 6;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -2622,7 +2622,7 @@ public final class QuotaProtos {
         return readSizeBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:Throttle)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Throttle)
     }
 
     static {
@@ -2630,38 +2630,38 @@ public final class QuotaProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Throttle)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Throttle)
   }
 
   public interface ThrottleRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .ThrottleType type = 1;
+    // optional .hbase.pb.ThrottleType type = 1;
     /**
-     * optional .ThrottleType type = 1;
+     * optional .hbase.pb.ThrottleType type = 1;
      */
     boolean hasType();
     /**
-     * optional .ThrottleType type = 1;
+     * optional .hbase.pb.ThrottleType type = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType getType();
 
-    // optional .TimedQuota timed_quota = 2;
+    // optional .hbase.pb.TimedQuota timed_quota = 2;
     /**
-     * optional .TimedQuota timed_quota = 2;
+     * optional .hbase.pb.TimedQuota timed_quota = 2;
      */
     boolean hasTimedQuota();
     /**
-     * optional .TimedQuota timed_quota = 2;
+     * optional .hbase.pb.TimedQuota timed_quota = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getTimedQuota();
     /**
-     * optional .TimedQuota timed_quota = 2;
+     * optional .hbase.pb.TimedQuota timed_quota = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getTimedQuotaOrBuilder();
   }
   /**
-   * Protobuf type {@code ThrottleRequest}
+   * Protobuf type {@code hbase.pb.ThrottleRequest}
    */
   public static final class ThrottleRequest extends
       com.google.protobuf.GeneratedMessage
@@ -2749,12 +2749,12 @@ public final class QuotaProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_ThrottleRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_ThrottleRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_ThrottleRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_ThrottleRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.Builder.class);
     }
@@ -2775,39 +2775,39 @@ public final class QuotaProtos {
     }
 
     private int bitField0_;
-    // optional .ThrottleType type = 1;
+    // optional .hbase.pb.ThrottleType type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType type_;
     /**
-     * optional .ThrottleType type = 1;
+     * optional .hbase.pb.ThrottleType type = 1;
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .ThrottleType type = 1;
+     * optional .hbase.pb.ThrottleType type = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType getType() {
       return type_;
     }
 
-    // optional .TimedQuota timed_quota = 2;
+    // optional .hbase.pb.TimedQuota timed_quota = 2;
     public static final int TIMED_QUOTA_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota timedQuota_;
     /**
-     * optional .TimedQuota timed_quota = 2;
+     * optional .hbase.pb.TimedQuota timed_quota = 2;
      */
     public boolean hasTimedQuota() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .TimedQuota timed_quota = 2;
+     * optional .hbase.pb.TimedQuota timed_quota = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getTimedQuota() {
       return timedQuota_;
     }
     /**
-     * optional .TimedQuota timed_quota = 2;
+     * optional .hbase.pb.TimedQuota timed_quota = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getTimedQuotaOrBuilder() {
       return timedQuota_;
@@ -2984,19 +2984,19 @@ public final class QuotaProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ThrottleRequest}
+     * Protobuf type {@code hbase.pb.ThrottleRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_ThrottleRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_ThrottleRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_ThrottleRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_ThrottleRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest.Builder.class);
       }
@@ -3039,7 +3039,7 @@ public final class QuotaProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_ThrottleRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_ThrottleRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleRequest getDefaultInstanceForType() {
@@ -3125,22 +3125,22 @@ public final class QuotaProtos {
       }
       private int bitField0_;
 
-      // optional .ThrottleType type = 1;
+      // optional .hbase.pb.ThrottleType type = 1;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType type_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType.REQUEST_NUMBER;
       /**
-       * optional .ThrottleType type = 1;
+       * optional .hbase.pb.ThrottleType type = 1;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .ThrottleType type = 1;
+       * optional .hbase.pb.ThrottleType type = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType getType() {
         return type_;
       }
       /**
-       * optional .ThrottleType type = 1;
+       * optional .hbase.pb.ThrottleType type = 1;
        */
       public Builder setType(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleType value) {
         if (value == null) {
@@ -3152,7 +3152,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .ThrottleType type = 1;
+       * optional .hbase.pb.ThrottleType type = 1;
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -3161,18 +3161,18 @@ public final class QuotaProtos {
         return this;
       }
 
-      // optional .TimedQuota timed_quota = 2;
+      // optional .hbase.pb.TimedQuota timed_quota = 2;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota timedQuota_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> timedQuotaBuilder_;
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public boolean hasTimedQuota() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota getTimedQuota() {
         if (timedQuotaBuilder_ == null) {
@@ -3182,7 +3182,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public Builder setTimedQuota(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (timedQuotaBuilder_ == null) {
@@ -3198,7 +3198,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public Builder setTimedQuota(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder builderForValue) {
@@ -3212,7 +3212,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public Builder mergeTimedQuota(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota value) {
         if (timedQuotaBuilder_ == null) {
@@ -3231,7 +3231,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public Builder clearTimedQuota() {
         if (timedQuotaBuilder_ == null) {
@@ -3244,7 +3244,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder getTimedQuotaBuilder() {
         bitField0_ |= 0x00000002;
@@ -3252,7 +3252,7 @@ public final class QuotaProtos {
         return getTimedQuotaFieldBuilder().getBuilder();
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder getTimedQuotaOrBuilder() {
         if (timedQuotaBuilder_ != null) {
@@ -3262,7 +3262,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .TimedQuota timed_quota = 2;
+       * optional .hbase.pb.TimedQuota timed_quota = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuota.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.TimedQuotaOrBuilder> 
@@ -3278,7 +3278,7 @@ public final class QuotaProtos {
         return timedQuotaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ThrottleRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ThrottleRequest)
     }
 
     static {
@@ -3286,7 +3286,7 @@ public final class QuotaProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ThrottleRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ThrottleRequest)
   }
 
   public interface QuotasOrBuilder
@@ -3302,22 +3302,22 @@ public final class QuotaProtos {
      */
     boolean getBypassGlobals();
 
-    // optional .Throttle throttle = 2;
+    // optional .hbase.pb.Throttle throttle = 2;
     /**
-     * optional .Throttle throttle = 2;
+     * optional .hbase.pb.Throttle throttle = 2;
      */
     boolean hasThrottle();
     /**
-     * optional .Throttle throttle = 2;
+     * optional .hbase.pb.Throttle throttle = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle getThrottle();
     /**
-     * optional .Throttle throttle = 2;
+     * optional .hbase.pb.Throttle throttle = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleOrBuilder getThrottleOrBuilder();
   }
   /**
-   * Protobuf type {@code Quotas}
+   * Protobuf type {@code hbase.pb.Quotas}
    */
   public static final class Quotas extends
       com.google.protobuf.GeneratedMessage
@@ -3399,12 +3399,12 @@ public final class QuotaProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Quotas_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Quotas_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Quotas_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Quotas_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas.Builder.class);
     }
@@ -3441,23 +3441,23 @@ public final class QuotaProtos {
       return bypassGlobals_;
     }
 
-    // optional .Throttle throttle = 2;
+    // optional .hbase.pb.Throttle throttle = 2;
     public static final int THROTTLE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle throttle_;
     /**
-     * optional .Throttle throttle = 2;
+     * optional .hbase.pb.Throttle throttle = 2;
      */
     public boolean hasThrottle() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .Throttle throttle = 2;
+     * optional .hbase.pb.Throttle throttle = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle getThrottle() {
       return throttle_;
     }
     /**
-     * optional .Throttle throttle = 2;
+     * optional .hbase.pb.Throttle throttle = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleOrBuilder getThrottleOrBuilder() {
       return throttle_;
@@ -3634,19 +3634,19 @@ public final class QuotaProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Quotas}
+     * Protobuf type {@code hbase.pb.Quotas}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotasOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Quotas_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Quotas_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Quotas_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Quotas_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas.Builder.class);
       }
@@ -3689,7 +3689,7 @@ public final class QuotaProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_Quotas_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_Quotas_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas getDefaultInstanceForType() {
@@ -3808,18 +3808,18 @@ public final class QuotaProtos {
         return this;
       }
 
-      // optional .Throttle throttle = 2;
+      // optional .hbase.pb.Throttle throttle = 2;
       private org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle throttle_ = org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleOrBuilder> throttleBuilder_;
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public boolean hasThrottle() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle getThrottle() {
         if (throttleBuilder_ == null) {
@@ -3829,7 +3829,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public Builder setThrottle(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle value) {
         if (throttleBuilder_ == null) {
@@ -3845,7 +3845,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public Builder setThrottle(
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.Builder builderForValue) {
@@ -3859,7 +3859,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public Builder mergeThrottle(org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle value) {
         if (throttleBuilder_ == null) {
@@ -3878,7 +3878,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public Builder clearThrottle() {
         if (throttleBuilder_ == null) {
@@ -3891,7 +3891,7 @@ public final class QuotaProtos {
         return this;
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.Builder getThrottleBuilder() {
         bitField0_ |= 0x00000002;
@@ -3899,7 +3899,7 @@ public final class QuotaProtos {
         return getThrottleFieldBuilder().getBuilder();
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleOrBuilder getThrottleOrBuilder() {
         if (throttleBuilder_ != null) {
@@ -3909,7 +3909,7 @@ public final class QuotaProtos {
         }
       }
       /**
-       * optional .Throttle throttle = 2;
+       * optional .hbase.pb.Throttle throttle = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Throttle.Builder, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.ThrottleOrBuilder> 
@@ -3925,7 +3925,7 @@ public final class QuotaProtos {
         return throttleBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:Quotas)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Quotas)
     }
 
     static {
@@ -3933,14 +3933,14 @@ public final class QuotaProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Quotas)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Quotas)
   }
 
   public interface QuotaUsageOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code QuotaUsage}
+   * Protobuf type {@code hbase.pb.QuotaUsage}
    */
   public static final class QuotaUsage extends
       com.google.protobuf.GeneratedMessage
@@ -4003,12 +4003,12 @@ public final class QuotaProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_QuotaUsage_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_QuotaUsage_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_QuotaUsage_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_QuotaUsage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaUsage.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaUsage.Builder.class);
     }
@@ -4159,19 +4159,19 @@ public final class QuotaProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code QuotaUsage}
+     * Protobuf type {@code hbase.pb.QuotaUsage}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaUsageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_QuotaUsage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_QuotaUsage_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_QuotaUsage_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_QuotaUsage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaUsage.class, org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaUsage.Builder.class);
       }
@@ -4205,7 +4205,7 @@ public final class QuotaProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_QuotaUsage_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.internal_static_hbase_pb_QuotaUsage_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.QuotaUsage getDefaultInstanceForType() {
@@ -4263,7 +4263,7 @@ public final class QuotaProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:QuotaUsage)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.QuotaUsage)
     }
 
     static {
@@ -4271,34 +4271,34 @@ public final class QuotaProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:QuotaUsage)
+    // @@protoc_insertion_point(class_scope:hbase.pb.QuotaUsage)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TimedQuota_descriptor;
+    internal_static_hbase_pb_TimedQuota_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TimedQuota_fieldAccessorTable;
+      internal_static_hbase_pb_TimedQuota_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Throttle_descriptor;
+    internal_static_hbase_pb_Throttle_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Throttle_fieldAccessorTable;
+      internal_static_hbase_pb_Throttle_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ThrottleRequest_descriptor;
+    internal_static_hbase_pb_ThrottleRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ThrottleRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ThrottleRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Quotas_descriptor;
+    internal_static_hbase_pb_Quotas_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Quotas_fieldAccessorTable;
+      internal_static_hbase_pb_Quotas_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_QuotaUsage_descriptor;
+    internal_static_hbase_pb_QuotaUsage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_QuotaUsage_fieldAccessorTable;
+      internal_static_hbase_pb_QuotaUsage_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -4308,61 +4308,63 @@ public final class QuotaProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013Quota.proto\032\013HBase.proto\"r\n\nTimedQuota" +
-      "\022\034\n\ttime_unit\030\001 \002(\0162\t.TimeUnit\022\022\n\nsoft_l" +
-      "imit\030\002 \001(\004\022\r\n\005share\030\003 \001(\002\022#\n\005scope\030\004 \001(\016" +
-      "2\013.QuotaScope:\007MACHINE\"\307\001\n\010Throttle\022\034\n\007r" +
-      "eq_num\030\001 \001(\0132\013.TimedQuota\022\035\n\010req_size\030\002 " +
-      "\001(\0132\013.TimedQuota\022\036\n\twrite_num\030\003 \001(\0132\013.Ti" +
-      "medQuota\022\037\n\nwrite_size\030\004 \001(\0132\013.TimedQuot" +
-      "a\022\035\n\010read_num\030\005 \001(\0132\013.TimedQuota\022\036\n\tread" +
-      "_size\030\006 \001(\0132\013.TimedQuota\"P\n\017ThrottleRequ" +
-      "est\022\033\n\004type\030\001 \001(\0162\r.ThrottleType\022 \n\013time",
-      "d_quota\030\002 \001(\0132\013.TimedQuota\"D\n\006Quotas\022\035\n\016" +
-      "bypass_globals\030\001 \001(\010:\005false\022\033\n\010throttle\030" +
-      "\002 \001(\0132\t.Throttle\"\014\n\nQuotaUsage*&\n\nQuotaS" +
-      "cope\022\013\n\007CLUSTER\020\001\022\013\n\007MACHINE\020\002*v\n\014Thrott" +
-      "leType\022\022\n\016REQUEST_NUMBER\020\001\022\020\n\014REQUEST_SI" +
-      "ZE\020\002\022\020\n\014WRITE_NUMBER\020\003\022\016\n\nWRITE_SIZE\020\004\022\017" +
-      "\n\013READ_NUMBER\020\005\022\r\n\tREAD_SIZE\020\006*\031\n\tQuotaT" +
-      "ype\022\014\n\010THROTTLE\020\001BA\n*org.apache.hadoop.h" +
-      "base.protobuf.generatedB\013QuotaProtosH\001\210\001" +
-      "\001\240\001\001"
+      "\n\013Quota.proto\022\010hbase.pb\032\013HBase.proto\"\204\001\n" +
+      "\nTimedQuota\022%\n\ttime_unit\030\001 \002(\0162\022.hbase.p" +
+      "b.TimeUnit\022\022\n\nsoft_limit\030\002 \001(\004\022\r\n\005share\030" +
+      "\003 \001(\002\022,\n\005scope\030\004 \001(\0162\024.hbase.pb.QuotaSco" +
+      "pe:\007MACHINE\"\375\001\n\010Throttle\022%\n\007req_num\030\001 \001(" +
+      "\0132\024.hbase.pb.TimedQuota\022&\n\010req_size\030\002 \001(" +
+      "\0132\024.hbase.pb.TimedQuota\022\'\n\twrite_num\030\003 \001" +
+      "(\0132\024.hbase.pb.TimedQuota\022(\n\nwrite_size\030\004" +
+      " \001(\0132\024.hbase.pb.TimedQuota\022&\n\010read_num\030\005" +
+      " \001(\0132\024.hbase.pb.TimedQuota\022\'\n\tread_size\030",
+      "\006 \001(\0132\024.hbase.pb.TimedQuota\"b\n\017ThrottleR" +
+      "equest\022$\n\004type\030\001 \001(\0162\026.hbase.pb.Throttle" +
+      "Type\022)\n\013timed_quota\030\002 \001(\0132\024.hbase.pb.Tim" +
+      "edQuota\"M\n\006Quotas\022\035\n\016bypass_globals\030\001 \001(" +
+      "\010:\005false\022$\n\010throttle\030\002 \001(\0132\022.hbase.pb.Th" +
+      "rottle\"\014\n\nQuotaUsage*&\n\nQuotaScope\022\013\n\007CL" +
+      "USTER\020\001\022\013\n\007MACHINE\020\002*v\n\014ThrottleType\022\022\n\016" +
+      "REQUEST_NUMBER\020\001\022\020\n\014REQUEST_SIZE\020\002\022\020\n\014WR" +
+      "ITE_NUMBER\020\003\022\016\n\nWRITE_SIZE\020\004\022\017\n\013READ_NUM" +
+      "BER\020\005\022\r\n\tREAD_SIZE\020\006*\031\n\tQuotaType\022\014\n\010THR",
+      "OTTLE\020\001BA\n*org.apache.hadoop.hbase.proto" +
+      "buf.generatedB\013QuotaProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_TimedQuota_descriptor =
+          internal_static_hbase_pb_TimedQuota_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_TimedQuota_fieldAccessorTable = new
+          internal_static_hbase_pb_TimedQuota_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TimedQuota_descriptor,
+              internal_static_hbase_pb_TimedQuota_descriptor,
               new java.lang.String[] { "TimeUnit", "SoftLimit", "Share", "Scope", });
-          internal_static_Throttle_descriptor =
+          internal_static_hbase_pb_Throttle_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_Throttle_fieldAccessorTable = new
+          internal_static_hbase_pb_Throttle_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Throttle_descriptor,
+              internal_static_hbase_pb_Throttle_descriptor,
               new java.lang.String[] { "ReqNum", "ReqSize", "WriteNum", "WriteSize", "ReadNum", "ReadSize", });
-          internal_static_ThrottleRequest_descriptor =
+          internal_static_hbase_pb_ThrottleRequest_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_ThrottleRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ThrottleRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ThrottleRequest_descriptor,
+              internal_static_hbase_pb_ThrottleRequest_descriptor,
               new java.lang.String[] { "Type", "TimedQuota", });
-          internal_static_Quotas_descriptor =
+          internal_static_hbase_pb_Quotas_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_Quotas_fieldAccessorTable = new
+          internal_static_hbase_pb_Quotas_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Quotas_descriptor,
+              internal_static_hbase_pb_Quotas_descriptor,
               new java.lang.String[] { "BypassGlobals", "Throttle", });
-          internal_static_QuotaUsage_descriptor =
+          internal_static_hbase_pb_QuotaUsage_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_QuotaUsage_fieldAccessorTable = new
+          internal_static_hbase_pb_QuotaUsage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_QuotaUsage_descriptor,
+              internal_static_hbase_pb_QuotaUsage_descriptor,
               new java.lang.String[] { });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
index 7758e98dba1..99ccf76cfcb 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
@@ -42,7 +42,7 @@ public final class RPCProtos {
         getRealUserBytes();
   }
   /**
-   * Protobuf type {@code UserInformation}
+   * Protobuf type {@code hbase.pb.UserInformation}
    *
    * 
    * User Information proto.  Included in ConnectionHeader on connection setup
@@ -120,12 +120,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_UserInformation_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_UserInformation_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder.class);
     }
@@ -401,7 +401,7 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UserInformation}
+     * Protobuf type {@code hbase.pb.UserInformation}
      *
      * 
      * User Information proto.  Included in ConnectionHeader on connection setup
@@ -412,12 +412,12 @@ public final class RPCProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_UserInformation_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_UserInformation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder.class);
       }
@@ -455,7 +455,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_UserInformation_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_UserInformation_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getDefaultInstanceForType() {
@@ -687,7 +687,7 @@ public final class RPCProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UserInformation)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UserInformation)
     }
 
     static {
@@ -695,7 +695,7 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UserInformation)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UserInformation)
   }
 
   public interface VersionInfoOrBuilder
@@ -792,7 +792,7 @@ public final class RPCProtos {
         getSrcChecksumBytes();
   }
   /**
-   * Protobuf type {@code VersionInfo}
+   * Protobuf type {@code hbase.pb.VersionInfo}
    *
    * 
    * Rpc client version info proto. Included in ConnectionHeader on connection setup
@@ -890,12 +890,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_VersionInfo_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_VersionInfo_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_VersionInfo_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_VersionInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.Builder.class);
     }
@@ -1431,7 +1431,7 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code VersionInfo}
+     * Protobuf type {@code hbase.pb.VersionInfo}
      *
      * 
      * Rpc client version info proto. Included in ConnectionHeader on connection setup
@@ -1442,12 +1442,12 @@ public final class RPCProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_VersionInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_VersionInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_VersionInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_VersionInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.Builder.class);
       }
@@ -1493,7 +1493,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_VersionInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_VersionInfo_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo getDefaultInstanceForType() {
@@ -2077,7 +2077,7 @@ public final class RPCProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:VersionInfo)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.VersionInfo)
     }
 
     static {
@@ -2085,23 +2085,23 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:VersionInfo)
+    // @@protoc_insertion_point(class_scope:hbase.pb.VersionInfo)
   }
 
   public interface ConnectionHeaderOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .UserInformation user_info = 1;
+    // optional .hbase.pb.UserInformation user_info = 1;
     /**
-     * optional .UserInformation user_info = 1;
+     * optional .hbase.pb.UserInformation user_info = 1;
      */
     boolean hasUserInfo();
     /**
-     * optional .UserInformation user_info = 1;
+     * optional .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo();
     /**
-     * optional .UserInformation user_info = 1;
+     * optional .hbase.pb.UserInformation user_info = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder();
 
@@ -2180,22 +2180,22 @@ public final class RPCProtos {
     com.google.protobuf.ByteString
         getCellBlockCompressorClassBytes();
 
-    // optional .VersionInfo version_info = 5;
+    // optional .hbase.pb.VersionInfo version_info = 5;
     /**
-     * optional .VersionInfo version_info = 5;
+     * optional .hbase.pb.VersionInfo version_info = 5;
      */
     boolean hasVersionInfo();
     /**
-     * optional .VersionInfo version_info = 5;
+     * optional .hbase.pb.VersionInfo version_info = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo getVersionInfo();
     /**
-     * optional .VersionInfo version_info = 5;
+     * optional .hbase.pb.VersionInfo version_info = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfoOrBuilder getVersionInfoOrBuilder();
   }
   /**
-   * Protobuf type {@code ConnectionHeader}
+   * Protobuf type {@code hbase.pb.ConnectionHeader}
    *
    * 
    * This is sent on connection setup after the connection preamble is sent.
@@ -2304,12 +2304,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ConnectionHeader_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ConnectionHeader_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.Builder.class);
     }
@@ -2330,23 +2330,23 @@ public final class RPCProtos {
     }
 
     private int bitField0_;
-    // optional .UserInformation user_info = 1;
+    // optional .hbase.pb.UserInformation user_info = 1;
     public static final int USER_INFO_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_;
     /**
-     * optional .UserInformation user_info = 1;
+     * optional .hbase.pb.UserInformation user_info = 1;
      */
     public boolean hasUserInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .UserInformation user_info = 1;
+     * optional .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
       return userInfo_;
     }
     /**
-     * optional .UserInformation user_info = 1;
+     * optional .hbase.pb.UserInformation user_info = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
       return userInfo_;
@@ -2511,23 +2511,23 @@ public final class RPCProtos {
       }
     }
 
-    // optional .VersionInfo version_info = 5;
+    // optional .hbase.pb.VersionInfo version_info = 5;
     public static final int VERSION_INFO_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo versionInfo_;
     /**
-     * optional .VersionInfo version_info = 5;
+     * optional .hbase.pb.VersionInfo version_info = 5;
      */
     public boolean hasVersionInfo() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .VersionInfo version_info = 5;
+     * optional .hbase.pb.VersionInfo version_info = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo getVersionInfo() {
       return versionInfo_;
     }
     /**
-     * optional .VersionInfo version_info = 5;
+     * optional .hbase.pb.VersionInfo version_info = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfoOrBuilder getVersionInfoOrBuilder() {
       return versionInfo_;
@@ -2761,7 +2761,7 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ConnectionHeader}
+     * Protobuf type {@code hbase.pb.ConnectionHeader}
      *
      * 
      * This is sent on connection setup after the connection preamble is sent.
@@ -2772,12 +2772,12 @@ public final class RPCProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeaderOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ConnectionHeader_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ConnectionHeader_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader.Builder.class);
       }
@@ -2831,7 +2831,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ConnectionHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ConnectionHeader_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader getDefaultInstanceForType() {
@@ -2954,18 +2954,18 @@ public final class RPCProtos {
       }
       private int bitField0_;
 
-      // optional .UserInformation user_info = 1;
+      // optional .hbase.pb.UserInformation user_info = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> userInfoBuilder_;
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public boolean hasUserInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation getUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -2975,7 +2975,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -2991,7 +2991,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public Builder setUserInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder builderForValue) {
@@ -3005,7 +3005,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public Builder mergeUserInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation value) {
         if (userInfoBuilder_ == null) {
@@ -3024,7 +3024,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public Builder clearUserInfo() {
         if (userInfoBuilder_ == null) {
@@ -3037,7 +3037,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder getUserInfoBuilder() {
         bitField0_ |= 0x00000001;
@@ -3045,7 +3045,7 @@ public final class RPCProtos {
         return getUserInfoFieldBuilder().getBuilder();
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder getUserInfoOrBuilder() {
         if (userInfoBuilder_ != null) {
@@ -3055,7 +3055,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .UserInformation user_info = 1;
+       * optional .hbase.pb.UserInformation user_info = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformationOrBuilder> 
@@ -3353,18 +3353,18 @@ public final class RPCProtos {
         return this;
       }
 
-      // optional .VersionInfo version_info = 5;
+      // optional .hbase.pb.VersionInfo version_info = 5;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo versionInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfoOrBuilder> versionInfoBuilder_;
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public boolean hasVersionInfo() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo getVersionInfo() {
         if (versionInfoBuilder_ == null) {
@@ -3374,7 +3374,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public Builder setVersionInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo value) {
         if (versionInfoBuilder_ == null) {
@@ -3390,7 +3390,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public Builder setVersionInfo(
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.Builder builderForValue) {
@@ -3404,7 +3404,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public Builder mergeVersionInfo(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo value) {
         if (versionInfoBuilder_ == null) {
@@ -3423,7 +3423,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public Builder clearVersionInfo() {
         if (versionInfoBuilder_ == null) {
@@ -3436,7 +3436,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.Builder getVersionInfoBuilder() {
         bitField0_ |= 0x00000010;
@@ -3444,7 +3444,7 @@ public final class RPCProtos {
         return getVersionInfoFieldBuilder().getBuilder();
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfoOrBuilder getVersionInfoOrBuilder() {
         if (versionInfoBuilder_ != null) {
@@ -3454,7 +3454,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .VersionInfo version_info = 5;
+       * optional .hbase.pb.VersionInfo version_info = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.VersionInfoOrBuilder> 
@@ -3470,7 +3470,7 @@ public final class RPCProtos {
         return versionInfoBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ConnectionHeader)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ConnectionHeader)
     }
 
     static {
@@ -3478,7 +3478,7 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ConnectionHeader)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ConnectionHeader)
   }
 
   public interface CellBlockMetaOrBuilder
@@ -3503,7 +3503,7 @@ public final class RPCProtos {
     int getLength();
   }
   /**
-   * Protobuf type {@code CellBlockMeta}
+   * Protobuf type {@code hbase.pb.CellBlockMeta}
    *
    * 
    * Optional Cell block Message.  Included in client RequestHeader
@@ -3576,12 +3576,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_CellBlockMeta_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_CellBlockMeta_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.Builder.class);
     }
@@ -3774,7 +3774,7 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CellBlockMeta}
+     * Protobuf type {@code hbase.pb.CellBlockMeta}
      *
      * 
      * Optional Cell block Message.  Included in client RequestHeader
@@ -3785,12 +3785,12 @@ public final class RPCProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_CellBlockMeta_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_CellBlockMeta_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.Builder.class);
       }
@@ -3826,7 +3826,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_CellBlockMeta_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta getDefaultInstanceForType() {
@@ -3944,7 +3944,7 @@ public final class RPCProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CellBlockMeta)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CellBlockMeta)
     }
 
     static {
@@ -3952,7 +3952,7 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CellBlockMeta)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CellBlockMeta)
   }
 
   public interface ExceptionResponseOrBuilder
@@ -4071,7 +4071,7 @@ public final class RPCProtos {
     boolean getDoNotRetry();
   }
   /**
-   * Protobuf type {@code ExceptionResponse}
+   * Protobuf type {@code hbase.pb.ExceptionResponse}
    *
    * 
    * At the RPC layer, this message is used to carry
@@ -4165,12 +4165,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ExceptionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ExceptionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.Builder.class);
     }
@@ -4615,7 +4615,7 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ExceptionResponse}
+     * Protobuf type {@code hbase.pb.ExceptionResponse}
      *
      * 
      * At the RPC layer, this message is used to carry
@@ -4627,12 +4627,12 @@ public final class RPCProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ExceptionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ExceptionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.Builder.class);
       }
@@ -4676,7 +4676,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ExceptionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse getDefaultInstanceForType() {
@@ -5161,7 +5161,7 @@ public final class RPCProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ExceptionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ExceptionResponse)
     }
 
     static {
@@ -5169,7 +5169,7 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ExceptionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ExceptionResponse)
   }
 
   public interface RequestHeaderOrBuilder
@@ -5193,17 +5193,17 @@ public final class RPCProtos {
      */
     int getCallId();
 
-    // optional .RPCTInfo trace_info = 2;
+    // optional .hbase.pb.RPCTInfo trace_info = 2;
     /**
-     * optional .RPCTInfo trace_info = 2;
+     * optional .hbase.pb.RPCTInfo trace_info = 2;
      */
     boolean hasTraceInfo();
     /**
-     * optional .RPCTInfo trace_info = 2;
+     * optional .hbase.pb.RPCTInfo trace_info = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo getTraceInfo();
     /**
-     * optional .RPCTInfo trace_info = 2;
+     * optional .hbase.pb.RPCTInfo trace_info = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfoOrBuilder getTraceInfoOrBuilder();
 
@@ -5240,9 +5240,9 @@ public final class RPCProtos {
      */
     boolean getRequestParam();
 
-    // optional .CellBlockMeta cell_block_meta = 5;
+    // optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
     /**
-     * optional .CellBlockMeta cell_block_meta = 5;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
      *
      * 
      * If present, then an encoded data block follows.
@@ -5250,7 +5250,7 @@ public final class RPCProtos {
      */
     boolean hasCellBlockMeta();
     /**
-     * optional .CellBlockMeta cell_block_meta = 5;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
      *
      * 
      * If present, then an encoded data block follows.
@@ -5258,7 +5258,7 @@ public final class RPCProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta getCellBlockMeta();
     /**
-     * optional .CellBlockMeta cell_block_meta = 5;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
      *
      * 
      * If present, then an encoded data block follows.
@@ -5287,7 +5287,7 @@ public final class RPCProtos {
     int getPriority();
   }
   /**
-   * Protobuf type {@code RequestHeader}
+   * Protobuf type {@code hbase.pb.RequestHeader}
    *
    * 
    * Header sent making a request.
@@ -5401,12 +5401,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_RequestHeader_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_RequestHeader_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader.Builder.class);
     }
@@ -5451,23 +5451,23 @@ public final class RPCProtos {
       return callId_;
     }
 
-    // optional .RPCTInfo trace_info = 2;
+    // optional .hbase.pb.RPCTInfo trace_info = 2;
     public static final int TRACE_INFO_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo traceInfo_;
     /**
-     * optional .RPCTInfo trace_info = 2;
+     * optional .hbase.pb.RPCTInfo trace_info = 2;
      */
     public boolean hasTraceInfo() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .RPCTInfo trace_info = 2;
+     * optional .hbase.pb.RPCTInfo trace_info = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo getTraceInfo() {
       return traceInfo_;
     }
     /**
-     * optional .RPCTInfo trace_info = 2;
+     * optional .hbase.pb.RPCTInfo trace_info = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfoOrBuilder getTraceInfoOrBuilder() {
       return traceInfo_;
@@ -5540,11 +5540,11 @@ public final class RPCProtos {
       return requestParam_;
     }
 
-    // optional .CellBlockMeta cell_block_meta = 5;
+    // optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
     public static final int CELL_BLOCK_META_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta cellBlockMeta_;
     /**
-     * optional .CellBlockMeta cell_block_meta = 5;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
      *
      * 
      * If present, then an encoded data block follows.
@@ -5554,7 +5554,7 @@ public final class RPCProtos {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .CellBlockMeta cell_block_meta = 5;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
      *
      * 
      * If present, then an encoded data block follows.
@@ -5564,7 +5564,7 @@ public final class RPCProtos {
       return cellBlockMeta_;
     }
     /**
-     * optional .CellBlockMeta cell_block_meta = 5;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
      *
      * 
      * If present, then an encoded data block follows.
@@ -5833,7 +5833,7 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RequestHeader}
+     * Protobuf type {@code hbase.pb.RequestHeader}
      *
      * 
      * Header sent making a request.
@@ -5844,12 +5844,12 @@ public final class RPCProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeaderOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_RequestHeader_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_RequestHeader_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader.Builder.class);
       }
@@ -5905,7 +5905,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_RequestHeader_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader getDefaultInstanceForType() {
@@ -6068,18 +6068,18 @@ public final class RPCProtos {
         return this;
       }
 
-      // optional .RPCTInfo trace_info = 2;
+      // optional .hbase.pb.RPCTInfo trace_info = 2;
       private org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo traceInfo_ = org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo, org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfoOrBuilder> traceInfoBuilder_;
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public boolean hasTraceInfo() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo getTraceInfo() {
         if (traceInfoBuilder_ == null) {
@@ -6089,7 +6089,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public Builder setTraceInfo(org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo value) {
         if (traceInfoBuilder_ == null) {
@@ -6105,7 +6105,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public Builder setTraceInfo(
           org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.Builder builderForValue) {
@@ -6119,7 +6119,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public Builder mergeTraceInfo(org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo value) {
         if (traceInfoBuilder_ == null) {
@@ -6138,7 +6138,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public Builder clearTraceInfo() {
         if (traceInfoBuilder_ == null) {
@@ -6151,7 +6151,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.Builder getTraceInfoBuilder() {
         bitField0_ |= 0x00000002;
@@ -6159,7 +6159,7 @@ public final class RPCProtos {
         return getTraceInfoFieldBuilder().getBuilder();
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfoOrBuilder getTraceInfoOrBuilder() {
         if (traceInfoBuilder_ != null) {
@@ -6169,7 +6169,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .RPCTInfo trace_info = 2;
+       * optional .hbase.pb.RPCTInfo trace_info = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo, org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfoOrBuilder> 
@@ -6308,12 +6308,12 @@ public final class RPCProtos {
         return this;
       }
 
-      // optional .CellBlockMeta cell_block_meta = 5;
+      // optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta cellBlockMeta_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder> cellBlockMetaBuilder_;
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6323,7 +6323,7 @@ public final class RPCProtos {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6337,7 +6337,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6357,7 +6357,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6375,7 +6375,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6398,7 +6398,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6415,7 +6415,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6427,7 +6427,7 @@ public final class RPCProtos {
         return getCellBlockMetaFieldBuilder().getBuilder();
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6441,7 +6441,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 5;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 5;
        *
        * 
        * If present, then an encoded data block follows.
@@ -6514,7 +6514,7 @@ public final class RPCProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RequestHeader)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RequestHeader)
     }
 
     static {
@@ -6522,7 +6522,7 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RequestHeader)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RequestHeader)
   }
 
   public interface ResponseHeaderOrBuilder
@@ -6538,9 +6538,9 @@ public final class RPCProtos {
      */
     int getCallId();
 
-    // optional .ExceptionResponse exception = 2;
+    // optional .hbase.pb.ExceptionResponse exception = 2;
     /**
-     * optional .ExceptionResponse exception = 2;
+     * optional .hbase.pb.ExceptionResponse exception = 2;
      *
      * 
      * If present, then request threw an exception and no response message (else we presume one)
@@ -6548,7 +6548,7 @@ public final class RPCProtos {
      */
     boolean hasException();
     /**
-     * optional .ExceptionResponse exception = 2;
+     * optional .hbase.pb.ExceptionResponse exception = 2;
      *
      * 
      * If present, then request threw an exception and no response message (else we presume one)
@@ -6556,7 +6556,7 @@ public final class RPCProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse getException();
     /**
-     * optional .ExceptionResponse exception = 2;
+     * optional .hbase.pb.ExceptionResponse exception = 2;
      *
      * 
      * If present, then request threw an exception and no response message (else we presume one)
@@ -6564,9 +6564,9 @@ public final class RPCProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponseOrBuilder getExceptionOrBuilder();
 
-    // optional .CellBlockMeta cell_block_meta = 3;
+    // optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
     /**
-     * optional .CellBlockMeta cell_block_meta = 3;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
      *
      * 
      * If present, then an encoded data block follows.
@@ -6574,7 +6574,7 @@ public final class RPCProtos {
      */
     boolean hasCellBlockMeta();
     /**
-     * optional .CellBlockMeta cell_block_meta = 3;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
      *
      * 
      * If present, then an encoded data block follows.
@@ -6582,7 +6582,7 @@ public final class RPCProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta getCellBlockMeta();
     /**
-     * optional .CellBlockMeta cell_block_meta = 3;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
      *
      * 
      * If present, then an encoded data block follows.
@@ -6591,7 +6591,7 @@ public final class RPCProtos {
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder getCellBlockMetaOrBuilder();
   }
   /**
-   * Protobuf type {@code ResponseHeader}
+   * Protobuf type {@code hbase.pb.ResponseHeader}
    */
   public static final class ResponseHeader extends
       com.google.protobuf.GeneratedMessage
@@ -6686,12 +6686,12 @@ public final class RPCProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ResponseHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ResponseHeader_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ResponseHeader_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ResponseHeader_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ResponseHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ResponseHeader.Builder.class);
     }
@@ -6728,11 +6728,11 @@ public final class RPCProtos {
       return callId_;
     }
 
-    // optional .ExceptionResponse exception = 2;
+    // optional .hbase.pb.ExceptionResponse exception = 2;
     public static final int EXCEPTION_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse exception_;
     /**
-     * optional .ExceptionResponse exception = 2;
+     * optional .hbase.pb.ExceptionResponse exception = 2;
      *
      * 
      * If present, then request threw an exception and no response message (else we presume one)
@@ -6742,7 +6742,7 @@ public final class RPCProtos {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .ExceptionResponse exception = 2;
+     * optional .hbase.pb.ExceptionResponse exception = 2;
      *
      * 
      * If present, then request threw an exception and no response message (else we presume one)
@@ -6752,7 +6752,7 @@ public final class RPCProtos {
       return exception_;
     }
     /**
-     * optional .ExceptionResponse exception = 2;
+     * optional .hbase.pb.ExceptionResponse exception = 2;
      *
      * 
      * If present, then request threw an exception and no response message (else we presume one)
@@ -6762,11 +6762,11 @@ public final class RPCProtos {
       return exception_;
     }
 
-    // optional .CellBlockMeta cell_block_meta = 3;
+    // optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
     public static final int CELL_BLOCK_META_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta cellBlockMeta_;
     /**
-     * optional .CellBlockMeta cell_block_meta = 3;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
      *
      * 
      * If present, then an encoded data block follows.
@@ -6776,7 +6776,7 @@ public final class RPCProtos {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .CellBlockMeta cell_block_meta = 3;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
      *
      * 
      * If present, then an encoded data block follows.
@@ -6786,7 +6786,7 @@ public final class RPCProtos {
       return cellBlockMeta_;
     }
     /**
-     * optional .CellBlockMeta cell_block_meta = 3;
+     * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
      *
      * 
      * If present, then an encoded data block follows.
@@ -6978,19 +6978,19 @@ public final class RPCProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ResponseHeader}
+     * Protobuf type {@code hbase.pb.ResponseHeader}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ResponseHeaderOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ResponseHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ResponseHeader_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ResponseHeader_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ResponseHeader_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ResponseHeader.class, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ResponseHeader.Builder.class);
       }
@@ -7040,7 +7040,7 @@ public final class RPCProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ResponseHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_hbase_pb_ResponseHeader_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ResponseHeader getDefaultInstanceForType() {
@@ -7164,12 +7164,12 @@ public final class RPCProtos {
         return this;
       }
 
-      // optional .ExceptionResponse exception = 2;
+      // optional .hbase.pb.ExceptionResponse exception = 2;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse exception_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponseOrBuilder> exceptionBuilder_;
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7179,7 +7179,7 @@ public final class RPCProtos {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7193,7 +7193,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7213,7 +7213,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7231,7 +7231,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7254,7 +7254,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7271,7 +7271,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7283,7 +7283,7 @@ public final class RPCProtos {
         return getExceptionFieldBuilder().getBuilder();
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7297,7 +7297,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .ExceptionResponse exception = 2;
+       * optional .hbase.pb.ExceptionResponse exception = 2;
        *
        * 
        * If present, then request threw an exception and no response message (else we presume one)
@@ -7317,12 +7317,12 @@ public final class RPCProtos {
         return exceptionBuilder_;
       }
 
-      // optional .CellBlockMeta cell_block_meta = 3;
+      // optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
       private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta cellBlockMeta_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.Builder, org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder> cellBlockMetaBuilder_;
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7332,7 +7332,7 @@ public final class RPCProtos {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7346,7 +7346,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7366,7 +7366,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7384,7 +7384,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7407,7 +7407,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7424,7 +7424,7 @@ public final class RPCProtos {
         return this;
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7436,7 +7436,7 @@ public final class RPCProtos {
         return getCellBlockMetaFieldBuilder().getBuilder();
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7450,7 +7450,7 @@ public final class RPCProtos {
         }
       }
       /**
-       * optional .CellBlockMeta cell_block_meta = 3;
+       * optional .hbase.pb.CellBlockMeta cell_block_meta = 3;
        *
        * 
        * If present, then an encoded data block follows.
@@ -7470,7 +7470,7 @@ public final class RPCProtos {
         return cellBlockMetaBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ResponseHeader)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ResponseHeader)
     }
 
     static {
@@ -7478,44 +7478,44 @@ public final class RPCProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ResponseHeader)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ResponseHeader)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UserInformation_descriptor;
+    internal_static_hbase_pb_UserInformation_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UserInformation_fieldAccessorTable;
+      internal_static_hbase_pb_UserInformation_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_VersionInfo_descriptor;
+    internal_static_hbase_pb_VersionInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_VersionInfo_fieldAccessorTable;
+      internal_static_hbase_pb_VersionInfo_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ConnectionHeader_descriptor;
+    internal_static_hbase_pb_ConnectionHeader_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ConnectionHeader_fieldAccessorTable;
+      internal_static_hbase_pb_ConnectionHeader_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CellBlockMeta_descriptor;
+    internal_static_hbase_pb_CellBlockMeta_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CellBlockMeta_fieldAccessorTable;
+      internal_static_hbase_pb_CellBlockMeta_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ExceptionResponse_descriptor;
+    internal_static_hbase_pb_ExceptionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ExceptionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ExceptionResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RequestHeader_descriptor;
+    internal_static_hbase_pb_RequestHeader_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RequestHeader_fieldAccessorTable;
+      internal_static_hbase_pb_RequestHeader_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ResponseHeader_descriptor;
+    internal_static_hbase_pb_ResponseHeader_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ResponseHeader_fieldAccessorTable;
+      internal_static_hbase_pb_ResponseHeader_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -7525,76 +7525,78 @@ public final class RPCProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\tRPC.proto\032\rTracing.proto\032\013HBase.proto\"" +
-      "<\n\017UserInformation\022\026\n\016effective_user\030\001 \002" +
-      "(\t\022\021\n\treal_user\030\002 \001(\t\"o\n\013VersionInfo\022\017\n\007" +
-      "version\030\001 \002(\t\022\013\n\003url\030\002 \002(\t\022\020\n\010revision\030\003" +
-      " \002(\t\022\014\n\004user\030\004 \002(\t\022\014\n\004date\030\005 \002(\t\022\024\n\014src_" +
-      "checksum\030\006 \002(\t\"\266\001\n\020ConnectionHeader\022#\n\tu" +
-      "ser_info\030\001 \001(\0132\020.UserInformation\022\024\n\014serv" +
-      "ice_name\030\002 \001(\t\022\036\n\026cell_block_codec_class" +
-      "\030\003 \001(\t\022#\n\033cell_block_compressor_class\030\004 " +
-      "\001(\t\022\"\n\014version_info\030\005 \001(\0132\014.VersionInfo\"",
-      "\037\n\rCellBlockMeta\022\016\n\006length\030\001 \001(\r\"|\n\021Exce" +
-      "ptionResponse\022\034\n\024exception_class_name\030\001 " +
-      "\001(\t\022\023\n\013stack_trace\030\002 \001(\t\022\020\n\010hostname\030\003 \001" +
-      "(\t\022\014\n\004port\030\004 \001(\005\022\024\n\014do_not_retry\030\005 \001(\010\"\246" +
-      "\001\n\rRequestHeader\022\017\n\007call_id\030\001 \001(\r\022\035\n\ntra" +
-      "ce_info\030\002 \001(\0132\t.RPCTInfo\022\023\n\013method_name\030" +
-      "\003 \001(\t\022\025\n\rrequest_param\030\004 \001(\010\022\'\n\017cell_blo" +
-      "ck_meta\030\005 \001(\0132\016.CellBlockMeta\022\020\n\010priorit" +
-      "y\030\006 \001(\r\"q\n\016ResponseHeader\022\017\n\007call_id\030\001 \001" +
-      "(\r\022%\n\texception\030\002 \001(\0132\022.ExceptionRespons",
-      "e\022\'\n\017cell_block_meta\030\003 \001(\0132\016.CellBlockMe" +
-      "taB<\n*org.apache.hadoop.hbase.protobuf.g" +
-      "eneratedB\tRPCProtosH\001\240\001\001"
+      "\n\tRPC.proto\022\010hbase.pb\032\rTracing.proto\032\013HB" +
+      "ase.proto\"<\n\017UserInformation\022\026\n\016effectiv" +
+      "e_user\030\001 \002(\t\022\021\n\treal_user\030\002 \001(\t\"o\n\013Versi" +
+      "onInfo\022\017\n\007version\030\001 \002(\t\022\013\n\003url\030\002 \002(\t\022\020\n\010" +
+      "revision\030\003 \002(\t\022\014\n\004user\030\004 \002(\t\022\014\n\004date\030\005 \002" +
+      "(\t\022\024\n\014src_checksum\030\006 \002(\t\"\310\001\n\020ConnectionH" +
+      "eader\022,\n\tuser_info\030\001 \001(\0132\031.hbase.pb.User" +
+      "Information\022\024\n\014service_name\030\002 \001(\t\022\036\n\026cel" +
+      "l_block_codec_class\030\003 \001(\t\022#\n\033cell_block_" +
+      "compressor_class\030\004 \001(\t\022+\n\014version_info\030\005",
+      " \001(\0132\025.hbase.pb.VersionInfo\"\037\n\rCellBlock" +
+      "Meta\022\016\n\006length\030\001 \001(\r\"|\n\021ExceptionRespons" +
+      "e\022\034\n\024exception_class_name\030\001 \001(\t\022\023\n\013stack" +
+      "_trace\030\002 \001(\t\022\020\n\010hostname\030\003 \001(\t\022\014\n\004port\030\004" +
+      " \001(\005\022\024\n\014do_not_retry\030\005 \001(\010\"\270\001\n\rRequestHe" +
+      "ader\022\017\n\007call_id\030\001 \001(\r\022&\n\ntrace_info\030\002 \001(" +
+      "\0132\022.hbase.pb.RPCTInfo\022\023\n\013method_name\030\003 \001" +
+      "(\t\022\025\n\rrequest_param\030\004 \001(\010\0220\n\017cell_block_" +
+      "meta\030\005 \001(\0132\027.hbase.pb.CellBlockMeta\022\020\n\010p" +
+      "riority\030\006 \001(\r\"\203\001\n\016ResponseHeader\022\017\n\007call",
+      "_id\030\001 \001(\r\022.\n\texception\030\002 \001(\0132\033.hbase.pb." +
+      "ExceptionResponse\0220\n\017cell_block_meta\030\003 \001" +
+      "(\0132\027.hbase.pb.CellBlockMetaB<\n*org.apach" +
+      "e.hadoop.hbase.protobuf.generatedB\tRPCPr" +
+      "otosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_UserInformation_descriptor =
+          internal_static_hbase_pb_UserInformation_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_UserInformation_fieldAccessorTable = new
+          internal_static_hbase_pb_UserInformation_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UserInformation_descriptor,
+              internal_static_hbase_pb_UserInformation_descriptor,
               new java.lang.String[] { "EffectiveUser", "RealUser", });
-          internal_static_VersionInfo_descriptor =
+          internal_static_hbase_pb_VersionInfo_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_VersionInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_VersionInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_VersionInfo_descriptor,
+              internal_static_hbase_pb_VersionInfo_descriptor,
               new java.lang.String[] { "Version", "Url", "Revision", "User", "Date", "SrcChecksum", });
-          internal_static_ConnectionHeader_descriptor =
+          internal_static_hbase_pb_ConnectionHeader_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_ConnectionHeader_fieldAccessorTable = new
+          internal_static_hbase_pb_ConnectionHeader_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ConnectionHeader_descriptor,
+              internal_static_hbase_pb_ConnectionHeader_descriptor,
               new java.lang.String[] { "UserInfo", "ServiceName", "CellBlockCodecClass", "CellBlockCompressorClass", "VersionInfo", });
-          internal_static_CellBlockMeta_descriptor =
+          internal_static_hbase_pb_CellBlockMeta_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_CellBlockMeta_fieldAccessorTable = new
+          internal_static_hbase_pb_CellBlockMeta_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CellBlockMeta_descriptor,
+              internal_static_hbase_pb_CellBlockMeta_descriptor,
               new java.lang.String[] { "Length", });
-          internal_static_ExceptionResponse_descriptor =
+          internal_static_hbase_pb_ExceptionResponse_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_ExceptionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ExceptionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ExceptionResponse_descriptor,
+              internal_static_hbase_pb_ExceptionResponse_descriptor,
               new java.lang.String[] { "ExceptionClassName", "StackTrace", "Hostname", "Port", "DoNotRetry", });
-          internal_static_RequestHeader_descriptor =
+          internal_static_hbase_pb_RequestHeader_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_RequestHeader_fieldAccessorTable = new
+          internal_static_hbase_pb_RequestHeader_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RequestHeader_descriptor,
+              internal_static_hbase_pb_RequestHeader_descriptor,
               new java.lang.String[] { "CallId", "TraceInfo", "MethodName", "RequestParam", "CellBlockMeta", "Priority", });
-          internal_static_ResponseHeader_descriptor =
+          internal_static_hbase_pb_ResponseHeader_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_ResponseHeader_fieldAccessorTable = new
+          internal_static_hbase_pb_ResponseHeader_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ResponseHeader_descriptor,
+              internal_static_hbase_pb_ResponseHeader_descriptor,
               new java.lang.String[] { "CallId", "Exception", "CellBlockMeta", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RegionServerStatusProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RegionServerStatusProtos.java
index a8cd58a50f4..6754bd1284b 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RegionServerStatusProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RegionServerStatusProtos.java
@@ -93,7 +93,7 @@ public final class RegionServerStatusProtos {
         getUseThisHostnameInsteadBytes();
   }
   /**
-   * Protobuf type {@code RegionServerStartupRequest}
+   * Protobuf type {@code hbase.pb.RegionServerStartupRequest}
    */
   public static final class RegionServerStartupRequest extends
       com.google.protobuf.GeneratedMessage
@@ -177,12 +177,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest.Builder.class);
     }
@@ -541,19 +541,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionServerStartupRequest}
+     * Protobuf type {@code hbase.pb.RegionServerStartupRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest.Builder.class);
       }
@@ -595,7 +595,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest getDefaultInstanceForType() {
@@ -944,7 +944,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionServerStartupRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionServerStartupRequest)
     }
 
     static {
@@ -952,15 +952,15 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionServerStartupRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionServerStartupRequest)
   }
 
   public interface RegionServerStartupResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .NameStringPair map_entries = 1;
+    // repeated .hbase.pb.NameStringPair map_entries = 1;
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -972,7 +972,7 @@ public final class RegionServerStatusProtos {
     java.util.List 
         getMapEntriesList();
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -983,7 +983,7 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getMapEntries(int index);
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -994,7 +994,7 @@ public final class RegionServerStatusProtos {
      */
     int getMapEntriesCount();
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1006,7 +1006,7 @@ public final class RegionServerStatusProtos {
     java.util.List 
         getMapEntriesOrBuilderList();
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1019,7 +1019,7 @@ public final class RegionServerStatusProtos {
         int index);
   }
   /**
-   * Protobuf type {@code RegionServerStartupResponse}
+   * Protobuf type {@code hbase.pb.RegionServerStartupResponse}
    */
   public static final class RegionServerStartupResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1094,12 +1094,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse.Builder.class);
     }
@@ -1119,11 +1119,11 @@ public final class RegionServerStatusProtos {
       return PARSER;
     }
 
-    // repeated .NameStringPair map_entries = 1;
+    // repeated .hbase.pb.NameStringPair map_entries = 1;
     public static final int MAP_ENTRIES_FIELD_NUMBER = 1;
     private java.util.List mapEntries_;
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1136,7 +1136,7 @@ public final class RegionServerStatusProtos {
       return mapEntries_;
     }
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1150,7 +1150,7 @@ public final class RegionServerStatusProtos {
       return mapEntries_;
     }
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1163,7 +1163,7 @@ public final class RegionServerStatusProtos {
       return mapEntries_.size();
     }
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1176,7 +1176,7 @@ public final class RegionServerStatusProtos {
       return mapEntries_.get(index);
     }
     /**
-     * repeated .NameStringPair map_entries = 1;
+     * repeated .hbase.pb.NameStringPair map_entries = 1;
      *
      * 
      **
@@ -1341,19 +1341,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionServerStartupResponse}
+     * Protobuf type {@code hbase.pb.RegionServerStartupResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse.Builder.class);
       }
@@ -1394,7 +1394,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerStartupResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerStartupResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse getDefaultInstanceForType() {
@@ -1495,7 +1495,7 @@ public final class RegionServerStatusProtos {
       }
       private int bitField0_;
 
-      // repeated .NameStringPair map_entries = 1;
+      // repeated .hbase.pb.NameStringPair map_entries = 1;
       private java.util.List mapEntries_ =
         java.util.Collections.emptyList();
       private void ensureMapEntriesIsMutable() {
@@ -1509,7 +1509,7 @@ public final class RegionServerStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder> mapEntriesBuilder_;
 
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1526,7 +1526,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1543,7 +1543,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1560,7 +1560,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1584,7 +1584,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1605,7 +1605,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1628,7 +1628,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1652,7 +1652,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1673,7 +1673,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1694,7 +1694,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1715,7 +1715,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1735,7 +1735,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1755,7 +1755,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1769,7 +1769,7 @@ public final class RegionServerStatusProtos {
         return getMapEntriesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1786,7 +1786,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1804,7 +1804,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1818,7 +1818,7 @@ public final class RegionServerStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1833,7 +1833,7 @@ public final class RegionServerStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair map_entries = 1;
+       * repeated .hbase.pb.NameStringPair map_entries = 1;
        *
        * 
        **
@@ -1861,7 +1861,7 @@ public final class RegionServerStatusProtos {
         return mapEntriesBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionServerStartupResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionServerStartupResponse)
     }
 
     static {
@@ -1869,29 +1869,29 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionServerStartupResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionServerStartupResponse)
   }
 
   public interface RegionServerReportRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     boolean hasServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder();
 
-    // optional .ServerLoad load = 2;
+    // optional .hbase.pb.ServerLoad load = 2;
     /**
-     * optional .ServerLoad load = 2;
+     * optional .hbase.pb.ServerLoad load = 2;
      *
      * 
      ** load the server is under 
@@ -1899,7 +1899,7 @@ public final class RegionServerStatusProtos {
      */
     boolean hasLoad();
     /**
-     * optional .ServerLoad load = 2;
+     * optional .hbase.pb.ServerLoad load = 2;
      *
      * 
      ** load the server is under 
@@ -1907,7 +1907,7 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad getLoad();
     /**
-     * optional .ServerLoad load = 2;
+     * optional .hbase.pb.ServerLoad load = 2;
      *
      * 
      ** load the server is under 
@@ -1916,7 +1916,7 @@ public final class RegionServerStatusProtos {
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder getLoadOrBuilder();
   }
   /**
-   * Protobuf type {@code RegionServerReportRequest}
+   * Protobuf type {@code hbase.pb.RegionServerReportRequest}
    */
   public static final class RegionServerReportRequest extends
       com.google.protobuf.GeneratedMessage
@@ -2006,12 +2006,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest.Builder.class);
     }
@@ -2032,33 +2032,33 @@ public final class RegionServerStatusProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     public static final int SERVER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     public boolean hasServer() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer() {
       return server_;
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder() {
       return server_;
     }
 
-    // optional .ServerLoad load = 2;
+    // optional .hbase.pb.ServerLoad load = 2;
     public static final int LOAD_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad load_;
     /**
-     * optional .ServerLoad load = 2;
+     * optional .hbase.pb.ServerLoad load = 2;
      *
      * 
      ** load the server is under 
@@ -2068,7 +2068,7 @@ public final class RegionServerStatusProtos {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .ServerLoad load = 2;
+     * optional .hbase.pb.ServerLoad load = 2;
      *
      * 
      ** load the server is under 
@@ -2078,7 +2078,7 @@ public final class RegionServerStatusProtos {
       return load_;
     }
     /**
-     * optional .ServerLoad load = 2;
+     * optional .hbase.pb.ServerLoad load = 2;
      *
      * 
      ** load the server is under 
@@ -2267,19 +2267,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionServerReportRequest}
+     * Protobuf type {@code hbase.pb.RegionServerReportRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest.Builder.class);
       }
@@ -2327,7 +2327,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest getDefaultInstanceForType() {
@@ -2425,18 +2425,18 @@ public final class RegionServerStatusProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server = 1;
+      // required .hbase.pb.ServerName server = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_;
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public boolean hasServer() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer() {
         if (serverBuilder_ == null) {
@@ -2446,7 +2446,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder setServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverBuilder_ == null) {
@@ -2462,7 +2462,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder setServer(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -2476,7 +2476,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder mergeServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverBuilder_ == null) {
@@ -2495,7 +2495,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public Builder clearServer() {
         if (serverBuilder_ == null) {
@@ -2508,7 +2508,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getServerBuilder() {
         bitField0_ |= 0x00000001;
@@ -2516,7 +2516,7 @@ public final class RegionServerStatusProtos {
         return getServerFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder() {
         if (serverBuilder_ != null) {
@@ -2526,7 +2526,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -2542,12 +2542,12 @@ public final class RegionServerStatusProtos {
         return serverBuilder_;
       }
 
-      // optional .ServerLoad load = 2;
+      // optional .hbase.pb.ServerLoad load = 2;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad load_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoad.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.ServerLoadOrBuilder> loadBuilder_;
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2557,7 +2557,7 @@ public final class RegionServerStatusProtos {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2571,7 +2571,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2591,7 +2591,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2609,7 +2609,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2632,7 +2632,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2649,7 +2649,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2661,7 +2661,7 @@ public final class RegionServerStatusProtos {
         return getLoadFieldBuilder().getBuilder();
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2675,7 +2675,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * optional .ServerLoad load = 2;
+       * optional .hbase.pb.ServerLoad load = 2;
        *
        * 
        ** load the server is under 
@@ -2695,7 +2695,7 @@ public final class RegionServerStatusProtos {
         return loadBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionServerReportRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionServerReportRequest)
     }
 
     static {
@@ -2703,14 +2703,14 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionServerReportRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionServerReportRequest)
   }
 
   public interface RegionServerReportResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code RegionServerReportResponse}
+   * Protobuf type {@code hbase.pb.RegionServerReportResponse}
    */
   public static final class RegionServerReportResponse extends
       com.google.protobuf.GeneratedMessage
@@ -2773,12 +2773,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse.Builder.class);
     }
@@ -2929,19 +2929,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionServerReportResponse}
+     * Protobuf type {@code hbase.pb.RegionServerReportResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse.Builder.class);
       }
@@ -2975,7 +2975,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionServerReportResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionServerReportResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse getDefaultInstanceForType() {
@@ -3033,7 +3033,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionServerReportResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionServerReportResponse)
     }
 
     static {
@@ -3041,15 +3041,15 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionServerReportResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionServerReportResponse)
   }
 
   public interface ReportRSFatalErrorRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** name of the server experiencing the error 
@@ -3057,7 +3057,7 @@ public final class RegionServerStatusProtos {
      */
     boolean hasServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** name of the server experiencing the error 
@@ -3065,7 +3065,7 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** name of the server experiencing the error 
@@ -3101,7 +3101,7 @@ public final class RegionServerStatusProtos {
         getErrorMessageBytes();
   }
   /**
-   * Protobuf type {@code ReportRSFatalErrorRequest}
+   * Protobuf type {@code hbase.pb.ReportRSFatalErrorRequest}
    */
   public static final class ReportRSFatalErrorRequest extends
       com.google.protobuf.GeneratedMessage
@@ -3183,12 +3183,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest.Builder.class);
     }
@@ -3209,11 +3209,11 @@ public final class RegionServerStatusProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     public static final int SERVER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** name of the server experiencing the error 
@@ -3223,7 +3223,7 @@ public final class RegionServerStatusProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** name of the server experiencing the error 
@@ -3233,7 +3233,7 @@ public final class RegionServerStatusProtos {
       return server_;
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** name of the server experiencing the error 
@@ -3475,19 +3475,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportRSFatalErrorRequest}
+     * Protobuf type {@code hbase.pb.ReportRSFatalErrorRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest.Builder.class);
       }
@@ -3530,7 +3530,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest getDefaultInstanceForType() {
@@ -3624,12 +3624,12 @@ public final class RegionServerStatusProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server = 1;
+      // required .hbase.pb.ServerName server = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_;
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3639,7 +3639,7 @@ public final class RegionServerStatusProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3653,7 +3653,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3673,7 +3673,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3691,7 +3691,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3714,7 +3714,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3731,7 +3731,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3743,7 +3743,7 @@ public final class RegionServerStatusProtos {
         return getServerFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3757,7 +3757,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** name of the server experiencing the error 
@@ -3875,7 +3875,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportRSFatalErrorRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReportRSFatalErrorRequest)
     }
 
     static {
@@ -3883,14 +3883,14 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportRSFatalErrorRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReportRSFatalErrorRequest)
   }
 
   public interface ReportRSFatalErrorResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code ReportRSFatalErrorResponse}
+   * Protobuf type {@code hbase.pb.ReportRSFatalErrorResponse}
    */
   public static final class ReportRSFatalErrorResponse extends
       com.google.protobuf.GeneratedMessage
@@ -3953,12 +3953,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse.Builder.class);
     }
@@ -4109,19 +4109,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportRSFatalErrorResponse}
+     * Protobuf type {@code hbase.pb.ReportRSFatalErrorResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse.Builder.class);
       }
@@ -4155,7 +4155,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRSFatalErrorResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRSFatalErrorResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse getDefaultInstanceForType() {
@@ -4213,7 +4213,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportRSFatalErrorResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReportRSFatalErrorResponse)
     }
 
     static {
@@ -4221,7 +4221,7 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportRSFatalErrorResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReportRSFatalErrorResponse)
   }
 
   public interface GetLastFlushedSequenceIdRequestOrBuilder
@@ -4246,7 +4246,7 @@ public final class RegionServerStatusProtos {
     com.google.protobuf.ByteString getRegionName();
   }
   /**
-   * Protobuf type {@code GetLastFlushedSequenceIdRequest}
+   * Protobuf type {@code hbase.pb.GetLastFlushedSequenceIdRequest}
    */
   public static final class GetLastFlushedSequenceIdRequest extends
       com.google.protobuf.GeneratedMessage
@@ -4315,12 +4315,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest.Builder.class);
     }
@@ -4517,19 +4517,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetLastFlushedSequenceIdRequest}
+     * Protobuf type {@code hbase.pb.GetLastFlushedSequenceIdRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest.Builder.class);
       }
@@ -4565,7 +4565,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest getDefaultInstanceForType() {
@@ -4690,7 +4690,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetLastFlushedSequenceIdRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetLastFlushedSequenceIdRequest)
     }
 
     static {
@@ -4698,7 +4698,7 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetLastFlushedSequenceIdRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetLastFlushedSequenceIdRequest)
   }
 
   public interface GetLastFlushedSequenceIdResponseOrBuilder
@@ -4722,9 +4722,9 @@ public final class RegionServerStatusProtos {
      */
     long getLastFlushedSequenceId();
 
-    // repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+    // repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4733,7 +4733,7 @@ public final class RegionServerStatusProtos {
     java.util.List 
         getStoreLastFlushedSequenceIdList();
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4741,7 +4741,7 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId getStoreLastFlushedSequenceId(int index);
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4749,7 +4749,7 @@ public final class RegionServerStatusProtos {
      */
     int getStoreLastFlushedSequenceIdCount();
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4758,7 +4758,7 @@ public final class RegionServerStatusProtos {
     java.util.List 
         getStoreLastFlushedSequenceIdOrBuilderList();
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4768,7 +4768,7 @@ public final class RegionServerStatusProtos {
         int index);
   }
   /**
-   * Protobuf type {@code GetLastFlushedSequenceIdResponse}
+   * Protobuf type {@code hbase.pb.GetLastFlushedSequenceIdResponse}
    */
   public static final class GetLastFlushedSequenceIdResponse extends
       com.google.protobuf.GeneratedMessage
@@ -4848,12 +4848,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse.Builder.class);
     }
@@ -4898,11 +4898,11 @@ public final class RegionServerStatusProtos {
       return lastFlushedSequenceId_;
     }
 
-    // repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+    // repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
     public static final int STORE_LAST_FLUSHED_SEQUENCE_ID_FIELD_NUMBER = 2;
     private java.util.List storeLastFlushedSequenceId_;
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4912,7 +4912,7 @@ public final class RegionServerStatusProtos {
       return storeLastFlushedSequenceId_;
     }
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4923,7 +4923,7 @@ public final class RegionServerStatusProtos {
       return storeLastFlushedSequenceId_;
     }
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4933,7 +4933,7 @@ public final class RegionServerStatusProtos {
       return storeLastFlushedSequenceId_.size();
     }
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -4943,7 +4943,7 @@ public final class RegionServerStatusProtos {
       return storeLastFlushedSequenceId_.get(index);
     }
     /**
-     * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+     * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
      *
      * 
      ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5126,19 +5126,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetLastFlushedSequenceIdResponse}
+     * Protobuf type {@code hbase.pb.GetLastFlushedSequenceIdResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse.Builder.class);
       }
@@ -5181,7 +5181,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_GetLastFlushedSequenceIdResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse getDefaultInstanceForType() {
@@ -5344,7 +5344,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+      // repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
       private java.util.List storeLastFlushedSequenceId_ =
         java.util.Collections.emptyList();
       private void ensureStoreLastFlushedSequenceIdIsMutable() {
@@ -5358,7 +5358,7 @@ public final class RegionServerStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.Builder, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceIdOrBuilder> storeLastFlushedSequenceIdBuilder_;
 
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5372,7 +5372,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5386,7 +5386,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5400,7 +5400,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5421,7 +5421,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5439,7 +5439,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5459,7 +5459,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5480,7 +5480,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5498,7 +5498,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5516,7 +5516,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5534,7 +5534,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5551,7 +5551,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5568,7 +5568,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5579,7 +5579,7 @@ public final class RegionServerStatusProtos {
         return getStoreLastFlushedSequenceIdFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5593,7 +5593,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5608,7 +5608,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5619,7 +5619,7 @@ public final class RegionServerStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.getDefaultInstance());
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5631,7 +5631,7 @@ public final class RegionServerStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.StoreSequenceId.getDefaultInstance());
       }
       /**
-       * repeated .StoreSequenceId store_last_flushed_sequence_id = 2;
+       * repeated .hbase.pb.StoreSequenceId store_last_flushed_sequence_id = 2;
        *
        * 
        ** the last WAL sequence id flushed from MemStore to HFile for stores of the region 
@@ -5656,7 +5656,7 @@ public final class RegionServerStatusProtos {
         return storeLastFlushedSequenceIdBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetLastFlushedSequenceIdResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetLastFlushedSequenceIdResponse)
     }
 
     static {
@@ -5664,25 +5664,25 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetLastFlushedSequenceIdResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetLastFlushedSequenceIdResponse)
   }
 
   public interface RegionStateTransitionOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionStateTransition.TransitionCode transition_code = 1;
+    // required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
     /**
-     * required .RegionStateTransition.TransitionCode transition_code = 1;
+     * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
      */
     boolean hasTransitionCode();
     /**
-     * required .RegionStateTransition.TransitionCode transition_code = 1;
+     * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode getTransitionCode();
 
-    // repeated .RegionInfo region_info = 2;
+    // repeated .hbase.pb.RegionInfo region_info = 2;
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -5691,7 +5691,7 @@ public final class RegionServerStatusProtos {
     java.util.List 
         getRegionInfoList();
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -5699,7 +5699,7 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo getRegionInfo(int index);
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -5707,7 +5707,7 @@ public final class RegionServerStatusProtos {
      */
     int getRegionInfoCount();
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -5716,7 +5716,7 @@ public final class RegionServerStatusProtos {
     java.util.List 
         getRegionInfoOrBuilderList();
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -5744,7 +5744,7 @@ public final class RegionServerStatusProtos {
     long getOpenSeqNum();
   }
   /**
-   * Protobuf type {@code RegionStateTransition}
+   * Protobuf type {@code hbase.pb.RegionStateTransition}
    */
   public static final class RegionStateTransition extends
       com.google.protobuf.GeneratedMessage
@@ -5835,12 +5835,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionStateTransition_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionStateTransition_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionStateTransition_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionStateTransition_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder.class);
     }
@@ -5861,7 +5861,7 @@ public final class RegionServerStatusProtos {
     }
 
     /**
-     * Protobuf enum {@code RegionStateTransition.TransitionCode}
+     * Protobuf enum {@code hbase.pb.RegionStateTransition.TransitionCode}
      */
     public enum TransitionCode
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -6036,31 +6036,31 @@ public final class RegionServerStatusProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:RegionStateTransition.TransitionCode)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.RegionStateTransition.TransitionCode)
     }
 
     private int bitField0_;
-    // required .RegionStateTransition.TransitionCode transition_code = 1;
+    // required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
     public static final int TRANSITION_CODE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode transitionCode_;
     /**
-     * required .RegionStateTransition.TransitionCode transition_code = 1;
+     * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
      */
     public boolean hasTransitionCode() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionStateTransition.TransitionCode transition_code = 1;
+     * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode getTransitionCode() {
       return transitionCode_;
     }
 
-    // repeated .RegionInfo region_info = 2;
+    // repeated .hbase.pb.RegionInfo region_info = 2;
     public static final int REGION_INFO_FIELD_NUMBER = 2;
     private java.util.List regionInfo_;
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -6070,7 +6070,7 @@ public final class RegionServerStatusProtos {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -6081,7 +6081,7 @@ public final class RegionServerStatusProtos {
       return regionInfo_;
     }
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -6091,7 +6091,7 @@ public final class RegionServerStatusProtos {
       return regionInfo_.size();
     }
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -6101,7 +6101,7 @@ public final class RegionServerStatusProtos {
       return regionInfo_.get(index);
     }
     /**
-     * repeated .RegionInfo region_info = 2;
+     * repeated .hbase.pb.RegionInfo region_info = 2;
      *
      * 
      ** Mutliple regions are involved during merging/splitting 
@@ -6325,19 +6325,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionStateTransition}
+     * Protobuf type {@code hbase.pb.RegionStateTransition}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransitionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionStateTransition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionStateTransition_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionStateTransition_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionStateTransition_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder.class);
       }
@@ -6382,7 +6382,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_RegionStateTransition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_RegionStateTransition_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition getDefaultInstanceForType() {
@@ -6503,22 +6503,22 @@ public final class RegionServerStatusProtos {
       }
       private int bitField0_;
 
-      // required .RegionStateTransition.TransitionCode transition_code = 1;
+      // required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
       private org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode transitionCode_ = org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode.OPENED;
       /**
-       * required .RegionStateTransition.TransitionCode transition_code = 1;
+       * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
        */
       public boolean hasTransitionCode() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionStateTransition.TransitionCode transition_code = 1;
+       * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode getTransitionCode() {
         return transitionCode_;
       }
       /**
-       * required .RegionStateTransition.TransitionCode transition_code = 1;
+       * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
        */
       public Builder setTransitionCode(org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode value) {
         if (value == null) {
@@ -6530,7 +6530,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .RegionStateTransition.TransitionCode transition_code = 1;
+       * required .hbase.pb.RegionStateTransition.TransitionCode transition_code = 1;
        */
       public Builder clearTransitionCode() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -6539,7 +6539,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // repeated .RegionInfo region_info = 2;
+      // repeated .hbase.pb.RegionInfo region_info = 2;
       private java.util.List regionInfo_ =
         java.util.Collections.emptyList();
       private void ensureRegionInfoIsMutable() {
@@ -6553,7 +6553,7 @@ public final class RegionServerStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfoOrBuilder> regionInfoBuilder_;
 
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6567,7 +6567,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6581,7 +6581,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6595,7 +6595,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6616,7 +6616,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6634,7 +6634,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6654,7 +6654,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6675,7 +6675,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6693,7 +6693,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6711,7 +6711,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6729,7 +6729,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6746,7 +6746,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6763,7 +6763,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6774,7 +6774,7 @@ public final class RegionServerStatusProtos {
         return getRegionInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6788,7 +6788,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6803,7 +6803,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6814,7 +6814,7 @@ public final class RegionServerStatusProtos {
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6826,7 +6826,7 @@ public final class RegionServerStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionInfo.getDefaultInstance());
       }
       /**
-       * repeated .RegionInfo region_info = 2;
+       * repeated .hbase.pb.RegionInfo region_info = 2;
        *
        * 
        ** Mutliple regions are involved during merging/splitting 
@@ -6900,7 +6900,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionStateTransition)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionStateTransition)
     }
 
     static {
@@ -6908,15 +6908,15 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionStateTransition)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionStateTransition)
   }
 
   public interface ReportRegionStateTransitionRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** This region server's server name 
@@ -6924,7 +6924,7 @@ public final class RegionServerStatusProtos {
      */
     boolean hasServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** This region server's server name 
@@ -6932,7 +6932,7 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** This region server's server name 
@@ -6940,33 +6940,33 @@ public final class RegionServerStatusProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder();
 
-    // repeated .RegionStateTransition transition = 2;
+    // repeated .hbase.pb.RegionStateTransition transition = 2;
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     java.util.List 
         getTransitionList();
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition getTransition(int index);
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     int getTransitionCount();
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     java.util.List 
         getTransitionOrBuilderList();
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransitionOrBuilder getTransitionOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ReportRegionStateTransitionRequest}
+   * Protobuf type {@code hbase.pb.ReportRegionStateTransitionRequest}
    */
   public static final class ReportRegionStateTransitionRequest extends
       com.google.protobuf.GeneratedMessage
@@ -7054,12 +7054,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest.Builder.class);
     }
@@ -7080,11 +7080,11 @@ public final class RegionServerStatusProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     public static final int SERVER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** This region server's server name 
@@ -7094,7 +7094,7 @@ public final class RegionServerStatusProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** This region server's server name 
@@ -7104,7 +7104,7 @@ public final class RegionServerStatusProtos {
       return server_;
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      ** This region server's server name 
@@ -7114,36 +7114,36 @@ public final class RegionServerStatusProtos {
       return server_;
     }
 
-    // repeated .RegionStateTransition transition = 2;
+    // repeated .hbase.pb.RegionStateTransition transition = 2;
     public static final int TRANSITION_FIELD_NUMBER = 2;
     private java.util.List transition_;
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     public java.util.List getTransitionList() {
       return transition_;
     }
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     public java.util.List 
         getTransitionOrBuilderList() {
       return transition_;
     }
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     public int getTransitionCount() {
       return transition_.size();
     }
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition getTransition(int index) {
       return transition_.get(index);
     }
     /**
-     * repeated .RegionStateTransition transition = 2;
+     * repeated .hbase.pb.RegionStateTransition transition = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransitionOrBuilder getTransitionOrBuilder(
         int index) {
@@ -7326,19 +7326,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportRegionStateTransitionRequest}
+     * Protobuf type {@code hbase.pb.ReportRegionStateTransitionRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest.Builder.class);
       }
@@ -7386,7 +7386,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest getDefaultInstanceForType() {
@@ -7508,12 +7508,12 @@ public final class RegionServerStatusProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server = 1;
+      // required .hbase.pb.ServerName server = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_;
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7523,7 +7523,7 @@ public final class RegionServerStatusProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7537,7 +7537,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7557,7 +7557,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7575,7 +7575,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7598,7 +7598,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7615,7 +7615,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7627,7 +7627,7 @@ public final class RegionServerStatusProtos {
         return getServerFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7641,7 +7641,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        ** This region server's server name 
@@ -7661,7 +7661,7 @@ public final class RegionServerStatusProtos {
         return serverBuilder_;
       }
 
-      // repeated .RegionStateTransition transition = 2;
+      // repeated .hbase.pb.RegionStateTransition transition = 2;
       private java.util.List transition_ =
         java.util.Collections.emptyList();
       private void ensureTransitionIsMutable() {
@@ -7675,7 +7675,7 @@ public final class RegionServerStatusProtos {
           org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransitionOrBuilder> transitionBuilder_;
 
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public java.util.List getTransitionList() {
         if (transitionBuilder_ == null) {
@@ -7685,7 +7685,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public int getTransitionCount() {
         if (transitionBuilder_ == null) {
@@ -7695,7 +7695,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition getTransition(int index) {
         if (transitionBuilder_ == null) {
@@ -7705,7 +7705,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder setTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition value) {
@@ -7722,7 +7722,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder setTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder builderForValue) {
@@ -7736,7 +7736,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder addTransition(org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition value) {
         if (transitionBuilder_ == null) {
@@ -7752,7 +7752,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder addTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition value) {
@@ -7769,7 +7769,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder addTransition(
           org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder builderForValue) {
@@ -7783,7 +7783,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder addTransition(
           int index, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder builderForValue) {
@@ -7797,7 +7797,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder addAllTransition(
           java.lang.Iterable values) {
@@ -7811,7 +7811,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder clearTransition() {
         if (transitionBuilder_ == null) {
@@ -7824,7 +7824,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public Builder removeTransition(int index) {
         if (transitionBuilder_ == null) {
@@ -7837,14 +7837,14 @@ public final class RegionServerStatusProtos {
         return this;
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder getTransitionBuilder(
           int index) {
         return getTransitionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransitionOrBuilder getTransitionOrBuilder(
           int index) {
@@ -7854,7 +7854,7 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public java.util.List 
            getTransitionOrBuilderList() {
@@ -7865,14 +7865,14 @@ public final class RegionServerStatusProtos {
         }
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder addTransitionBuilder() {
         return getTransitionFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.getDefaultInstance());
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.Builder addTransitionBuilder(
           int index) {
@@ -7880,7 +7880,7 @@ public final class RegionServerStatusProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.getDefaultInstance());
       }
       /**
-       * repeated .RegionStateTransition transition = 2;
+       * repeated .hbase.pb.RegionStateTransition transition = 2;
        */
       public java.util.List 
            getTransitionBuilderList() {
@@ -7901,7 +7901,7 @@ public final class RegionServerStatusProtos {
         return transitionBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportRegionStateTransitionRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReportRegionStateTransitionRequest)
     }
 
     static {
@@ -7909,7 +7909,7 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportRegionStateTransitionRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReportRegionStateTransitionRequest)
   }
 
   public interface ReportRegionStateTransitionResponseOrBuilder
@@ -7943,7 +7943,7 @@ public final class RegionServerStatusProtos {
         getErrorMessageBytes();
   }
   /**
-   * Protobuf type {@code ReportRegionStateTransitionResponse}
+   * Protobuf type {@code hbase.pb.ReportRegionStateTransitionResponse}
    */
   public static final class ReportRegionStateTransitionResponse extends
       com.google.protobuf.GeneratedMessage
@@ -8012,12 +8012,12 @@ public final class RegionServerStatusProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse.Builder.class);
     }
@@ -8241,19 +8241,19 @@ public final class RegionServerStatusProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReportRegionStateTransitionResponse}
+     * Protobuf type {@code hbase.pb.ReportRegionStateTransitionResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse.class, org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse.Builder.class);
       }
@@ -8289,7 +8289,7 @@ public final class RegionServerStatusProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_ReportRegionStateTransitionResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.internal_static_hbase_pb_ReportRegionStateTransitionResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse getDefaultInstanceForType() {
@@ -8458,7 +8458,7 @@ public final class RegionServerStatusProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReportRegionStateTransitionResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReportRegionStateTransitionResponse)
     }
 
     static {
@@ -8466,11 +8466,11 @@ public final class RegionServerStatusProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReportRegionStateTransitionResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReportRegionStateTransitionResponse)
   }
 
   /**
-   * Protobuf service {@code RegionServerStatusService}
+   * Protobuf service {@code hbase.pb.RegionServerStatusService}
    */
   public static abstract class RegionServerStatusService
       implements com.google.protobuf.Service {
@@ -8478,7 +8478,7 @@ public final class RegionServerStatusProtos {
 
     public interface Interface {
       /**
-       * rpc RegionServerStartup(.RegionServerStartupRequest) returns (.RegionServerStartupResponse);
+       * rpc RegionServerStartup(.hbase.pb.RegionServerStartupRequest) returns (.hbase.pb.RegionServerStartupResponse);
        *
        * 
        ** Called when a region server first starts. 
@@ -8490,7 +8490,7 @@ public final class RegionServerStatusProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc RegionServerReport(.RegionServerReportRequest) returns (.RegionServerReportResponse);
+       * rpc RegionServerReport(.hbase.pb.RegionServerReportRequest) returns (.hbase.pb.RegionServerReportResponse);
        *
        * 
        ** Called to report the load the RegionServer is under. 
@@ -8502,7 +8502,7 @@ public final class RegionServerStatusProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ReportRSFatalError(.ReportRSFatalErrorRequest) returns (.ReportRSFatalErrorResponse);
+       * rpc ReportRSFatalError(.hbase.pb.ReportRSFatalErrorRequest) returns (.hbase.pb.ReportRSFatalErrorResponse);
        *
        * 
        **
@@ -8516,7 +8516,7 @@ public final class RegionServerStatusProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc GetLastFlushedSequenceId(.GetLastFlushedSequenceIdRequest) returns (.GetLastFlushedSequenceIdResponse);
+       * rpc GetLastFlushedSequenceId(.hbase.pb.GetLastFlushedSequenceIdRequest) returns (.hbase.pb.GetLastFlushedSequenceIdResponse);
        *
        * 
        ** Called to get the sequence id of the last MemStore entry flushed to an
@@ -8530,7 +8530,7 @@ public final class RegionServerStatusProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc ReportRegionStateTransition(.ReportRegionStateTransitionRequest) returns (.ReportRegionStateTransitionResponse);
+       * rpc ReportRegionStateTransition(.hbase.pb.ReportRegionStateTransitionRequest) returns (.hbase.pb.ReportRegionStateTransitionResponse);
        *
        * 
        **
@@ -8678,7 +8678,7 @@ public final class RegionServerStatusProtos {
     }
 
     /**
-     * rpc RegionServerStartup(.RegionServerStartupRequest) returns (.RegionServerStartupResponse);
+     * rpc RegionServerStartup(.hbase.pb.RegionServerStartupRequest) returns (.hbase.pb.RegionServerStartupResponse);
      *
      * 
      ** Called when a region server first starts. 
@@ -8690,7 +8690,7 @@ public final class RegionServerStatusProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc RegionServerReport(.RegionServerReportRequest) returns (.RegionServerReportResponse);
+     * rpc RegionServerReport(.hbase.pb.RegionServerReportRequest) returns (.hbase.pb.RegionServerReportResponse);
      *
      * 
      ** Called to report the load the RegionServer is under. 
@@ -8702,7 +8702,7 @@ public final class RegionServerStatusProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ReportRSFatalError(.ReportRSFatalErrorRequest) returns (.ReportRSFatalErrorResponse);
+     * rpc ReportRSFatalError(.hbase.pb.ReportRSFatalErrorRequest) returns (.hbase.pb.ReportRSFatalErrorResponse);
      *
      * 
      **
@@ -8716,7 +8716,7 @@ public final class RegionServerStatusProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc GetLastFlushedSequenceId(.GetLastFlushedSequenceIdRequest) returns (.GetLastFlushedSequenceIdResponse);
+     * rpc GetLastFlushedSequenceId(.hbase.pb.GetLastFlushedSequenceIdRequest) returns (.hbase.pb.GetLastFlushedSequenceIdResponse);
      *
      * 
      ** Called to get the sequence id of the last MemStore entry flushed to an
@@ -8730,7 +8730,7 @@ public final class RegionServerStatusProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc ReportRegionStateTransition(.ReportRegionStateTransitionRequest) returns (.ReportRegionStateTransitionResponse);
+     * rpc ReportRegionStateTransition(.hbase.pb.ReportRegionStateTransitionRequest) returns (.hbase.pb.ReportRegionStateTransitionResponse);
      *
      * 
      **
@@ -9036,64 +9036,64 @@ public final class RegionServerStatusProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:RegionServerStatusService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionServerStatusService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionServerStartupRequest_descriptor;
+    internal_static_hbase_pb_RegionServerStartupRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionServerStartupRequest_fieldAccessorTable;
+      internal_static_hbase_pb_RegionServerStartupRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionServerStartupResponse_descriptor;
+    internal_static_hbase_pb_RegionServerStartupResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionServerStartupResponse_fieldAccessorTable;
+      internal_static_hbase_pb_RegionServerStartupResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionServerReportRequest_descriptor;
+    internal_static_hbase_pb_RegionServerReportRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionServerReportRequest_fieldAccessorTable;
+      internal_static_hbase_pb_RegionServerReportRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionServerReportResponse_descriptor;
+    internal_static_hbase_pb_RegionServerReportResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionServerReportResponse_fieldAccessorTable;
+      internal_static_hbase_pb_RegionServerReportResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportRSFatalErrorRequest_descriptor;
+    internal_static_hbase_pb_ReportRSFatalErrorRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportRSFatalErrorRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ReportRSFatalErrorRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportRSFatalErrorResponse_descriptor;
+    internal_static_hbase_pb_ReportRSFatalErrorResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportRSFatalErrorResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ReportRSFatalErrorResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetLastFlushedSequenceIdRequest_descriptor;
+    internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetLastFlushedSequenceIdRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetLastFlushedSequenceIdResponse_descriptor;
+    internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetLastFlushedSequenceIdResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionStateTransition_descriptor;
+    internal_static_hbase_pb_RegionStateTransition_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionStateTransition_fieldAccessorTable;
+      internal_static_hbase_pb_RegionStateTransition_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportRegionStateTransitionRequest_descriptor;
+    internal_static_hbase_pb_ReportRegionStateTransitionRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportRegionStateTransitionRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ReportRegionStateTransitionRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReportRegionStateTransitionResponse_descriptor;
+    internal_static_hbase_pb_ReportRegionStateTransitionResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReportRegionStateTransitionResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ReportRegionStateTransitionResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -9103,121 +9103,126 @@ public final class RegionServerStatusProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030RegionServerStatus.proto\032\013HBase.proto\032" +
-      "\023ClusterStatus.proto\"\205\001\n\032RegionServerSta" +
-      "rtupRequest\022\014\n\004port\030\001 \002(\r\022\031\n\021server_star" +
-      "t_code\030\002 \002(\004\022\033\n\023server_current_time\030\003 \002(" +
-      "\004\022!\n\031use_this_hostname_instead\030\004 \001(\t\"C\n\033" +
-      "RegionServerStartupResponse\022$\n\013map_entri" +
-      "es\030\001 \003(\0132\017.NameStringPair\"S\n\031RegionServe" +
-      "rReportRequest\022\033\n\006server\030\001 \002(\0132\013.ServerN" +
-      "ame\022\031\n\004load\030\002 \001(\0132\013.ServerLoad\"\034\n\032Region" +
-      "ServerReportResponse\"O\n\031ReportRSFatalErr",
-      "orRequest\022\033\n\006server\030\001 \002(\0132\013.ServerName\022\025" +
-      "\n\rerror_message\030\002 \002(\t\"\034\n\032ReportRSFatalEr" +
-      "rorResponse\"6\n\037GetLastFlushedSequenceIdR" +
-      "equest\022\023\n\013region_name\030\001 \002(\014\"~\n GetLastFl" +
-      "ushedSequenceIdResponse\022 \n\030last_flushed_" +
-      "sequence_id\030\001 \002(\004\0228\n\036store_last_flushed_" +
-      "sequence_id\030\002 \003(\0132\020.StoreSequenceId\"\322\002\n\025" +
-      "RegionStateTransition\022>\n\017transition_code" +
-      "\030\001 \002(\0162%.RegionStateTransition.Transitio" +
-      "nCode\022 \n\013region_info\030\002 \003(\0132\013.RegionInfo\022",
-      "\024\n\014open_seq_num\030\003 \001(\004\"\300\001\n\016TransitionCode" +
-      "\022\n\n\006OPENED\020\000\022\017\n\013FAILED_OPEN\020\001\022\n\n\006CLOSED\020" +
-      "\002\022\022\n\016READY_TO_SPLIT\020\003\022\022\n\016READY_TO_MERGE\020" +
-      "\004\022\016\n\nSPLIT_PONR\020\005\022\016\n\nMERGE_PONR\020\006\022\t\n\005SPL" +
-      "IT\020\007\022\n\n\006MERGED\020\010\022\022\n\016SPLIT_REVERTED\020\t\022\022\n\016" +
-      "MERGE_REVERTED\020\n\"m\n\"ReportRegionStateTra" +
-      "nsitionRequest\022\033\n\006server\030\001 \002(\0132\013.ServerN" +
-      "ame\022*\n\ntransition\030\002 \003(\0132\026.RegionStateTra" +
-      "nsition\"<\n#ReportRegionStateTransitionRe" +
-      "sponse\022\025\n\rerror_message\030\001 \001(\t2\326\003\n\031Region",
-      "ServerStatusService\022P\n\023RegionServerStart" +
-      "up\022\033.RegionServerStartupRequest\032\034.Region" +
-      "ServerStartupResponse\022M\n\022RegionServerRep" +
-      "ort\022\032.RegionServerReportRequest\032\033.Region" +
-      "ServerReportResponse\022M\n\022ReportRSFatalErr" +
-      "or\022\032.ReportRSFatalErrorRequest\032\033.ReportR" +
-      "SFatalErrorResponse\022_\n\030GetLastFlushedSeq" +
-      "uenceId\022 .GetLastFlushedSequenceIdReques" +
-      "t\032!.GetLastFlushedSequenceIdResponse\022h\n\033" +
-      "ReportRegionStateTransition\022#.ReportRegi",
-      "onStateTransitionRequest\032$.ReportRegionS" +
-      "tateTransitionResponseBN\n*org.apache.had" +
-      "oop.hbase.protobuf.generatedB\030RegionServ" +
-      "erStatusProtosH\001\210\001\001\240\001\001"
+      "\n\030RegionServerStatus.proto\022\010hbase.pb\032\013HB" +
+      "ase.proto\032\023ClusterStatus.proto\"\205\001\n\032Regio" +
+      "nServerStartupRequest\022\014\n\004port\030\001 \002(\r\022\031\n\021s" +
+      "erver_start_code\030\002 \002(\004\022\033\n\023server_current" +
+      "_time\030\003 \002(\004\022!\n\031use_this_hostname_instead" +
+      "\030\004 \001(\t\"L\n\033RegionServerStartupResponse\022-\n" +
+      "\013map_entries\030\001 \003(\0132\030.hbase.pb.NameString" +
+      "Pair\"e\n\031RegionServerReportRequest\022$\n\006ser" +
+      "ver\030\001 \002(\0132\024.hbase.pb.ServerName\022\"\n\004load\030" +
+      "\002 \001(\0132\024.hbase.pb.ServerLoad\"\034\n\032RegionSer",
+      "verReportResponse\"X\n\031ReportRSFatalErrorR" +
+      "equest\022$\n\006server\030\001 \002(\0132\024.hbase.pb.Server" +
+      "Name\022\025\n\rerror_message\030\002 \002(\t\"\034\n\032ReportRSF" +
+      "atalErrorResponse\"6\n\037GetLastFlushedSeque" +
+      "nceIdRequest\022\023\n\013region_name\030\001 \002(\014\"\207\001\n Ge" +
+      "tLastFlushedSequenceIdResponse\022 \n\030last_f" +
+      "lushed_sequence_id\030\001 \002(\004\022A\n\036store_last_f" +
+      "lushed_sequence_id\030\002 \003(\0132\031.hbase.pb.Stor" +
+      "eSequenceId\"\344\002\n\025RegionStateTransition\022G\n" +
+      "\017transition_code\030\001 \002(\0162..hbase.pb.Region",
+      "StateTransition.TransitionCode\022)\n\013region" +
+      "_info\030\002 \003(\0132\024.hbase.pb.RegionInfo\022\024\n\014ope" +
+      "n_seq_num\030\003 \001(\004\"\300\001\n\016TransitionCode\022\n\n\006OP" +
+      "ENED\020\000\022\017\n\013FAILED_OPEN\020\001\022\n\n\006CLOSED\020\002\022\022\n\016R" +
+      "EADY_TO_SPLIT\020\003\022\022\n\016READY_TO_MERGE\020\004\022\016\n\nS" +
+      "PLIT_PONR\020\005\022\016\n\nMERGE_PONR\020\006\022\t\n\005SPLIT\020\007\022\n" +
+      "\n\006MERGED\020\010\022\022\n\016SPLIT_REVERTED\020\t\022\022\n\016MERGE_" +
+      "REVERTED\020\n\"\177\n\"ReportRegionStateTransitio" +
+      "nRequest\022$\n\006server\030\001 \002(\0132\024.hbase.pb.Serv" +
+      "erName\0223\n\ntransition\030\002 \003(\0132\037.hbase.pb.Re",
+      "gionStateTransition\"<\n#ReportRegionState" +
+      "TransitionResponse\022\025\n\rerror_message\030\001 \001(" +
+      "\t2\260\004\n\031RegionServerStatusService\022b\n\023Regio" +
+      "nServerStartup\022$.hbase.pb.RegionServerSt" +
+      "artupRequest\032%.hbase.pb.RegionServerStar" +
+      "tupResponse\022_\n\022RegionServerReport\022#.hbas" +
+      "e.pb.RegionServerReportRequest\032$.hbase.p" +
+      "b.RegionServerReportResponse\022_\n\022ReportRS" +
+      "FatalError\022#.hbase.pb.ReportRSFatalError" +
+      "Request\032$.hbase.pb.ReportRSFatalErrorRes",
+      "ponse\022q\n\030GetLastFlushedSequenceId\022).hbas" +
+      "e.pb.GetLastFlushedSequenceIdRequest\032*.h" +
+      "base.pb.GetLastFlushedSequenceIdResponse" +
+      "\022z\n\033ReportRegionStateTransition\022,.hbase." +
+      "pb.ReportRegionStateTransitionRequest\032-." +
+      "hbase.pb.ReportRegionStateTransitionResp" +
+      "onseBN\n*org.apache.hadoop.hbase.protobuf" +
+      ".generatedB\030RegionServerStatusProtosH\001\210\001" +
+      "\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_RegionServerStartupRequest_descriptor =
+          internal_static_hbase_pb_RegionServerStartupRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_RegionServerStartupRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionServerStartupRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionServerStartupRequest_descriptor,
+              internal_static_hbase_pb_RegionServerStartupRequest_descriptor,
               new java.lang.String[] { "Port", "ServerStartCode", "ServerCurrentTime", "UseThisHostnameInstead", });
-          internal_static_RegionServerStartupResponse_descriptor =
+          internal_static_hbase_pb_RegionServerStartupResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_RegionServerStartupResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionServerStartupResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionServerStartupResponse_descriptor,
+              internal_static_hbase_pb_RegionServerStartupResponse_descriptor,
               new java.lang.String[] { "MapEntries", });
-          internal_static_RegionServerReportRequest_descriptor =
+          internal_static_hbase_pb_RegionServerReportRequest_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_RegionServerReportRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionServerReportRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionServerReportRequest_descriptor,
+              internal_static_hbase_pb_RegionServerReportRequest_descriptor,
               new java.lang.String[] { "Server", "Load", });
-          internal_static_RegionServerReportResponse_descriptor =
+          internal_static_hbase_pb_RegionServerReportResponse_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_RegionServerReportResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionServerReportResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionServerReportResponse_descriptor,
+              internal_static_hbase_pb_RegionServerReportResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_ReportRSFatalErrorRequest_descriptor =
+          internal_static_hbase_pb_ReportRSFatalErrorRequest_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_ReportRSFatalErrorRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ReportRSFatalErrorRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReportRSFatalErrorRequest_descriptor,
+              internal_static_hbase_pb_ReportRSFatalErrorRequest_descriptor,
               new java.lang.String[] { "Server", "ErrorMessage", });
-          internal_static_ReportRSFatalErrorResponse_descriptor =
+          internal_static_hbase_pb_ReportRSFatalErrorResponse_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_ReportRSFatalErrorResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ReportRSFatalErrorResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReportRSFatalErrorResponse_descriptor,
+              internal_static_hbase_pb_ReportRSFatalErrorResponse_descriptor,
               new java.lang.String[] { });
-          internal_static_GetLastFlushedSequenceIdRequest_descriptor =
+          internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_GetLastFlushedSequenceIdRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetLastFlushedSequenceIdRequest_descriptor,
+              internal_static_hbase_pb_GetLastFlushedSequenceIdRequest_descriptor,
               new java.lang.String[] { "RegionName", });
-          internal_static_GetLastFlushedSequenceIdResponse_descriptor =
+          internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_GetLastFlushedSequenceIdResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetLastFlushedSequenceIdResponse_descriptor,
+              internal_static_hbase_pb_GetLastFlushedSequenceIdResponse_descriptor,
               new java.lang.String[] { "LastFlushedSequenceId", "StoreLastFlushedSequenceId", });
-          internal_static_RegionStateTransition_descriptor =
+          internal_static_hbase_pb_RegionStateTransition_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_RegionStateTransition_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionStateTransition_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionStateTransition_descriptor,
+              internal_static_hbase_pb_RegionStateTransition_descriptor,
               new java.lang.String[] { "TransitionCode", "RegionInfo", "OpenSeqNum", });
-          internal_static_ReportRegionStateTransitionRequest_descriptor =
+          internal_static_hbase_pb_ReportRegionStateTransitionRequest_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_ReportRegionStateTransitionRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ReportRegionStateTransitionRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReportRegionStateTransitionRequest_descriptor,
+              internal_static_hbase_pb_ReportRegionStateTransitionRequest_descriptor,
               new java.lang.String[] { "Server", "Transition", });
-          internal_static_ReportRegionStateTransitionResponse_descriptor =
+          internal_static_hbase_pb_ReportRegionStateTransitionResponse_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_ReportRegionStateTransitionResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ReportRegionStateTransitionResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReportRegionStateTransitionResponse_descriptor,
+              internal_static_hbase_pb_ReportRegionStateTransitionResponse_descriptor,
               new java.lang.String[] { "ErrorMessage", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RowProcessorProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RowProcessorProtos.java
index fd0b1af7387..ac9733474f4 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RowProcessorProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RowProcessorProtos.java
@@ -72,7 +72,7 @@ public final class RowProcessorProtos {
     long getNonce();
   }
   /**
-   * Protobuf type {@code ProcessRequest}
+   * Protobuf type {@code hbase.pb.ProcessRequest}
    */
   public static final class ProcessRequest extends
       com.google.protobuf.GeneratedMessage
@@ -161,12 +161,12 @@ public final class RowProcessorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest.class, org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest.Builder.class);
     }
@@ -541,19 +541,19 @@ public final class RowProcessorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcessRequest}
+     * Protobuf type {@code hbase.pb.ProcessRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest.class, org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest.Builder.class);
       }
@@ -597,7 +597,7 @@ public final class RowProcessorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessRequest getDefaultInstanceForType() {
@@ -952,7 +952,7 @@ public final class RowProcessorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcessRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcessRequest)
     }
 
     static {
@@ -960,7 +960,7 @@ public final class RowProcessorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcessRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcessRequest)
   }
 
   public interface ProcessResponseOrBuilder
@@ -977,7 +977,7 @@ public final class RowProcessorProtos {
     com.google.protobuf.ByteString getRowProcessorResult();
   }
   /**
-   * Protobuf type {@code ProcessResponse}
+   * Protobuf type {@code hbase.pb.ProcessResponse}
    */
   public static final class ProcessResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1046,12 +1046,12 @@ public final class RowProcessorProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponse.class, org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponse.Builder.class);
     }
@@ -1240,19 +1240,19 @@ public final class RowProcessorProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ProcessResponse}
+     * Protobuf type {@code hbase.pb.ProcessResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponse.class, org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponse.Builder.class);
       }
@@ -1288,7 +1288,7 @@ public final class RowProcessorProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_ProcessResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.internal_static_hbase_pb_ProcessResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.RowProcessorProtos.ProcessResponse getDefaultInstanceForType() {
@@ -1397,7 +1397,7 @@ public final class RowProcessorProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ProcessResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ProcessResponse)
     }
 
     static {
@@ -1405,11 +1405,11 @@ public final class RowProcessorProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ProcessResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ProcessResponse)
   }
 
   /**
-   * Protobuf service {@code RowProcessorService}
+   * Protobuf service {@code hbase.pb.RowProcessorService}
    */
   public static abstract class RowProcessorService
       implements com.google.protobuf.Service {
@@ -1417,7 +1417,7 @@ public final class RowProcessorProtos {
 
     public interface Interface {
       /**
-       * rpc Process(.ProcessRequest) returns (.ProcessResponse);
+       * rpc Process(.hbase.pb.ProcessRequest) returns (.hbase.pb.ProcessResponse);
        */
       public abstract void process(
           com.google.protobuf.RpcController controller,
@@ -1502,7 +1502,7 @@ public final class RowProcessorProtos {
     }
 
     /**
-     * rpc Process(.ProcessRequest) returns (.ProcessResponse);
+     * rpc Process(.hbase.pb.ProcessRequest) returns (.hbase.pb.ProcessResponse);
      */
     public abstract void process(
         com.google.protobuf.RpcController controller,
@@ -1637,19 +1637,19 @@ public final class RowProcessorProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:RowProcessorService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RowProcessorService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcessRequest_descriptor;
+    internal_static_hbase_pb_ProcessRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcessRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ProcessRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ProcessResponse_descriptor;
+    internal_static_hbase_pb_ProcessResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ProcessResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ProcessResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1659,33 +1659,34 @@ public final class RowProcessorProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022RowProcessor.proto\"\261\001\n\016ProcessRequest\022" +
-      " \n\030row_processor_class_name\030\001 \002(\t\022.\n&row" +
-      "_processor_initializer_message_name\030\002 \001(" +
-      "\t\022)\n!row_processor_initializer_message\030\003" +
-      " \001(\014\022\023\n\013nonce_group\030\004 \001(\004\022\r\n\005nonce\030\005 \001(\004" +
-      "\"/\n\017ProcessResponse\022\034\n\024row_processor_res" +
-      "ult\030\001 \002(\0142C\n\023RowProcessorService\022,\n\007Proc" +
-      "ess\022\017.ProcessRequest\032\020.ProcessResponseBH" +
-      "\n*org.apache.hadoop.hbase.protobuf.gener" +
-      "atedB\022RowProcessorProtosH\001\210\001\001\240\001\001"
+      "\n\022RowProcessor.proto\022\010hbase.pb\"\261\001\n\016Proce" +
+      "ssRequest\022 \n\030row_processor_class_name\030\001 " +
+      "\002(\t\022.\n&row_processor_initializer_message" +
+      "_name\030\002 \001(\t\022)\n!row_processor_initializer" +
+      "_message\030\003 \001(\014\022\023\n\013nonce_group\030\004 \001(\004\022\r\n\005n" +
+      "once\030\005 \001(\004\"/\n\017ProcessResponse\022\034\n\024row_pro" +
+      "cessor_result\030\001 \002(\0142U\n\023RowProcessorServi" +
+      "ce\022>\n\007Process\022\030.hbase.pb.ProcessRequest\032" +
+      "\031.hbase.pb.ProcessResponseBH\n*org.apache" +
+      ".hadoop.hbase.protobuf.generatedB\022RowPro",
+      "cessorProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_ProcessRequest_descriptor =
+          internal_static_hbase_pb_ProcessRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_ProcessRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcessRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcessRequest_descriptor,
+              internal_static_hbase_pb_ProcessRequest_descriptor,
               new java.lang.String[] { "RowProcessorClassName", "RowProcessorInitializerMessageName", "RowProcessorInitializerMessage", "NonceGroup", "Nonce", });
-          internal_static_ProcessResponse_descriptor =
+          internal_static_hbase_pb_ProcessResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_ProcessResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ProcessResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ProcessResponse_descriptor,
+              internal_static_hbase_pb_ProcessResponse_descriptor,
               new java.lang.String[] { "RowProcessorResult", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
index d4e601a6345..538e03117ee 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java
@@ -11,27 +11,27 @@ public final class SecureBulkLoadProtos {
   public interface SecureBulkLoadHFilesRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+    // repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     java.util.List 
         getFamilyPathList();
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getFamilyPath(int index);
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     int getFamilyPathCount();
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     java.util.List 
         getFamilyPathOrBuilderList();
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder getFamilyPathOrBuilder(
         int index);
@@ -46,17 +46,17 @@ public final class SecureBulkLoadProtos {
      */
     boolean getAssignSeqNum();
 
-    // required .DelegationToken fs_token = 3;
+    // required .hbase.pb.DelegationToken fs_token = 3;
     /**
-     * required .DelegationToken fs_token = 3;
+     * required .hbase.pb.DelegationToken fs_token = 3;
      */
     boolean hasFsToken();
     /**
-     * required .DelegationToken fs_token = 3;
+     * required .hbase.pb.DelegationToken fs_token = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken getFsToken();
     /**
-     * required .DelegationToken fs_token = 3;
+     * required .hbase.pb.DelegationToken fs_token = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationTokenOrBuilder getFsTokenOrBuilder();
 
@@ -76,7 +76,7 @@ public final class SecureBulkLoadProtos {
         getBulkTokenBytes();
   }
   /**
-   * Protobuf type {@code SecureBulkLoadHFilesRequest}
+   * Protobuf type {@code hbase.pb.SecureBulkLoadHFilesRequest}
    */
   public static final class SecureBulkLoadHFilesRequest extends
       com.google.protobuf.GeneratedMessage
@@ -174,12 +174,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesRequest.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesRequest.Builder.class);
     }
@@ -200,36 +200,36 @@ public final class SecureBulkLoadProtos {
     }
 
     private int bitField0_;
-    // repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+    // repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
     public static final int FAMILY_PATH_FIELD_NUMBER = 1;
     private java.util.List familyPath_;
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     public java.util.List getFamilyPathList() {
       return familyPath_;
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     public java.util.List 
         getFamilyPathOrBuilderList() {
       return familyPath_;
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     public int getFamilyPathCount() {
       return familyPath_.size();
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getFamilyPath(int index) {
       return familyPath_.get(index);
     }
     /**
-     * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+     * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder getFamilyPathOrBuilder(
         int index) {
@@ -252,23 +252,23 @@ public final class SecureBulkLoadProtos {
       return assignSeqNum_;
     }
 
-    // required .DelegationToken fs_token = 3;
+    // required .hbase.pb.DelegationToken fs_token = 3;
     public static final int FS_TOKEN_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken fsToken_;
     /**
-     * required .DelegationToken fs_token = 3;
+     * required .hbase.pb.DelegationToken fs_token = 3;
      */
     public boolean hasFsToken() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .DelegationToken fs_token = 3;
+     * required .hbase.pb.DelegationToken fs_token = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken getFsToken() {
       return fsToken_;
     }
     /**
-     * required .DelegationToken fs_token = 3;
+     * required .hbase.pb.DelegationToken fs_token = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationTokenOrBuilder getFsTokenOrBuilder() {
       return fsToken_;
@@ -527,19 +527,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SecureBulkLoadHFilesRequest}
+     * Protobuf type {@code hbase.pb.SecureBulkLoadHFilesRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesRequest.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesRequest.Builder.class);
       }
@@ -591,7 +591,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesRequest getDefaultInstanceForType() {
@@ -729,7 +729,7 @@ public final class SecureBulkLoadProtos {
       }
       private int bitField0_;
 
-      // repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+      // repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
       private java.util.List familyPath_ =
         java.util.Collections.emptyList();
       private void ensureFamilyPathIsMutable() {
@@ -743,7 +743,7 @@ public final class SecureBulkLoadProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder> familyPathBuilder_;
 
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public java.util.List getFamilyPathList() {
         if (familyPathBuilder_ == null) {
@@ -753,7 +753,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public int getFamilyPathCount() {
         if (familyPathBuilder_ == null) {
@@ -763,7 +763,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath getFamilyPath(int index) {
         if (familyPathBuilder_ == null) {
@@ -773,7 +773,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder setFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath value) {
@@ -790,7 +790,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder setFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder builderForValue) {
@@ -804,7 +804,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder addFamilyPath(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath value) {
         if (familyPathBuilder_ == null) {
@@ -820,7 +820,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder addFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath value) {
@@ -837,7 +837,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder addFamilyPath(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder builderForValue) {
@@ -851,7 +851,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder addFamilyPath(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder builderForValue) {
@@ -865,7 +865,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder addAllFamilyPath(
           java.lang.Iterable values) {
@@ -879,7 +879,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder clearFamilyPath() {
         if (familyPathBuilder_ == null) {
@@ -892,7 +892,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public Builder removeFamilyPath(int index) {
         if (familyPathBuilder_ == null) {
@@ -905,14 +905,14 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder getFamilyPathBuilder(
           int index) {
         return getFamilyPathFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPathOrBuilder getFamilyPathOrBuilder(
           int index) {
@@ -922,7 +922,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public java.util.List 
            getFamilyPathOrBuilderList() {
@@ -933,14 +933,14 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder addFamilyPathBuilder() {
         return getFamilyPathFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.getDefaultInstance());
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.Builder addFamilyPathBuilder(
           int index) {
@@ -948,7 +948,7 @@ public final class SecureBulkLoadProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath.getDefaultInstance());
       }
       /**
-       * repeated .BulkLoadHFileRequest.FamilyPath family_path = 1;
+       * repeated .hbase.pb.BulkLoadHFileRequest.FamilyPath family_path = 1;
        */
       public java.util.List 
            getFamilyPathBuilderList() {
@@ -1002,18 +1002,18 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // required .DelegationToken fs_token = 3;
+      // required .hbase.pb.DelegationToken fs_token = 3;
       private org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken fsToken_ = org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.Builder, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationTokenOrBuilder> fsTokenBuilder_;
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public boolean hasFsToken() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken getFsToken() {
         if (fsTokenBuilder_ == null) {
@@ -1023,7 +1023,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public Builder setFsToken(org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken value) {
         if (fsTokenBuilder_ == null) {
@@ -1039,7 +1039,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public Builder setFsToken(
           org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.Builder builderForValue) {
@@ -1053,7 +1053,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public Builder mergeFsToken(org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken value) {
         if (fsTokenBuilder_ == null) {
@@ -1072,7 +1072,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public Builder clearFsToken() {
         if (fsTokenBuilder_ == null) {
@@ -1085,7 +1085,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.Builder getFsTokenBuilder() {
         bitField0_ |= 0x00000004;
@@ -1093,7 +1093,7 @@ public final class SecureBulkLoadProtos {
         return getFsTokenFieldBuilder().getBuilder();
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationTokenOrBuilder getFsTokenOrBuilder() {
         if (fsTokenBuilder_ != null) {
@@ -1103,7 +1103,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * required .DelegationToken fs_token = 3;
+       * required .hbase.pb.DelegationToken fs_token = 3;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.Builder, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationTokenOrBuilder> 
@@ -1193,7 +1193,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SecureBulkLoadHFilesRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SecureBulkLoadHFilesRequest)
     }
 
     static {
@@ -1201,7 +1201,7 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SecureBulkLoadHFilesRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SecureBulkLoadHFilesRequest)
   }
 
   public interface SecureBulkLoadHFilesResponseOrBuilder
@@ -1218,7 +1218,7 @@ public final class SecureBulkLoadProtos {
     boolean getLoaded();
   }
   /**
-   * Protobuf type {@code SecureBulkLoadHFilesResponse}
+   * Protobuf type {@code hbase.pb.SecureBulkLoadHFilesResponse}
    */
   public static final class SecureBulkLoadHFilesResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1287,12 +1287,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesResponse.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesResponse.Builder.class);
     }
@@ -1481,19 +1481,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SecureBulkLoadHFilesResponse}
+     * Protobuf type {@code hbase.pb.SecureBulkLoadHFilesResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesResponse.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesResponse.Builder.class);
       }
@@ -1529,7 +1529,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_SecureBulkLoadHFilesResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_SecureBulkLoadHFilesResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.SecureBulkLoadHFilesResponse getDefaultInstanceForType() {
@@ -1635,7 +1635,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SecureBulkLoadHFilesResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SecureBulkLoadHFilesResponse)
     }
 
     static {
@@ -1643,7 +1643,7 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SecureBulkLoadHFilesResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SecureBulkLoadHFilesResponse)
   }
 
   public interface DelegationTokenOrBuilder
@@ -1700,7 +1700,7 @@ public final class SecureBulkLoadProtos {
         getServiceBytes();
   }
   /**
-   * Protobuf type {@code DelegationToken}
+   * Protobuf type {@code hbase.pb.DelegationToken}
    */
   public static final class DelegationToken extends
       com.google.protobuf.GeneratedMessage
@@ -1784,12 +1784,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_DelegationToken_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_DelegationToken_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_DelegationToken_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_DelegationToken_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.Builder.class);
     }
@@ -2127,19 +2127,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DelegationToken}
+     * Protobuf type {@code hbase.pb.DelegationToken}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationTokenOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_DelegationToken_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_DelegationToken_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_DelegationToken_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_DelegationToken_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken.Builder.class);
       }
@@ -2181,7 +2181,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_DelegationToken_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_DelegationToken_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.DelegationToken getDefaultInstanceForType() {
@@ -2495,7 +2495,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DelegationToken)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DelegationToken)
     }
 
     static {
@@ -2503,28 +2503,28 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DelegationToken)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DelegationToken)
   }
 
   public interface PrepareBulkLoadRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
   }
   /**
-   * Protobuf type {@code PrepareBulkLoadRequest}
+   * Protobuf type {@code hbase.pb.PrepareBulkLoadRequest}
    */
   public static final class PrepareBulkLoadRequest extends
       com.google.protobuf.GeneratedMessage
@@ -2601,12 +2601,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest.Builder.class);
     }
@@ -2627,23 +2627,23 @@ public final class SecureBulkLoadProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -2805,19 +2805,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code PrepareBulkLoadRequest}
+     * Protobuf type {@code hbase.pb.PrepareBulkLoadRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest.Builder.class);
       }
@@ -2858,7 +2858,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadRequest getDefaultInstanceForType() {
@@ -2939,18 +2939,18 @@ public final class SecureBulkLoadProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -2960,7 +2960,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -2976,7 +2976,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -2990,7 +2990,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -3009,7 +3009,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -3022,7 +3022,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -3030,7 +3030,7 @@ public final class SecureBulkLoadProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -3040,7 +3040,7 @@ public final class SecureBulkLoadProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -3056,7 +3056,7 @@ public final class SecureBulkLoadProtos {
         return tableNameBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:PrepareBulkLoadRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.PrepareBulkLoadRequest)
     }
 
     static {
@@ -3064,7 +3064,7 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:PrepareBulkLoadRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.PrepareBulkLoadRequest)
   }
 
   public interface PrepareBulkLoadResponseOrBuilder
@@ -3086,7 +3086,7 @@ public final class SecureBulkLoadProtos {
         getBulkTokenBytes();
   }
   /**
-   * Protobuf type {@code PrepareBulkLoadResponse}
+   * Protobuf type {@code hbase.pb.PrepareBulkLoadResponse}
    */
   public static final class PrepareBulkLoadResponse extends
       com.google.protobuf.GeneratedMessage
@@ -3155,12 +3155,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadResponse.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadResponse.Builder.class);
     }
@@ -3376,19 +3376,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code PrepareBulkLoadResponse}
+     * Protobuf type {@code hbase.pb.PrepareBulkLoadResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadResponse.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadResponse.Builder.class);
       }
@@ -3424,7 +3424,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_PrepareBulkLoadResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_PrepareBulkLoadResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.PrepareBulkLoadResponse getDefaultInstanceForType() {
@@ -3573,7 +3573,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:PrepareBulkLoadResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.PrepareBulkLoadResponse)
     }
 
     static {
@@ -3581,7 +3581,7 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:PrepareBulkLoadResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.PrepareBulkLoadResponse)
   }
 
   public interface CleanupBulkLoadRequestOrBuilder
@@ -3603,7 +3603,7 @@ public final class SecureBulkLoadProtos {
         getBulkTokenBytes();
   }
   /**
-   * Protobuf type {@code CleanupBulkLoadRequest}
+   * Protobuf type {@code hbase.pb.CleanupBulkLoadRequest}
    */
   public static final class CleanupBulkLoadRequest extends
       com.google.protobuf.GeneratedMessage
@@ -3672,12 +3672,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest.Builder.class);
     }
@@ -3893,19 +3893,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CleanupBulkLoadRequest}
+     * Protobuf type {@code hbase.pb.CleanupBulkLoadRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest.Builder.class);
       }
@@ -3941,7 +3941,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadRequest getDefaultInstanceForType() {
@@ -4090,7 +4090,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CleanupBulkLoadRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CleanupBulkLoadRequest)
     }
 
     static {
@@ -4098,14 +4098,14 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CleanupBulkLoadRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CleanupBulkLoadRequest)
   }
 
   public interface CleanupBulkLoadResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code CleanupBulkLoadResponse}
+   * Protobuf type {@code hbase.pb.CleanupBulkLoadResponse}
    */
   public static final class CleanupBulkLoadResponse extends
       com.google.protobuf.GeneratedMessage
@@ -4168,12 +4168,12 @@ public final class SecureBulkLoadProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadResponse.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadResponse.Builder.class);
     }
@@ -4324,19 +4324,19 @@ public final class SecureBulkLoadProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CleanupBulkLoadResponse}
+     * Protobuf type {@code hbase.pb.CleanupBulkLoadResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadResponse.class, org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadResponse.Builder.class);
       }
@@ -4370,7 +4370,7 @@ public final class SecureBulkLoadProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_CleanupBulkLoadResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.internal_static_hbase_pb_CleanupBulkLoadResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.SecureBulkLoadProtos.CleanupBulkLoadResponse getDefaultInstanceForType() {
@@ -4428,7 +4428,7 @@ public final class SecureBulkLoadProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CleanupBulkLoadResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CleanupBulkLoadResponse)
     }
 
     static {
@@ -4436,11 +4436,11 @@ public final class SecureBulkLoadProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CleanupBulkLoadResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CleanupBulkLoadResponse)
   }
 
   /**
-   * Protobuf service {@code SecureBulkLoadService}
+   * Protobuf service {@code hbase.pb.SecureBulkLoadService}
    */
   public static abstract class SecureBulkLoadService
       implements com.google.protobuf.Service {
@@ -4448,7 +4448,7 @@ public final class SecureBulkLoadProtos {
 
     public interface Interface {
       /**
-       * rpc PrepareBulkLoad(.PrepareBulkLoadRequest) returns (.PrepareBulkLoadResponse);
+       * rpc PrepareBulkLoad(.hbase.pb.PrepareBulkLoadRequest) returns (.hbase.pb.PrepareBulkLoadResponse);
        */
       public abstract void prepareBulkLoad(
           com.google.protobuf.RpcController controller,
@@ -4456,7 +4456,7 @@ public final class SecureBulkLoadProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc SecureBulkLoadHFiles(.SecureBulkLoadHFilesRequest) returns (.SecureBulkLoadHFilesResponse);
+       * rpc SecureBulkLoadHFiles(.hbase.pb.SecureBulkLoadHFilesRequest) returns (.hbase.pb.SecureBulkLoadHFilesResponse);
        */
       public abstract void secureBulkLoadHFiles(
           com.google.protobuf.RpcController controller,
@@ -4464,7 +4464,7 @@ public final class SecureBulkLoadProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc CleanupBulkLoad(.CleanupBulkLoadRequest) returns (.CleanupBulkLoadResponse);
+       * rpc CleanupBulkLoad(.hbase.pb.CleanupBulkLoadRequest) returns (.hbase.pb.CleanupBulkLoadResponse);
        */
       public abstract void cleanupBulkLoad(
           com.google.protobuf.RpcController controller,
@@ -4577,7 +4577,7 @@ public final class SecureBulkLoadProtos {
     }
 
     /**
-     * rpc PrepareBulkLoad(.PrepareBulkLoadRequest) returns (.PrepareBulkLoadResponse);
+     * rpc PrepareBulkLoad(.hbase.pb.PrepareBulkLoadRequest) returns (.hbase.pb.PrepareBulkLoadResponse);
      */
     public abstract void prepareBulkLoad(
         com.google.protobuf.RpcController controller,
@@ -4585,7 +4585,7 @@ public final class SecureBulkLoadProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc SecureBulkLoadHFiles(.SecureBulkLoadHFilesRequest) returns (.SecureBulkLoadHFilesResponse);
+     * rpc SecureBulkLoadHFiles(.hbase.pb.SecureBulkLoadHFilesRequest) returns (.hbase.pb.SecureBulkLoadHFilesResponse);
      */
     public abstract void secureBulkLoadHFiles(
         com.google.protobuf.RpcController controller,
@@ -4593,7 +4593,7 @@ public final class SecureBulkLoadProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc CleanupBulkLoad(.CleanupBulkLoadRequest) returns (.CleanupBulkLoadResponse);
+     * rpc CleanupBulkLoad(.hbase.pb.CleanupBulkLoadRequest) returns (.hbase.pb.CleanupBulkLoadResponse);
      */
     public abstract void cleanupBulkLoad(
         com.google.protobuf.RpcController controller,
@@ -4810,44 +4810,44 @@ public final class SecureBulkLoadProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:SecureBulkLoadService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SecureBulkLoadService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SecureBulkLoadHFilesRequest_descriptor;
+    internal_static_hbase_pb_SecureBulkLoadHFilesRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SecureBulkLoadHFilesRequest_fieldAccessorTable;
+      internal_static_hbase_pb_SecureBulkLoadHFilesRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SecureBulkLoadHFilesResponse_descriptor;
+    internal_static_hbase_pb_SecureBulkLoadHFilesResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SecureBulkLoadHFilesResponse_fieldAccessorTable;
+      internal_static_hbase_pb_SecureBulkLoadHFilesResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DelegationToken_descriptor;
+    internal_static_hbase_pb_DelegationToken_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DelegationToken_fieldAccessorTable;
+      internal_static_hbase_pb_DelegationToken_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_PrepareBulkLoadRequest_descriptor;
+    internal_static_hbase_pb_PrepareBulkLoadRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_PrepareBulkLoadRequest_fieldAccessorTable;
+      internal_static_hbase_pb_PrepareBulkLoadRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_PrepareBulkLoadResponse_descriptor;
+    internal_static_hbase_pb_PrepareBulkLoadResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_PrepareBulkLoadResponse_fieldAccessorTable;
+      internal_static_hbase_pb_PrepareBulkLoadResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CleanupBulkLoadRequest_descriptor;
+    internal_static_hbase_pb_CleanupBulkLoadRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CleanupBulkLoadRequest_fieldAccessorTable;
+      internal_static_hbase_pb_CleanupBulkLoadRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CleanupBulkLoadResponse_descriptor;
+    internal_static_hbase_pb_CleanupBulkLoadResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CleanupBulkLoadResponse_fieldAccessorTable;
+      internal_static_hbase_pb_CleanupBulkLoadResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -4857,75 +4857,77 @@ public final class SecureBulkLoadProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024SecureBulkLoad.proto\032\013HBase.proto\032\014Cli" +
-      "ent.proto\"\244\001\n\033SecureBulkLoadHFilesReques" +
-      "t\0225\n\013family_path\030\001 \003(\0132 .BulkLoadHFileRe" +
-      "quest.FamilyPath\022\026\n\016assign_seq_num\030\002 \001(\010" +
-      "\022\"\n\010fs_token\030\003 \002(\0132\020.DelegationToken\022\022\n\n" +
-      "bulk_token\030\004 \002(\t\".\n\034SecureBulkLoadHFiles" +
-      "Response\022\016\n\006loaded\030\001 \002(\010\"V\n\017DelegationTo" +
-      "ken\022\022\n\nidentifier\030\001 \001(\014\022\020\n\010password\030\002 \001(" +
-      "\014\022\014\n\004kind\030\003 \001(\t\022\017\n\007service\030\004 \001(\t\"8\n\026Prep" +
-      "areBulkLoadRequest\022\036\n\ntable_name\030\001 \002(\0132\n",
-      ".TableName\"-\n\027PrepareBulkLoadResponse\022\022\n" +
-      "\nbulk_token\030\001 \002(\t\",\n\026CleanupBulkLoadRequ" +
-      "est\022\022\n\nbulk_token\030\001 \002(\t\"\031\n\027CleanupBulkLo" +
-      "adResponse2\370\001\n\025SecureBulkLoadService\022D\n\017" +
-      "PrepareBulkLoad\022\027.PrepareBulkLoadRequest" +
-      "\032\030.PrepareBulkLoadResponse\022S\n\024SecureBulk" +
-      "LoadHFiles\022\034.SecureBulkLoadHFilesRequest" +
-      "\032\035.SecureBulkLoadHFilesResponse\022D\n\017Clean" +
-      "upBulkLoad\022\027.CleanupBulkLoadRequest\032\030.Cl" +
-      "eanupBulkLoadResponseBJ\n*org.apache.hado",
-      "op.hbase.protobuf.generatedB\024SecureBulkL" +
-      "oadProtosH\001\210\001\001\240\001\001"
+      "\n\024SecureBulkLoad.proto\022\010hbase.pb\032\013HBase." +
+      "proto\032\014Client.proto\"\266\001\n\033SecureBulkLoadHF" +
+      "ilesRequest\022>\n\013family_path\030\001 \003(\0132).hbase" +
+      ".pb.BulkLoadHFileRequest.FamilyPath\022\026\n\016a" +
+      "ssign_seq_num\030\002 \001(\010\022+\n\010fs_token\030\003 \002(\0132\031." +
+      "hbase.pb.DelegationToken\022\022\n\nbulk_token\030\004" +
+      " \002(\t\".\n\034SecureBulkLoadHFilesResponse\022\016\n\006" +
+      "loaded\030\001 \002(\010\"V\n\017DelegationToken\022\022\n\nident" +
+      "ifier\030\001 \001(\014\022\020\n\010password\030\002 \001(\014\022\014\n\004kind\030\003 " +
+      "\001(\t\022\017\n\007service\030\004 \001(\t\"A\n\026PrepareBulkLoadR",
+      "equest\022\'\n\ntable_name\030\001 \002(\0132\023.hbase.pb.Ta" +
+      "bleName\"-\n\027PrepareBulkLoadResponse\022\022\n\nbu" +
+      "lk_token\030\001 \002(\t\",\n\026CleanupBulkLoadRequest" +
+      "\022\022\n\nbulk_token\030\001 \002(\t\"\031\n\027CleanupBulkLoadR" +
+      "esponse2\256\002\n\025SecureBulkLoadService\022V\n\017Pre" +
+      "pareBulkLoad\022 .hbase.pb.PrepareBulkLoadR" +
+      "equest\032!.hbase.pb.PrepareBulkLoadRespons" +
+      "e\022e\n\024SecureBulkLoadHFiles\022%.hbase.pb.Sec" +
+      "ureBulkLoadHFilesRequest\032&.hbase.pb.Secu" +
+      "reBulkLoadHFilesResponse\022V\n\017CleanupBulkL",
+      "oad\022 .hbase.pb.CleanupBulkLoadRequest\032!." +
+      "hbase.pb.CleanupBulkLoadResponseBJ\n*org." +
+      "apache.hadoop.hbase.protobuf.generatedB\024" +
+      "SecureBulkLoadProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_SecureBulkLoadHFilesRequest_descriptor =
+          internal_static_hbase_pb_SecureBulkLoadHFilesRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_SecureBulkLoadHFilesRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_SecureBulkLoadHFilesRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SecureBulkLoadHFilesRequest_descriptor,
+              internal_static_hbase_pb_SecureBulkLoadHFilesRequest_descriptor,
               new java.lang.String[] { "FamilyPath", "AssignSeqNum", "FsToken", "BulkToken", });
-          internal_static_SecureBulkLoadHFilesResponse_descriptor =
+          internal_static_hbase_pb_SecureBulkLoadHFilesResponse_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_SecureBulkLoadHFilesResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_SecureBulkLoadHFilesResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SecureBulkLoadHFilesResponse_descriptor,
+              internal_static_hbase_pb_SecureBulkLoadHFilesResponse_descriptor,
               new java.lang.String[] { "Loaded", });
-          internal_static_DelegationToken_descriptor =
+          internal_static_hbase_pb_DelegationToken_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_DelegationToken_fieldAccessorTable = new
+          internal_static_hbase_pb_DelegationToken_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DelegationToken_descriptor,
+              internal_static_hbase_pb_DelegationToken_descriptor,
               new java.lang.String[] { "Identifier", "Password", "Kind", "Service", });
-          internal_static_PrepareBulkLoadRequest_descriptor =
+          internal_static_hbase_pb_PrepareBulkLoadRequest_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_PrepareBulkLoadRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_PrepareBulkLoadRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_PrepareBulkLoadRequest_descriptor,
+              internal_static_hbase_pb_PrepareBulkLoadRequest_descriptor,
               new java.lang.String[] { "TableName", });
-          internal_static_PrepareBulkLoadResponse_descriptor =
+          internal_static_hbase_pb_PrepareBulkLoadResponse_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_PrepareBulkLoadResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_PrepareBulkLoadResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_PrepareBulkLoadResponse_descriptor,
+              internal_static_hbase_pb_PrepareBulkLoadResponse_descriptor,
               new java.lang.String[] { "BulkToken", });
-          internal_static_CleanupBulkLoadRequest_descriptor =
+          internal_static_hbase_pb_CleanupBulkLoadRequest_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_CleanupBulkLoadRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_CleanupBulkLoadRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CleanupBulkLoadRequest_descriptor,
+              internal_static_hbase_pb_CleanupBulkLoadRequest_descriptor,
               new java.lang.String[] { "BulkToken", });
-          internal_static_CleanupBulkLoadResponse_descriptor =
+          internal_static_hbase_pb_CleanupBulkLoadResponse_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_CleanupBulkLoadResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_CleanupBulkLoadResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CleanupBulkLoadResponse_descriptor,
+              internal_static_hbase_pb_CleanupBulkLoadResponse_descriptor,
               new java.lang.String[] { });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/TracingProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/TracingProtos.java
index 314211808df..9a12a5b428e 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/TracingProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/TracingProtos.java
@@ -32,7 +32,7 @@ public final class TracingProtos {
     long getParentId();
   }
   /**
-   * Protobuf type {@code RPCTInfo}
+   * Protobuf type {@code hbase.pb.RPCTInfo}
    *
    * 
    *Used to pass through the information necessary to continue
@@ -114,12 +114,12 @@ public final class TracingProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_RPCTInfo_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_hbase_pb_RPCTInfo_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_RPCTInfo_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_hbase_pb_RPCTInfo_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.class, org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.Builder.class);
     }
@@ -337,7 +337,7 @@ public final class TracingProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RPCTInfo}
+     * Protobuf type {@code hbase.pb.RPCTInfo}
      *
      * 
      *Used to pass through the information necessary to continue
@@ -352,12 +352,12 @@ public final class TracingProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_RPCTInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_hbase_pb_RPCTInfo_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_RPCTInfo_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_hbase_pb_RPCTInfo_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.class, org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.Builder.class);
       }
@@ -395,7 +395,7 @@ public final class TracingProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_RPCTInfo_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.TracingProtos.internal_static_hbase_pb_RPCTInfo_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo getDefaultInstanceForType() {
@@ -537,7 +537,7 @@ public final class TracingProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RPCTInfo)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RPCTInfo)
     }
 
     static {
@@ -545,14 +545,14 @@ public final class TracingProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RPCTInfo)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RPCTInfo)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RPCTInfo_descriptor;
+    internal_static_hbase_pb_RPCTInfo_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RPCTInfo_fieldAccessorTable;
+      internal_static_hbase_pb_RPCTInfo_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -562,21 +562,21 @@ public final class TracingProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\rTracing.proto\"/\n\010RPCTInfo\022\020\n\010trace_id\030" +
-      "\001 \001(\003\022\021\n\tparent_id\030\002 \001(\003B@\n*org.apache.h" +
-      "adoop.hbase.protobuf.generatedB\rTracingP" +
-      "rotosH\001\240\001\001"
+      "\n\rTracing.proto\022\010hbase.pb\"/\n\010RPCTInfo\022\020\n" +
+      "\010trace_id\030\001 \001(\003\022\021\n\tparent_id\030\002 \001(\003B@\n*or" +
+      "g.apache.hadoop.hbase.protobuf.generated" +
+      "B\rTracingProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_RPCTInfo_descriptor =
+          internal_static_hbase_pb_RPCTInfo_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_RPCTInfo_fieldAccessorTable = new
+          internal_static_hbase_pb_RPCTInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RPCTInfo_descriptor,
+              internal_static_hbase_pb_RPCTInfo_descriptor,
               new java.lang.String[] { "TraceId", "ParentId", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/VisibilityLabelsProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/VisibilityLabelsProtos.java
index 70593b027ed..3810071cb5c 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/VisibilityLabelsProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/VisibilityLabelsProtos.java
@@ -11,33 +11,33 @@ public final class VisibilityLabelsProtos {
   public interface VisibilityLabelsRequestOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .VisibilityLabel visLabel = 1;
+    // repeated .hbase.pb.VisibilityLabel visLabel = 1;
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     java.util.List 
         getVisLabelList();
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel getVisLabel(int index);
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     int getVisLabelCount();
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     java.util.List 
         getVisLabelOrBuilderList();
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelOrBuilder getVisLabelOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code VisibilityLabelsRequest}
+   * Protobuf type {@code hbase.pb.VisibilityLabelsRequest}
    */
   public static final class VisibilityLabelsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -112,12 +112,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequest.Builder.class);
     }
@@ -137,36 +137,36 @@ public final class VisibilityLabelsProtos {
       return PARSER;
     }
 
-    // repeated .VisibilityLabel visLabel = 1;
+    // repeated .hbase.pb.VisibilityLabel visLabel = 1;
     public static final int VISLABEL_FIELD_NUMBER = 1;
     private java.util.List visLabel_;
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     public java.util.List getVisLabelList() {
       return visLabel_;
     }
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     public java.util.List 
         getVisLabelOrBuilderList() {
       return visLabel_;
     }
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     public int getVisLabelCount() {
       return visLabel_.size();
     }
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel getVisLabel(int index) {
       return visLabel_.get(index);
     }
     /**
-     * repeated .VisibilityLabel visLabel = 1;
+     * repeated .hbase.pb.VisibilityLabel visLabel = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelOrBuilder getVisLabelOrBuilder(
         int index) {
@@ -324,19 +324,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code VisibilityLabelsRequest}
+     * Protobuf type {@code hbase.pb.VisibilityLabelsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequest.Builder.class);
       }
@@ -377,7 +377,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsRequest getDefaultInstanceForType() {
@@ -478,7 +478,7 @@ public final class VisibilityLabelsProtos {
       }
       private int bitField0_;
 
-      // repeated .VisibilityLabel visLabel = 1;
+      // repeated .hbase.pb.VisibilityLabel visLabel = 1;
       private java.util.List visLabel_ =
         java.util.Collections.emptyList();
       private void ensureVisLabelIsMutable() {
@@ -492,7 +492,7 @@ public final class VisibilityLabelsProtos {
           org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelOrBuilder> visLabelBuilder_;
 
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public java.util.List getVisLabelList() {
         if (visLabelBuilder_ == null) {
@@ -502,7 +502,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public int getVisLabelCount() {
         if (visLabelBuilder_ == null) {
@@ -512,7 +512,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel getVisLabel(int index) {
         if (visLabelBuilder_ == null) {
@@ -522,7 +522,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder setVisLabel(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel value) {
@@ -539,7 +539,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder setVisLabel(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder builderForValue) {
@@ -553,7 +553,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder addVisLabel(org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel value) {
         if (visLabelBuilder_ == null) {
@@ -569,7 +569,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder addVisLabel(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel value) {
@@ -586,7 +586,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder addVisLabel(
           org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder builderForValue) {
@@ -600,7 +600,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder addVisLabel(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder builderForValue) {
@@ -614,7 +614,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder addAllVisLabel(
           java.lang.Iterable values) {
@@ -628,7 +628,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder clearVisLabel() {
         if (visLabelBuilder_ == null) {
@@ -641,7 +641,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public Builder removeVisLabel(int index) {
         if (visLabelBuilder_ == null) {
@@ -654,14 +654,14 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder getVisLabelBuilder(
           int index) {
         return getVisLabelFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelOrBuilder getVisLabelOrBuilder(
           int index) {
@@ -671,7 +671,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public java.util.List 
            getVisLabelOrBuilderList() {
@@ -682,14 +682,14 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder addVisLabelBuilder() {
         return getVisLabelFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.getDefaultInstance());
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder addVisLabelBuilder(
           int index) {
@@ -697,7 +697,7 @@ public final class VisibilityLabelsProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.getDefaultInstance());
       }
       /**
-       * repeated .VisibilityLabel visLabel = 1;
+       * repeated .hbase.pb.VisibilityLabel visLabel = 1;
        */
       public java.util.List 
            getVisLabelBuilderList() {
@@ -718,7 +718,7 @@ public final class VisibilityLabelsProtos {
         return visLabelBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:VisibilityLabelsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.VisibilityLabelsRequest)
     }
 
     static {
@@ -726,7 +726,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:VisibilityLabelsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.VisibilityLabelsRequest)
   }
 
   public interface VisibilityLabelOrBuilder
@@ -753,7 +753,7 @@ public final class VisibilityLabelsProtos {
     int getOrdinal();
   }
   /**
-   * Protobuf type {@code VisibilityLabel}
+   * Protobuf type {@code hbase.pb.VisibilityLabel}
    */
   public static final class VisibilityLabel extends
       com.google.protobuf.GeneratedMessage
@@ -827,12 +827,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabel_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabel_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabel_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabel_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder.class);
     }
@@ -1054,19 +1054,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code VisibilityLabel}
+     * Protobuf type {@code hbase.pb.VisibilityLabel}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabel_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabel_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabel_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabel_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel.Builder.class);
       }
@@ -1104,7 +1104,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabel_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabel_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabel getDefaultInstanceForType() {
@@ -1253,7 +1253,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:VisibilityLabel)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.VisibilityLabel)
     }
 
     static {
@@ -1261,39 +1261,39 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:VisibilityLabel)
+    // @@protoc_insertion_point(class_scope:hbase.pb.VisibilityLabel)
   }
 
   public interface VisibilityLabelsResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .RegionActionResult result = 1;
+    // repeated .hbase.pb.RegionActionResult result = 1;
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     java.util.List 
         getResultList();
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getResult(int index);
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     int getResultCount();
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     java.util.List 
         getResultOrBuilderList();
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder getResultOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code VisibilityLabelsResponse}
+   * Protobuf type {@code hbase.pb.VisibilityLabelsResponse}
    */
   public static final class VisibilityLabelsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -1368,12 +1368,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse.Builder.class);
     }
@@ -1393,36 +1393,36 @@ public final class VisibilityLabelsProtos {
       return PARSER;
     }
 
-    // repeated .RegionActionResult result = 1;
+    // repeated .hbase.pb.RegionActionResult result = 1;
     public static final int RESULT_FIELD_NUMBER = 1;
     private java.util.List result_;
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     public java.util.List getResultList() {
       return result_;
     }
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     public java.util.List 
         getResultOrBuilderList() {
       return result_;
     }
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     public int getResultCount() {
       return result_.size();
     }
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getResult(int index) {
       return result_.get(index);
     }
     /**
-     * repeated .RegionActionResult result = 1;
+     * repeated .hbase.pb.RegionActionResult result = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder getResultOrBuilder(
         int index) {
@@ -1580,19 +1580,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code VisibilityLabelsResponse}
+     * Protobuf type {@code hbase.pb.VisibilityLabelsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse.Builder.class);
       }
@@ -1633,7 +1633,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_VisibilityLabelsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_VisibilityLabelsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse getDefaultInstanceForType() {
@@ -1734,7 +1734,7 @@ public final class VisibilityLabelsProtos {
       }
       private int bitField0_;
 
-      // repeated .RegionActionResult result = 1;
+      // repeated .hbase.pb.RegionActionResult result = 1;
       private java.util.List result_ =
         java.util.Collections.emptyList();
       private void ensureResultIsMutable() {
@@ -1748,7 +1748,7 @@ public final class VisibilityLabelsProtos {
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder> resultBuilder_;
 
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public java.util.List getResultList() {
         if (resultBuilder_ == null) {
@@ -1758,7 +1758,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public int getResultCount() {
         if (resultBuilder_ == null) {
@@ -1768,7 +1768,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult getResult(int index) {
         if (resultBuilder_ == null) {
@@ -1778,7 +1778,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder setResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult value) {
@@ -1795,7 +1795,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder setResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder builderForValue) {
@@ -1809,7 +1809,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder addResult(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult value) {
         if (resultBuilder_ == null) {
@@ -1825,7 +1825,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder addResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult value) {
@@ -1842,7 +1842,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder addResult(
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder builderForValue) {
@@ -1856,7 +1856,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder addResult(
           int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder builderForValue) {
@@ -1870,7 +1870,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder addAllResult(
           java.lang.Iterable values) {
@@ -1884,7 +1884,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder clearResult() {
         if (resultBuilder_ == null) {
@@ -1897,7 +1897,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public Builder removeResult(int index) {
         if (resultBuilder_ == null) {
@@ -1910,14 +1910,14 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder getResultBuilder(
           int index) {
         return getResultFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResultOrBuilder getResultOrBuilder(
           int index) {
@@ -1927,7 +1927,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public java.util.List 
            getResultOrBuilderList() {
@@ -1938,14 +1938,14 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder addResultBuilder() {
         return getResultFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.getDefaultInstance());
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.Builder addResultBuilder(
           int index) {
@@ -1953,7 +1953,7 @@ public final class VisibilityLabelsProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult.getDefaultInstance());
       }
       /**
-       * repeated .RegionActionResult result = 1;
+       * repeated .hbase.pb.RegionActionResult result = 1;
        */
       public java.util.List 
            getResultBuilderList() {
@@ -1974,7 +1974,7 @@ public final class VisibilityLabelsProtos {
         return resultBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:VisibilityLabelsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.VisibilityLabelsResponse)
     }
 
     static {
@@ -1982,7 +1982,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:VisibilityLabelsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.VisibilityLabelsResponse)
   }
 
   public interface SetAuthsRequestOrBuilder
@@ -2013,7 +2013,7 @@ public final class VisibilityLabelsProtos {
     com.google.protobuf.ByteString getAuth(int index);
   }
   /**
-   * Protobuf type {@code SetAuthsRequest}
+   * Protobuf type {@code hbase.pb.SetAuthsRequest}
    */
   public static final class SetAuthsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -2093,12 +2093,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_SetAuthsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_SetAuthsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_SetAuthsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_SetAuthsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.SetAuthsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.SetAuthsRequest.Builder.class);
     }
@@ -2329,19 +2329,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SetAuthsRequest}
+     * Protobuf type {@code hbase.pb.SetAuthsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.SetAuthsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_SetAuthsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_SetAuthsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_SetAuthsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_SetAuthsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.SetAuthsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.SetAuthsRequest.Builder.class);
       }
@@ -2379,7 +2379,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_SetAuthsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_SetAuthsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.SetAuthsRequest getDefaultInstanceForType() {
@@ -2575,7 +2575,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SetAuthsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SetAuthsRequest)
     }
 
     static {
@@ -2583,7 +2583,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SetAuthsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SetAuthsRequest)
   }
 
   public interface UserAuthorizationsOrBuilder
@@ -2614,7 +2614,7 @@ public final class VisibilityLabelsProtos {
     int getAuth(int index);
   }
   /**
-   * Protobuf type {@code UserAuthorizations}
+   * Protobuf type {@code hbase.pb.UserAuthorizations}
    */
   public static final class UserAuthorizations extends
       com.google.protobuf.GeneratedMessage
@@ -2707,12 +2707,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_UserAuthorizations_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_UserAuthorizations_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_UserAuthorizations_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_UserAuthorizations_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder.class);
     }
@@ -2943,19 +2943,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code UserAuthorizations}
+     * Protobuf type {@code hbase.pb.UserAuthorizations}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizationsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_UserAuthorizations_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_UserAuthorizations_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_UserAuthorizations_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_UserAuthorizations_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder.class);
       }
@@ -2993,7 +2993,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_UserAuthorizations_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_UserAuthorizations_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations getDefaultInstanceForType() {
@@ -3183,7 +3183,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:UserAuthorizations)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.UserAuthorizations)
     }
 
     static {
@@ -3191,39 +3191,39 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:UserAuthorizations)
+    // @@protoc_insertion_point(class_scope:hbase.pb.UserAuthorizations)
   }
 
   public interface MultiUserAuthorizationsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .UserAuthorizations userAuths = 1;
+    // repeated .hbase.pb.UserAuthorizations userAuths = 1;
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     java.util.List 
         getUserAuthsList();
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations getUserAuths(int index);
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     int getUserAuthsCount();
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     java.util.List 
         getUserAuthsOrBuilderList();
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizationsOrBuilder getUserAuthsOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code MultiUserAuthorizations}
+   * Protobuf type {@code hbase.pb.MultiUserAuthorizations}
    */
   public static final class MultiUserAuthorizations extends
       com.google.protobuf.GeneratedMessage
@@ -3298,12 +3298,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_MultiUserAuthorizations_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_MultiUserAuthorizations_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_MultiUserAuthorizations_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_MultiUserAuthorizations_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.MultiUserAuthorizations.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.MultiUserAuthorizations.Builder.class);
     }
@@ -3323,36 +3323,36 @@ public final class VisibilityLabelsProtos {
       return PARSER;
     }
 
-    // repeated .UserAuthorizations userAuths = 1;
+    // repeated .hbase.pb.UserAuthorizations userAuths = 1;
     public static final int USERAUTHS_FIELD_NUMBER = 1;
     private java.util.List userAuths_;
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     public java.util.List getUserAuthsList() {
       return userAuths_;
     }
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     public java.util.List 
         getUserAuthsOrBuilderList() {
       return userAuths_;
     }
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     public int getUserAuthsCount() {
       return userAuths_.size();
     }
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations getUserAuths(int index) {
       return userAuths_.get(index);
     }
     /**
-     * repeated .UserAuthorizations userAuths = 1;
+     * repeated .hbase.pb.UserAuthorizations userAuths = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizationsOrBuilder getUserAuthsOrBuilder(
         int index) {
@@ -3510,19 +3510,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MultiUserAuthorizations}
+     * Protobuf type {@code hbase.pb.MultiUserAuthorizations}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.MultiUserAuthorizationsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_MultiUserAuthorizations_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_MultiUserAuthorizations_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_MultiUserAuthorizations_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_MultiUserAuthorizations_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.MultiUserAuthorizations.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.MultiUserAuthorizations.Builder.class);
       }
@@ -3563,7 +3563,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_MultiUserAuthorizations_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_MultiUserAuthorizations_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.MultiUserAuthorizations getDefaultInstanceForType() {
@@ -3664,7 +3664,7 @@ public final class VisibilityLabelsProtos {
       }
       private int bitField0_;
 
-      // repeated .UserAuthorizations userAuths = 1;
+      // repeated .hbase.pb.UserAuthorizations userAuths = 1;
       private java.util.List userAuths_ =
         java.util.Collections.emptyList();
       private void ensureUserAuthsIsMutable() {
@@ -3678,7 +3678,7 @@ public final class VisibilityLabelsProtos {
           org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizationsOrBuilder> userAuthsBuilder_;
 
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public java.util.List getUserAuthsList() {
         if (userAuthsBuilder_ == null) {
@@ -3688,7 +3688,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public int getUserAuthsCount() {
         if (userAuthsBuilder_ == null) {
@@ -3698,7 +3698,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations getUserAuths(int index) {
         if (userAuthsBuilder_ == null) {
@@ -3708,7 +3708,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder setUserAuths(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations value) {
@@ -3725,7 +3725,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder setUserAuths(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder builderForValue) {
@@ -3739,7 +3739,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder addUserAuths(org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations value) {
         if (userAuthsBuilder_ == null) {
@@ -3755,7 +3755,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder addUserAuths(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations value) {
@@ -3772,7 +3772,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder addUserAuths(
           org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder builderForValue) {
@@ -3786,7 +3786,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder addUserAuths(
           int index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder builderForValue) {
@@ -3800,7 +3800,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder addAllUserAuths(
           java.lang.Iterable values) {
@@ -3814,7 +3814,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder clearUserAuths() {
         if (userAuthsBuilder_ == null) {
@@ -3827,7 +3827,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public Builder removeUserAuths(int index) {
         if (userAuthsBuilder_ == null) {
@@ -3840,14 +3840,14 @@ public final class VisibilityLabelsProtos {
         return this;
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder getUserAuthsBuilder(
           int index) {
         return getUserAuthsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizationsOrBuilder getUserAuthsOrBuilder(
           int index) {
@@ -3857,7 +3857,7 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public java.util.List 
            getUserAuthsOrBuilderList() {
@@ -3868,14 +3868,14 @@ public final class VisibilityLabelsProtos {
         }
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder addUserAuthsBuilder() {
         return getUserAuthsFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.getDefaultInstance());
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.Builder addUserAuthsBuilder(
           int index) {
@@ -3883,7 +3883,7 @@ public final class VisibilityLabelsProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.UserAuthorizations.getDefaultInstance());
       }
       /**
-       * repeated .UserAuthorizations userAuths = 1;
+       * repeated .hbase.pb.UserAuthorizations userAuths = 1;
        */
       public java.util.List 
            getUserAuthsBuilderList() {
@@ -3904,7 +3904,7 @@ public final class VisibilityLabelsProtos {
         return userAuthsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:MultiUserAuthorizations)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MultiUserAuthorizations)
     }
 
     static {
@@ -3912,7 +3912,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MultiUserAuthorizations)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MultiUserAuthorizations)
   }
 
   public interface GetAuthsRequestOrBuilder
@@ -3929,7 +3929,7 @@ public final class VisibilityLabelsProtos {
     com.google.protobuf.ByteString getUser();
   }
   /**
-   * Protobuf type {@code GetAuthsRequest}
+   * Protobuf type {@code hbase.pb.GetAuthsRequest}
    */
   public static final class GetAuthsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -3998,12 +3998,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsRequest.Builder.class);
     }
@@ -4192,19 +4192,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetAuthsRequest}
+     * Protobuf type {@code hbase.pb.GetAuthsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsRequest.Builder.class);
       }
@@ -4240,7 +4240,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsRequest getDefaultInstanceForType() {
@@ -4349,7 +4349,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetAuthsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetAuthsRequest)
     }
 
     static {
@@ -4357,7 +4357,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetAuthsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetAuthsRequest)
   }
 
   public interface GetAuthsResponseOrBuilder
@@ -4388,7 +4388,7 @@ public final class VisibilityLabelsProtos {
     com.google.protobuf.ByteString getAuth(int index);
   }
   /**
-   * Protobuf type {@code GetAuthsResponse}
+   * Protobuf type {@code hbase.pb.GetAuthsResponse}
    */
   public static final class GetAuthsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -4468,12 +4468,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponse.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponse.Builder.class);
     }
@@ -4704,19 +4704,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code GetAuthsResponse}
+     * Protobuf type {@code hbase.pb.GetAuthsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponse.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponse.Builder.class);
       }
@@ -4754,7 +4754,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_GetAuthsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_GetAuthsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponse getDefaultInstanceForType() {
@@ -4950,7 +4950,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:GetAuthsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.GetAuthsResponse)
     }
 
     static {
@@ -4958,7 +4958,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:GetAuthsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.GetAuthsResponse)
   }
 
   public interface ListLabelsRequestOrBuilder
@@ -4980,7 +4980,7 @@ public final class VisibilityLabelsProtos {
         getRegexBytes();
   }
   /**
-   * Protobuf type {@code ListLabelsRequest}
+   * Protobuf type {@code hbase.pb.ListLabelsRequest}
    */
   public static final class ListLabelsRequest extends
       com.google.protobuf.GeneratedMessage
@@ -5049,12 +5049,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsRequest_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsRequest_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsRequest_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsRequest.Builder.class);
     }
@@ -5266,19 +5266,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListLabelsRequest}
+     * Protobuf type {@code hbase.pb.ListLabelsRequest}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsRequest_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsRequest_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsRequest.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsRequest.Builder.class);
       }
@@ -5314,7 +5314,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsRequest_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsRequest_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsRequest getDefaultInstanceForType() {
@@ -5459,7 +5459,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListLabelsRequest)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListLabelsRequest)
     }
 
     static {
@@ -5467,7 +5467,7 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListLabelsRequest)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListLabelsRequest)
   }
 
   public interface ListLabelsResponseOrBuilder
@@ -5488,7 +5488,7 @@ public final class VisibilityLabelsProtos {
     com.google.protobuf.ByteString getLabel(int index);
   }
   /**
-   * Protobuf type {@code ListLabelsResponse}
+   * Protobuf type {@code hbase.pb.ListLabelsResponse}
    */
   public static final class ListLabelsResponse extends
       com.google.protobuf.GeneratedMessage
@@ -5563,12 +5563,12 @@ public final class VisibilityLabelsProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsResponse_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsResponse_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsResponse_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsResponse.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsResponse.Builder.class);
     }
@@ -5761,19 +5761,19 @@ public final class VisibilityLabelsProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ListLabelsResponse}
+     * Protobuf type {@code hbase.pb.ListLabelsResponse}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsResponse_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsResponse_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsResponse.class, org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsResponse.Builder.class);
       }
@@ -5809,7 +5809,7 @@ public final class VisibilityLabelsProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_ListLabelsResponse_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.internal_static_hbase_pb_ListLabelsResponse_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.ListLabelsResponse getDefaultInstanceForType() {
@@ -5956,7 +5956,7 @@ public final class VisibilityLabelsProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ListLabelsResponse)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ListLabelsResponse)
     }
 
     static {
@@ -5964,11 +5964,11 @@ public final class VisibilityLabelsProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ListLabelsResponse)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ListLabelsResponse)
   }
 
   /**
-   * Protobuf service {@code VisibilityLabelsService}
+   * Protobuf service {@code hbase.pb.VisibilityLabelsService}
    */
   public static abstract class VisibilityLabelsService
       implements com.google.protobuf.Service {
@@ -5976,7 +5976,7 @@ public final class VisibilityLabelsProtos {
 
     public interface Interface {
       /**
-       * rpc addLabels(.VisibilityLabelsRequest) returns (.VisibilityLabelsResponse);
+       * rpc addLabels(.hbase.pb.VisibilityLabelsRequest) returns (.hbase.pb.VisibilityLabelsResponse);
        */
       public abstract void addLabels(
           com.google.protobuf.RpcController controller,
@@ -5984,7 +5984,7 @@ public final class VisibilityLabelsProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc setAuths(.SetAuthsRequest) returns (.VisibilityLabelsResponse);
+       * rpc setAuths(.hbase.pb.SetAuthsRequest) returns (.hbase.pb.VisibilityLabelsResponse);
        */
       public abstract void setAuths(
           com.google.protobuf.RpcController controller,
@@ -5992,7 +5992,7 @@ public final class VisibilityLabelsProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc clearAuths(.SetAuthsRequest) returns (.VisibilityLabelsResponse);
+       * rpc clearAuths(.hbase.pb.SetAuthsRequest) returns (.hbase.pb.VisibilityLabelsResponse);
        */
       public abstract void clearAuths(
           com.google.protobuf.RpcController controller,
@@ -6000,7 +6000,7 @@ public final class VisibilityLabelsProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc getAuths(.GetAuthsRequest) returns (.GetAuthsResponse);
+       * rpc getAuths(.hbase.pb.GetAuthsRequest) returns (.hbase.pb.GetAuthsResponse);
        */
       public abstract void getAuths(
           com.google.protobuf.RpcController controller,
@@ -6008,7 +6008,7 @@ public final class VisibilityLabelsProtos {
           com.google.protobuf.RpcCallback done);
 
       /**
-       * rpc listLabels(.ListLabelsRequest) returns (.ListLabelsResponse);
+       * rpc listLabels(.hbase.pb.ListLabelsRequest) returns (.hbase.pb.ListLabelsResponse);
        */
       public abstract void listLabels(
           com.google.protobuf.RpcController controller,
@@ -6149,7 +6149,7 @@ public final class VisibilityLabelsProtos {
     }
 
     /**
-     * rpc addLabels(.VisibilityLabelsRequest) returns (.VisibilityLabelsResponse);
+     * rpc addLabels(.hbase.pb.VisibilityLabelsRequest) returns (.hbase.pb.VisibilityLabelsResponse);
      */
     public abstract void addLabels(
         com.google.protobuf.RpcController controller,
@@ -6157,7 +6157,7 @@ public final class VisibilityLabelsProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc setAuths(.SetAuthsRequest) returns (.VisibilityLabelsResponse);
+     * rpc setAuths(.hbase.pb.SetAuthsRequest) returns (.hbase.pb.VisibilityLabelsResponse);
      */
     public abstract void setAuths(
         com.google.protobuf.RpcController controller,
@@ -6165,7 +6165,7 @@ public final class VisibilityLabelsProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc clearAuths(.SetAuthsRequest) returns (.VisibilityLabelsResponse);
+     * rpc clearAuths(.hbase.pb.SetAuthsRequest) returns (.hbase.pb.VisibilityLabelsResponse);
      */
     public abstract void clearAuths(
         com.google.protobuf.RpcController controller,
@@ -6173,7 +6173,7 @@ public final class VisibilityLabelsProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc getAuths(.GetAuthsRequest) returns (.GetAuthsResponse);
+     * rpc getAuths(.hbase.pb.GetAuthsRequest) returns (.hbase.pb.GetAuthsResponse);
      */
     public abstract void getAuths(
         com.google.protobuf.RpcController controller,
@@ -6181,7 +6181,7 @@ public final class VisibilityLabelsProtos {
         com.google.protobuf.RpcCallback done);
 
     /**
-     * rpc listLabels(.ListLabelsRequest) returns (.ListLabelsResponse);
+     * rpc listLabels(.hbase.pb.ListLabelsRequest) returns (.hbase.pb.ListLabelsResponse);
      */
     public abstract void listLabels(
         com.google.protobuf.RpcController controller,
@@ -6480,59 +6480,59 @@ public final class VisibilityLabelsProtos {
 
     }
 
-    // @@protoc_insertion_point(class_scope:VisibilityLabelsService)
+    // @@protoc_insertion_point(class_scope:hbase.pb.VisibilityLabelsService)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_VisibilityLabelsRequest_descriptor;
+    internal_static_hbase_pb_VisibilityLabelsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_VisibilityLabelsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_VisibilityLabelsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_VisibilityLabel_descriptor;
+    internal_static_hbase_pb_VisibilityLabel_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_VisibilityLabel_fieldAccessorTable;
+      internal_static_hbase_pb_VisibilityLabel_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_VisibilityLabelsResponse_descriptor;
+    internal_static_hbase_pb_VisibilityLabelsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_VisibilityLabelsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_VisibilityLabelsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SetAuthsRequest_descriptor;
+    internal_static_hbase_pb_SetAuthsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SetAuthsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_SetAuthsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_UserAuthorizations_descriptor;
+    internal_static_hbase_pb_UserAuthorizations_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_UserAuthorizations_fieldAccessorTable;
+      internal_static_hbase_pb_UserAuthorizations_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MultiUserAuthorizations_descriptor;
+    internal_static_hbase_pb_MultiUserAuthorizations_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MultiUserAuthorizations_fieldAccessorTable;
+      internal_static_hbase_pb_MultiUserAuthorizations_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetAuthsRequest_descriptor;
+    internal_static_hbase_pb_GetAuthsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetAuthsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_GetAuthsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetAuthsResponse_descriptor;
+    internal_static_hbase_pb_GetAuthsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_GetAuthsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_GetAuthsResponse_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListLabelsRequest_descriptor;
+    internal_static_hbase_pb_ListLabelsRequest_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListLabelsRequest_fieldAccessorTable;
+      internal_static_hbase_pb_ListLabelsRequest_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ListLabelsResponse_descriptor;
+    internal_static_hbase_pb_ListLabelsResponse_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ListLabelsResponse_fieldAccessorTable;
+      internal_static_hbase_pb_ListLabelsResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -6542,95 +6542,98 @@ public final class VisibilityLabelsProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026VisibilityLabels.proto\032\014Client.proto\"=" +
-      "\n\027VisibilityLabelsRequest\022\"\n\010visLabel\030\001 " +
-      "\003(\0132\020.VisibilityLabel\"1\n\017VisibilityLabel" +
-      "\022\r\n\005label\030\001 \002(\014\022\017\n\007ordinal\030\002 \001(\r\"?\n\030Visi" +
-      "bilityLabelsResponse\022#\n\006result\030\001 \003(\0132\023.R" +
-      "egionActionResult\"-\n\017SetAuthsRequest\022\014\n\004" +
-      "user\030\001 \002(\014\022\014\n\004auth\030\002 \003(\014\"0\n\022UserAuthoriz" +
-      "ations\022\014\n\004user\030\001 \002(\014\022\014\n\004auth\030\002 \003(\r\"A\n\027Mu" +
-      "ltiUserAuthorizations\022&\n\tuserAuths\030\001 \003(\013" +
-      "2\023.UserAuthorizations\"\037\n\017GetAuthsRequest",
-      "\022\014\n\004user\030\001 \002(\014\".\n\020GetAuthsResponse\022\014\n\004us" +
-      "er\030\001 \002(\014\022\014\n\004auth\030\002 \003(\014\"\"\n\021ListLabelsRequ" +
-      "est\022\r\n\005regex\030\001 \001(\t\"#\n\022ListLabelsResponse" +
-      "\022\r\n\005label\030\001 \003(\0142\267\002\n\027VisibilityLabelsServ" +
-      "ice\022@\n\taddLabels\022\030.VisibilityLabelsReque" +
-      "st\032\031.VisibilityLabelsResponse\0227\n\010setAuth" +
-      "s\022\020.SetAuthsRequest\032\031.VisibilityLabelsRe" +
-      "sponse\0229\n\nclearAuths\022\020.SetAuthsRequest\032\031" +
-      ".VisibilityLabelsResponse\022/\n\010getAuths\022\020." +
-      "GetAuthsRequest\032\021.GetAuthsResponse\0225\n\nli",
-      "stLabels\022\022.ListLabelsRequest\032\023.ListLabel" +
-      "sResponseBL\n*org.apache.hadoop.hbase.pro" +
-      "tobuf.generatedB\026VisibilityLabelsProtosH" +
-      "\001\210\001\001\240\001\001"
+      "\n\026VisibilityLabels.proto\022\010hbase.pb\032\014Clie" +
+      "nt.proto\"F\n\027VisibilityLabelsRequest\022+\n\010v" +
+      "isLabel\030\001 \003(\0132\031.hbase.pb.VisibilityLabel" +
+      "\"1\n\017VisibilityLabel\022\r\n\005label\030\001 \002(\014\022\017\n\007or" +
+      "dinal\030\002 \001(\r\"H\n\030VisibilityLabelsResponse\022" +
+      ",\n\006result\030\001 \003(\0132\034.hbase.pb.RegionActionR" +
+      "esult\"-\n\017SetAuthsRequest\022\014\n\004user\030\001 \002(\014\022\014" +
+      "\n\004auth\030\002 \003(\014\"0\n\022UserAuthorizations\022\014\n\004us" +
+      "er\030\001 \002(\014\022\014\n\004auth\030\002 \003(\r\"J\n\027MultiUserAutho" +
+      "rizations\022/\n\tuserAuths\030\001 \003(\0132\034.hbase.pb.",
+      "UserAuthorizations\"\037\n\017GetAuthsRequest\022\014\n" +
+      "\004user\030\001 \002(\014\".\n\020GetAuthsResponse\022\014\n\004user\030" +
+      "\001 \002(\014\022\014\n\004auth\030\002 \003(\014\"\"\n\021ListLabelsRequest" +
+      "\022\r\n\005regex\030\001 \001(\t\"#\n\022ListLabelsResponse\022\r\n" +
+      "\005label\030\001 \003(\0142\221\003\n\027VisibilityLabelsService" +
+      "\022R\n\taddLabels\022!.hbase.pb.VisibilityLabel" +
+      "sRequest\032\".hbase.pb.VisibilityLabelsResp" +
+      "onse\022I\n\010setAuths\022\031.hbase.pb.SetAuthsRequ" +
+      "est\032\".hbase.pb.VisibilityLabelsResponse\022" +
+      "K\n\nclearAuths\022\031.hbase.pb.SetAuthsRequest",
+      "\032\".hbase.pb.VisibilityLabelsResponse\022A\n\010" +
+      "getAuths\022\031.hbase.pb.GetAuthsRequest\032\032.hb" +
+      "ase.pb.GetAuthsResponse\022G\n\nlistLabels\022\033." +
+      "hbase.pb.ListLabelsRequest\032\034.hbase.pb.Li" +
+      "stLabelsResponseBL\n*org.apache.hadoop.hb" +
+      "ase.protobuf.generatedB\026VisibilityLabels" +
+      "ProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_VisibilityLabelsRequest_descriptor =
+          internal_static_hbase_pb_VisibilityLabelsRequest_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_VisibilityLabelsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_VisibilityLabelsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_VisibilityLabelsRequest_descriptor,
+              internal_static_hbase_pb_VisibilityLabelsRequest_descriptor,
               new java.lang.String[] { "VisLabel", });
-          internal_static_VisibilityLabel_descriptor =
+          internal_static_hbase_pb_VisibilityLabel_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_VisibilityLabel_fieldAccessorTable = new
+          internal_static_hbase_pb_VisibilityLabel_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_VisibilityLabel_descriptor,
+              internal_static_hbase_pb_VisibilityLabel_descriptor,
               new java.lang.String[] { "Label", "Ordinal", });
-          internal_static_VisibilityLabelsResponse_descriptor =
+          internal_static_hbase_pb_VisibilityLabelsResponse_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_VisibilityLabelsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_VisibilityLabelsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_VisibilityLabelsResponse_descriptor,
+              internal_static_hbase_pb_VisibilityLabelsResponse_descriptor,
               new java.lang.String[] { "Result", });
-          internal_static_SetAuthsRequest_descriptor =
+          internal_static_hbase_pb_SetAuthsRequest_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_SetAuthsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_SetAuthsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SetAuthsRequest_descriptor,
+              internal_static_hbase_pb_SetAuthsRequest_descriptor,
               new java.lang.String[] { "User", "Auth", });
-          internal_static_UserAuthorizations_descriptor =
+          internal_static_hbase_pb_UserAuthorizations_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_UserAuthorizations_fieldAccessorTable = new
+          internal_static_hbase_pb_UserAuthorizations_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_UserAuthorizations_descriptor,
+              internal_static_hbase_pb_UserAuthorizations_descriptor,
               new java.lang.String[] { "User", "Auth", });
-          internal_static_MultiUserAuthorizations_descriptor =
+          internal_static_hbase_pb_MultiUserAuthorizations_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_MultiUserAuthorizations_fieldAccessorTable = new
+          internal_static_hbase_pb_MultiUserAuthorizations_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MultiUserAuthorizations_descriptor,
+              internal_static_hbase_pb_MultiUserAuthorizations_descriptor,
               new java.lang.String[] { "UserAuths", });
-          internal_static_GetAuthsRequest_descriptor =
+          internal_static_hbase_pb_GetAuthsRequest_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_GetAuthsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_GetAuthsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetAuthsRequest_descriptor,
+              internal_static_hbase_pb_GetAuthsRequest_descriptor,
               new java.lang.String[] { "User", });
-          internal_static_GetAuthsResponse_descriptor =
+          internal_static_hbase_pb_GetAuthsResponse_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_GetAuthsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_GetAuthsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_GetAuthsResponse_descriptor,
+              internal_static_hbase_pb_GetAuthsResponse_descriptor,
               new java.lang.String[] { "User", "Auth", });
-          internal_static_ListLabelsRequest_descriptor =
+          internal_static_hbase_pb_ListLabelsRequest_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_ListLabelsRequest_fieldAccessorTable = new
+          internal_static_hbase_pb_ListLabelsRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListLabelsRequest_descriptor,
+              internal_static_hbase_pb_ListLabelsRequest_descriptor,
               new java.lang.String[] { "Regex", });
-          internal_static_ListLabelsResponse_descriptor =
+          internal_static_hbase_pb_ListLabelsResponse_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_ListLabelsResponse_fieldAccessorTable = new
+          internal_static_hbase_pb_ListLabelsResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ListLabelsResponse_descriptor,
+              internal_static_hbase_pb_ListLabelsResponse_descriptor,
               new java.lang.String[] { "Label", });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java
index fa73077498a..d74688e17bc 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java
@@ -9,7 +9,7 @@ public final class WALProtos {
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code ScopeType}
+   * Protobuf enum {@code hbase.pb.ScopeType}
    */
   public enum ScopeType
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -87,7 +87,7 @@ public final class WALProtos {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:ScopeType)
+    // @@protoc_insertion_point(enum_scope:hbase.pb.ScopeType)
   }
 
   public interface WALHeaderOrBuilder
@@ -154,7 +154,7 @@ public final class WALProtos {
         getCellCodecClsNameBytes();
   }
   /**
-   * Protobuf type {@code WALHeader}
+   * Protobuf type {@code hbase.pb.WALHeader}
    */
   public static final class WALHeader extends
       com.google.protobuf.GeneratedMessage
@@ -243,12 +243,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALHeader_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALHeader_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALHeader_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader.Builder.class);
     }
@@ -619,19 +619,19 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WALHeader}
+     * Protobuf type {@code hbase.pb.WALHeader}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeaderOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALHeader_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALHeader_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALHeader_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader.Builder.class);
       }
@@ -675,7 +675,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALHeader_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader getDefaultInstanceForType() {
@@ -1026,7 +1026,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WALHeader)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WALHeader)
     }
 
     static {
@@ -1034,7 +1034,7 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WALHeader)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WALHeader)
   }
 
   public interface WALKeyOrBuilder
@@ -1080,9 +1080,9 @@ public final class WALProtos {
      */
     long getWriteTime();
 
-    // optional .UUID cluster_id = 5 [deprecated = true];
+    // optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
     /**
-     * optional .UUID cluster_id = 5 [deprecated = true];
+     * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
      *
      * 
      *
@@ -1094,7 +1094,7 @@ public final class WALProtos {
      */
     @java.lang.Deprecated boolean hasClusterId();
     /**
-     * optional .UUID cluster_id = 5 [deprecated = true];
+     * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
      *
      * 
      *
@@ -1106,7 +1106,7 @@ public final class WALProtos {
      */
     @java.lang.Deprecated org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID getClusterId();
     /**
-     * optional .UUID cluster_id = 5 [deprecated = true];
+     * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
      *
      * 
      *
@@ -1118,27 +1118,27 @@ public final class WALProtos {
      */
     @java.lang.Deprecated org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUIDOrBuilder getClusterIdOrBuilder();
 
-    // repeated .FamilyScope scopes = 6;
+    // repeated .hbase.pb.FamilyScope scopes = 6;
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     java.util.List 
         getScopesList();
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope getScopes(int index);
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     int getScopesCount();
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     java.util.List 
         getScopesOrBuilderList();
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScopeOrBuilder getScopesOrBuilder(
         int index);
@@ -1153,9 +1153,9 @@ public final class WALProtos {
      */
     int getFollowingKvCount();
 
-    // repeated .UUID cluster_ids = 8;
+    // repeated .hbase.pb.UUID cluster_ids = 8;
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1166,7 +1166,7 @@ public final class WALProtos {
     java.util.List 
         getClusterIdsList();
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1176,7 +1176,7 @@ public final class WALProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID getClusterIds(int index);
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1186,7 +1186,7 @@ public final class WALProtos {
      */
     int getClusterIdsCount();
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1197,7 +1197,7 @@ public final class WALProtos {
     java.util.List 
         getClusterIdsOrBuilderList();
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1239,7 +1239,7 @@ public final class WALProtos {
     long getOrigSequenceNumber();
   }
   /**
-   * Protobuf type {@code WALKey}
+   * Protobuf type {@code hbase.pb.WALKey}
    *
    * 
    *
@@ -1384,12 +1384,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALKey_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALKey_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALKey_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALKey_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.Builder.class);
     }
@@ -1474,11 +1474,11 @@ public final class WALProtos {
       return writeTime_;
     }
 
-    // optional .UUID cluster_id = 5 [deprecated = true];
+    // optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
     public static final int CLUSTER_ID_FIELD_NUMBER = 5;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID clusterId_;
     /**
-     * optional .UUID cluster_id = 5 [deprecated = true];
+     * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
      *
      * 
      *
@@ -1492,7 +1492,7 @@ public final class WALProtos {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .UUID cluster_id = 5 [deprecated = true];
+     * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
      *
      * 
      *
@@ -1506,7 +1506,7 @@ public final class WALProtos {
       return clusterId_;
     }
     /**
-     * optional .UUID cluster_id = 5 [deprecated = true];
+     * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
      *
      * 
      *
@@ -1520,36 +1520,36 @@ public final class WALProtos {
       return clusterId_;
     }
 
-    // repeated .FamilyScope scopes = 6;
+    // repeated .hbase.pb.FamilyScope scopes = 6;
     public static final int SCOPES_FIELD_NUMBER = 6;
     private java.util.List scopes_;
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     public java.util.List getScopesList() {
       return scopes_;
     }
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     public java.util.List 
         getScopesOrBuilderList() {
       return scopes_;
     }
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     public int getScopesCount() {
       return scopes_.size();
     }
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope getScopes(int index) {
       return scopes_.get(index);
     }
     /**
-     * repeated .FamilyScope scopes = 6;
+     * repeated .hbase.pb.FamilyScope scopes = 6;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScopeOrBuilder getScopesOrBuilder(
         int index) {
@@ -1572,11 +1572,11 @@ public final class WALProtos {
       return followingKvCount_;
     }
 
-    // repeated .UUID cluster_ids = 8;
+    // repeated .hbase.pb.UUID cluster_ids = 8;
     public static final int CLUSTER_IDS_FIELD_NUMBER = 8;
     private java.util.List clusterIds_;
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1588,7 +1588,7 @@ public final class WALProtos {
       return clusterIds_;
     }
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1601,7 +1601,7 @@ public final class WALProtos {
       return clusterIds_;
     }
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1613,7 +1613,7 @@ public final class WALProtos {
       return clusterIds_.size();
     }
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -1625,7 +1625,7 @@ public final class WALProtos {
       return clusterIds_.get(index);
     }
     /**
-     * repeated .UUID cluster_ids = 8;
+     * repeated .hbase.pb.UUID cluster_ids = 8;
      *
      * 
      *
@@ -2032,7 +2032,7 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WALKey}
+     * Protobuf type {@code hbase.pb.WALKey}
      *
      * 
      *
@@ -2045,12 +2045,12 @@ public final class WALProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKeyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALKey_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALKey_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALKey_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey.Builder.class);
       }
@@ -2121,7 +2121,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALKey_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALKey_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey getDefaultInstanceForType() {
@@ -2492,12 +2492,12 @@ public final class WALProtos {
         return this;
       }
 
-      // optional .UUID cluster_id = 5 [deprecated = true];
+      // optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID clusterId_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUIDOrBuilder> clusterIdBuilder_;
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2511,7 +2511,7 @@ public final class WALProtos {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2529,7 +2529,7 @@ public final class WALProtos {
         }
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2553,7 +2553,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2575,7 +2575,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2602,7 +2602,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2623,7 +2623,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2639,7 +2639,7 @@ public final class WALProtos {
         return getClusterIdFieldBuilder().getBuilder();
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2657,7 +2657,7 @@ public final class WALProtos {
         }
       }
       /**
-       * optional .UUID cluster_id = 5 [deprecated = true];
+       * optional .hbase.pb.UUID cluster_id = 5 [deprecated = true];
        *
        * 
        *
@@ -2681,7 +2681,7 @@ public final class WALProtos {
         return clusterIdBuilder_;
       }
 
-      // repeated .FamilyScope scopes = 6;
+      // repeated .hbase.pb.FamilyScope scopes = 6;
       private java.util.List scopes_ =
         java.util.Collections.emptyList();
       private void ensureScopesIsMutable() {
@@ -2695,7 +2695,7 @@ public final class WALProtos {
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScopeOrBuilder> scopesBuilder_;
 
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public java.util.List getScopesList() {
         if (scopesBuilder_ == null) {
@@ -2705,7 +2705,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public int getScopesCount() {
         if (scopesBuilder_ == null) {
@@ -2715,7 +2715,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope getScopes(int index) {
         if (scopesBuilder_ == null) {
@@ -2725,7 +2725,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder setScopes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope value) {
@@ -2742,7 +2742,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder setScopes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder builderForValue) {
@@ -2756,7 +2756,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder addScopes(org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope value) {
         if (scopesBuilder_ == null) {
@@ -2772,7 +2772,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder addScopes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope value) {
@@ -2789,7 +2789,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder addScopes(
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder builderForValue) {
@@ -2803,7 +2803,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder addScopes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder builderForValue) {
@@ -2817,7 +2817,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder addAllScopes(
           java.lang.Iterable values) {
@@ -2831,7 +2831,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder clearScopes() {
         if (scopesBuilder_ == null) {
@@ -2844,7 +2844,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public Builder removeScopes(int index) {
         if (scopesBuilder_ == null) {
@@ -2857,14 +2857,14 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder getScopesBuilder(
           int index) {
         return getScopesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScopeOrBuilder getScopesOrBuilder(
           int index) {
@@ -2874,7 +2874,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public java.util.List 
            getScopesOrBuilderList() {
@@ -2885,14 +2885,14 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder addScopesBuilder() {
         return getScopesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.getDefaultInstance());
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder addScopesBuilder(
           int index) {
@@ -2900,7 +2900,7 @@ public final class WALProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.getDefaultInstance());
       }
       /**
-       * repeated .FamilyScope scopes = 6;
+       * repeated .hbase.pb.FamilyScope scopes = 6;
        */
       public java.util.List 
            getScopesBuilderList() {
@@ -2954,7 +2954,7 @@ public final class WALProtos {
         return this;
       }
 
-      // repeated .UUID cluster_ids = 8;
+      // repeated .hbase.pb.UUID cluster_ids = 8;
       private java.util.List clusterIds_ =
         java.util.Collections.emptyList();
       private void ensureClusterIdsIsMutable() {
@@ -2968,7 +2968,7 @@ public final class WALProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUIDOrBuilder> clusterIdsBuilder_;
 
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -2984,7 +2984,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3000,7 +3000,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3016,7 +3016,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3039,7 +3039,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3059,7 +3059,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3081,7 +3081,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3104,7 +3104,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3124,7 +3124,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3144,7 +3144,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3164,7 +3164,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3183,7 +3183,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3202,7 +3202,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3215,7 +3215,7 @@ public final class WALProtos {
         return getClusterIdsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3231,7 +3231,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3248,7 +3248,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3261,7 +3261,7 @@ public final class WALProtos {
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.getDefaultInstance());
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3275,7 +3275,7 @@ public final class WALProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.UUID.getDefaultInstance());
       }
       /**
-       * repeated .UUID cluster_ids = 8;
+       * repeated .hbase.pb.UUID cluster_ids = 8;
        *
        * 
        *
@@ -3401,7 +3401,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WALKey)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WALKey)
     }
 
     static {
@@ -3409,7 +3409,7 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WALKey)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WALKey)
   }
 
   public interface FamilyScopeOrBuilder
@@ -3425,18 +3425,18 @@ public final class WALProtos {
      */
     com.google.protobuf.ByteString getFamily();
 
-    // required .ScopeType scope_type = 2;
+    // required .hbase.pb.ScopeType scope_type = 2;
     /**
-     * required .ScopeType scope_type = 2;
+     * required .hbase.pb.ScopeType scope_type = 2;
      */
     boolean hasScopeType();
     /**
-     * required .ScopeType scope_type = 2;
+     * required .hbase.pb.ScopeType scope_type = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType getScopeType();
   }
   /**
-   * Protobuf type {@code FamilyScope}
+   * Protobuf type {@code hbase.pb.FamilyScope}
    */
   public static final class FamilyScope extends
       com.google.protobuf.GeneratedMessage
@@ -3516,12 +3516,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FamilyScope_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FamilyScope_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FamilyScope_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FamilyScope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder.class);
     }
@@ -3558,17 +3558,17 @@ public final class WALProtos {
       return family_;
     }
 
-    // required .ScopeType scope_type = 2;
+    // required .hbase.pb.ScopeType scope_type = 2;
     public static final int SCOPE_TYPE_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType scopeType_;
     /**
-     * required .ScopeType scope_type = 2;
+     * required .hbase.pb.ScopeType scope_type = 2;
      */
     public boolean hasScopeType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .ScopeType scope_type = 2;
+     * required .hbase.pb.ScopeType scope_type = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType getScopeType() {
       return scopeType_;
@@ -3747,19 +3747,19 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FamilyScope}
+     * Protobuf type {@code hbase.pb.FamilyScope}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScopeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FamilyScope_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FamilyScope_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FamilyScope_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FamilyScope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope.Builder.class);
       }
@@ -3797,7 +3797,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FamilyScope_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FamilyScope_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FamilyScope getDefaultInstanceForType() {
@@ -3917,22 +3917,22 @@ public final class WALProtos {
         return this;
       }
 
-      // required .ScopeType scope_type = 2;
+      // required .hbase.pb.ScopeType scope_type = 2;
       private org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType scopeType_ = org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType.REPLICATION_SCOPE_LOCAL;
       /**
-       * required .ScopeType scope_type = 2;
+       * required .hbase.pb.ScopeType scope_type = 2;
        */
       public boolean hasScopeType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .ScopeType scope_type = 2;
+       * required .hbase.pb.ScopeType scope_type = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType getScopeType() {
         return scopeType_;
       }
       /**
-       * required .ScopeType scope_type = 2;
+       * required .hbase.pb.ScopeType scope_type = 2;
        */
       public Builder setScopeType(org.apache.hadoop.hbase.protobuf.generated.WALProtos.ScopeType value) {
         if (value == null) {
@@ -3944,7 +3944,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .ScopeType scope_type = 2;
+       * required .hbase.pb.ScopeType scope_type = 2;
        */
       public Builder clearScopeType() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -3953,7 +3953,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FamilyScope)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FamilyScope)
     }
 
     static {
@@ -3961,7 +3961,7 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FamilyScope)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FamilyScope)
   }
 
   public interface CompactionDescriptorOrBuilder
@@ -4107,7 +4107,7 @@ public final class WALProtos {
     com.google.protobuf.ByteString getRegionName();
   }
   /**
-   * Protobuf type {@code CompactionDescriptor}
+   * Protobuf type {@code hbase.pb.CompactionDescriptor}
    *
    * 
    **
@@ -4226,12 +4226,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_CompactionDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_CompactionDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_CompactionDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_CompactionDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor.Builder.class);
     }
@@ -4733,7 +4733,7 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code CompactionDescriptor}
+     * Protobuf type {@code hbase.pb.CompactionDescriptor}
      *
      * 
      **
@@ -4748,12 +4748,12 @@ public final class WALProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_CompactionDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_CompactionDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_CompactionDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_CompactionDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor.Builder.class);
       }
@@ -4801,7 +4801,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_CompactionDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_CompactionDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor getDefaultInstanceForType() {
@@ -5444,7 +5444,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:CompactionDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.CompactionDescriptor)
     }
 
     static {
@@ -5452,19 +5452,19 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:CompactionDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.CompactionDescriptor)
   }
 
   public interface FlushDescriptorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .FlushDescriptor.FlushAction action = 1;
+    // required .hbase.pb.FlushDescriptor.FlushAction action = 1;
     /**
-     * required .FlushDescriptor.FlushAction action = 1;
+     * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
      */
     boolean hasAction();
     /**
-     * required .FlushDescriptor.FlushAction action = 1;
+     * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction getAction();
 
@@ -5498,27 +5498,27 @@ public final class WALProtos {
      */
     long getFlushSequenceNumber();
 
-    // repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+    // repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     java.util.List 
         getStoreFlushesList();
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor getStoreFlushes(int index);
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     int getStoreFlushesCount();
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     java.util.List 
         getStoreFlushesOrBuilderList();
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptorOrBuilder getStoreFlushesOrBuilder(
         int index);
@@ -5542,7 +5542,7 @@ public final class WALProtos {
     com.google.protobuf.ByteString getRegionName();
   }
   /**
-   * Protobuf type {@code FlushDescriptor}
+   * Protobuf type {@code hbase.pb.FlushDescriptor}
    *
    * 
    **
@@ -5653,12 +5653,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.Builder.class);
     }
@@ -5679,7 +5679,7 @@ public final class WALProtos {
     }
 
     /**
-     * Protobuf enum {@code FlushDescriptor.FlushAction}
+     * Protobuf enum {@code hbase.pb.FlushDescriptor.FlushAction}
      */
     public enum FlushAction
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -5783,7 +5783,7 @@ public final class WALProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:FlushDescriptor.FlushAction)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.FlushDescriptor.FlushAction)
     }
 
     public interface StoreFlushDescriptorOrBuilder
@@ -5863,7 +5863,7 @@ public final class WALProtos {
           getFlushOutputBytes(int index);
     }
     /**
-     * Protobuf type {@code FlushDescriptor.StoreFlushDescriptor}
+     * Protobuf type {@code hbase.pb.FlushDescriptor.StoreFlushDescriptor}
      */
     public static final class StoreFlushDescriptor extends
         com.google.protobuf.GeneratedMessage
@@ -5948,12 +5948,12 @@ public final class WALProtos {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_StoreFlushDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder.class);
       }
@@ -6283,19 +6283,19 @@ public final class WALProtos {
         return builder;
       }
       /**
-       * Protobuf type {@code FlushDescriptor.StoreFlushDescriptor}
+       * Protobuf type {@code hbase.pb.FlushDescriptor.StoreFlushDescriptor}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
          implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptorOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_StoreFlushDescriptor_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable
+          return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
                   org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder.class);
         }
@@ -6335,7 +6335,7 @@ public final class WALProtos {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_StoreFlushDescriptor_descriptor;
+          return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_descriptor;
         }
 
         public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor getDefaultInstanceForType() {
@@ -6700,7 +6700,7 @@ public final class WALProtos {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:FlushDescriptor.StoreFlushDescriptor)
+        // @@protoc_insertion_point(builder_scope:hbase.pb.FlushDescriptor.StoreFlushDescriptor)
       }
 
       static {
@@ -6708,21 +6708,21 @@ public final class WALProtos {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:FlushDescriptor.StoreFlushDescriptor)
+      // @@protoc_insertion_point(class_scope:hbase.pb.FlushDescriptor.StoreFlushDescriptor)
     }
 
     private int bitField0_;
-    // required .FlushDescriptor.FlushAction action = 1;
+    // required .hbase.pb.FlushDescriptor.FlushAction action = 1;
     public static final int ACTION_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction action_;
     /**
-     * required .FlushDescriptor.FlushAction action = 1;
+     * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
      */
     public boolean hasAction() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .FlushDescriptor.FlushAction action = 1;
+     * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction getAction() {
       return action_;
@@ -6776,36 +6776,36 @@ public final class WALProtos {
       return flushSequenceNumber_;
     }
 
-    // repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+    // repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
     public static final int STORE_FLUSHES_FIELD_NUMBER = 5;
     private java.util.List storeFlushes_;
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     public java.util.List getStoreFlushesList() {
       return storeFlushes_;
     }
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     public java.util.List 
         getStoreFlushesOrBuilderList() {
       return storeFlushes_;
     }
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     public int getStoreFlushesCount() {
       return storeFlushes_.size();
     }
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor getStoreFlushes(int index) {
       return storeFlushes_.get(index);
     }
     /**
-     * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+     * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptorOrBuilder getStoreFlushesOrBuilder(
         int index) {
@@ -7084,7 +7084,7 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code FlushDescriptor}
+     * Protobuf type {@code hbase.pb.FlushDescriptor}
      *
      * 
      **
@@ -7096,12 +7096,12 @@ public final class WALProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.Builder.class);
       }
@@ -7152,7 +7152,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_FlushDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_FlushDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor getDefaultInstanceForType() {
@@ -7302,22 +7302,22 @@ public final class WALProtos {
       }
       private int bitField0_;
 
-      // required .FlushDescriptor.FlushAction action = 1;
+      // required .hbase.pb.FlushDescriptor.FlushAction action = 1;
       private org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction action_ = org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction.START_FLUSH;
       /**
-       * required .FlushDescriptor.FlushAction action = 1;
+       * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
        */
       public boolean hasAction() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .FlushDescriptor.FlushAction action = 1;
+       * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction getAction() {
         return action_;
       }
       /**
-       * required .FlushDescriptor.FlushAction action = 1;
+       * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
        */
       public Builder setAction(org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.FlushAction value) {
         if (value == null) {
@@ -7329,7 +7329,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .FlushDescriptor.FlushAction action = 1;
+       * required .hbase.pb.FlushDescriptor.FlushAction action = 1;
        */
       public Builder clearAction() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -7443,7 +7443,7 @@ public final class WALProtos {
         return this;
       }
 
-      // repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+      // repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
       private java.util.List storeFlushes_ =
         java.util.Collections.emptyList();
       private void ensureStoreFlushesIsMutable() {
@@ -7457,7 +7457,7 @@ public final class WALProtos {
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptorOrBuilder> storeFlushesBuilder_;
 
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public java.util.List getStoreFlushesList() {
         if (storeFlushesBuilder_ == null) {
@@ -7467,7 +7467,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public int getStoreFlushesCount() {
         if (storeFlushesBuilder_ == null) {
@@ -7477,7 +7477,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor getStoreFlushes(int index) {
         if (storeFlushesBuilder_ == null) {
@@ -7487,7 +7487,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder setStoreFlushes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor value) {
@@ -7504,7 +7504,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder setStoreFlushes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder builderForValue) {
@@ -7518,7 +7518,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder addStoreFlushes(org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor value) {
         if (storeFlushesBuilder_ == null) {
@@ -7534,7 +7534,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder addStoreFlushes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor value) {
@@ -7551,7 +7551,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder addStoreFlushes(
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder builderForValue) {
@@ -7565,7 +7565,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder addStoreFlushes(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder builderForValue) {
@@ -7579,7 +7579,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder addAllStoreFlushes(
           java.lang.Iterable values) {
@@ -7593,7 +7593,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder clearStoreFlushes() {
         if (storeFlushesBuilder_ == null) {
@@ -7606,7 +7606,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public Builder removeStoreFlushes(int index) {
         if (storeFlushesBuilder_ == null) {
@@ -7619,14 +7619,14 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder getStoreFlushesBuilder(
           int index) {
         return getStoreFlushesFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptorOrBuilder getStoreFlushesOrBuilder(
           int index) {
@@ -7636,7 +7636,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public java.util.List 
            getStoreFlushesOrBuilderList() {
@@ -7647,14 +7647,14 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder addStoreFlushesBuilder() {
         return getStoreFlushesFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.Builder addStoreFlushesBuilder(
           int index) {
@@ -7662,7 +7662,7 @@ public final class WALProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.FlushDescriptor.StoreFlushDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
+       * repeated .hbase.pb.FlushDescriptor.StoreFlushDescriptor store_flushes = 5;
        */
       public java.util.List 
            getStoreFlushesBuilderList() {
@@ -7735,7 +7735,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:FlushDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.FlushDescriptor)
     }
 
     static {
@@ -7743,7 +7743,7 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:FlushDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.FlushDescriptor)
   }
 
   public interface StoreDescriptorOrBuilder
@@ -7823,7 +7823,7 @@ public final class WALProtos {
         getStoreFileBytes(int index);
   }
   /**
-   * Protobuf type {@code StoreDescriptor}
+   * Protobuf type {@code hbase.pb.StoreDescriptor}
    */
   public static final class StoreDescriptor extends
       com.google.protobuf.GeneratedMessage
@@ -7908,12 +7908,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_StoreDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_StoreDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_StoreDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_StoreDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder.class);
     }
@@ -8243,19 +8243,19 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code StoreDescriptor}
+     * Protobuf type {@code hbase.pb.StoreDescriptor}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_StoreDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_StoreDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_StoreDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_StoreDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder.class);
       }
@@ -8295,7 +8295,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_StoreDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_StoreDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getDefaultInstanceForType() {
@@ -8660,7 +8660,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:StoreDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.StoreDescriptor)
     }
 
     static {
@@ -8668,23 +8668,23 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:StoreDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.StoreDescriptor)
   }
 
   public interface BulkLoadDescriptorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .TableName table_name = 1;
+    // required .hbase.pb.TableName table_name = 1;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
@@ -8698,27 +8698,27 @@ public final class WALProtos {
      */
     com.google.protobuf.ByteString getEncodedRegionName();
 
-    // repeated .StoreDescriptor stores = 3;
+    // repeated .hbase.pb.StoreDescriptor stores = 3;
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     java.util.List 
         getStoresList();
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getStores(int index);
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     int getStoresCount();
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     java.util.List 
         getStoresOrBuilderList();
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder getStoresOrBuilder(
         int index);
@@ -8734,7 +8734,7 @@ public final class WALProtos {
     long getBulkloadSeqNum();
   }
   /**
-   * Protobuf type {@code BulkLoadDescriptor}
+   * Protobuf type {@code hbase.pb.BulkLoadDescriptor}
    *
    * 
    **
@@ -8837,12 +8837,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_BulkLoadDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_BulkLoadDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_BulkLoadDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_BulkLoadDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor.Builder.class);
     }
@@ -8863,23 +8863,23 @@ public final class WALProtos {
     }
 
     private int bitField0_;
-    // required .TableName table_name = 1;
+    // 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_;
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * required .TableName table_name = 1;
+     * required .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
@@ -8901,36 +8901,36 @@ public final class WALProtos {
       return encodedRegionName_;
     }
 
-    // repeated .StoreDescriptor stores = 3;
+    // repeated .hbase.pb.StoreDescriptor stores = 3;
     public static final int STORES_FIELD_NUMBER = 3;
     private java.util.List stores_;
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     public java.util.List getStoresList() {
       return stores_;
     }
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     public java.util.List 
         getStoresOrBuilderList() {
       return stores_;
     }
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     public int getStoresCount() {
       return stores_.size();
     }
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getStores(int index) {
       return stores_.get(index);
     }
     /**
-     * repeated .StoreDescriptor stores = 3;
+     * repeated .hbase.pb.StoreDescriptor stores = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder getStoresOrBuilder(
         int index) {
@@ -9171,7 +9171,7 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code BulkLoadDescriptor}
+     * Protobuf type {@code hbase.pb.BulkLoadDescriptor}
      *
      * 
      **
@@ -9183,12 +9183,12 @@ public final class WALProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_BulkLoadDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_BulkLoadDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_BulkLoadDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_BulkLoadDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor.Builder.class);
       }
@@ -9240,7 +9240,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_BulkLoadDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_BulkLoadDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor getDefaultInstanceForType() {
@@ -9384,18 +9384,18 @@ public final class WALProtos {
       }
       private int bitField0_;
 
-      // required .TableName table_name = 1;
+      // 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 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_;
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -9405,7 +9405,7 @@ public final class WALProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -9421,7 +9421,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -9435,7 +9435,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -9454,7 +9454,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -9467,7 +9467,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -9475,7 +9475,7 @@ public final class WALProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -9485,7 +9485,7 @@ public final class WALProtos {
         }
       }
       /**
-       * required .TableName table_name = 1;
+       * required .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -9537,7 +9537,7 @@ public final class WALProtos {
         return this;
       }
 
-      // repeated .StoreDescriptor stores = 3;
+      // repeated .hbase.pb.StoreDescriptor stores = 3;
       private java.util.List stores_ =
         java.util.Collections.emptyList();
       private void ensureStoresIsMutable() {
@@ -9551,7 +9551,7 @@ public final class WALProtos {
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder> storesBuilder_;
 
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public java.util.List getStoresList() {
         if (storesBuilder_ == null) {
@@ -9561,7 +9561,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public int getStoresCount() {
         if (storesBuilder_ == null) {
@@ -9571,7 +9571,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getStores(int index) {
         if (storesBuilder_ == null) {
@@ -9581,7 +9581,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder setStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor value) {
@@ -9598,7 +9598,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder setStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder builderForValue) {
@@ -9612,7 +9612,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder addStores(org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor value) {
         if (storesBuilder_ == null) {
@@ -9628,7 +9628,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder addStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor value) {
@@ -9645,7 +9645,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder addStores(
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder builderForValue) {
@@ -9659,7 +9659,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder addStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder builderForValue) {
@@ -9673,7 +9673,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder addAllStores(
           java.lang.Iterable values) {
@@ -9687,7 +9687,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder clearStores() {
         if (storesBuilder_ == null) {
@@ -9700,7 +9700,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public Builder removeStores(int index) {
         if (storesBuilder_ == null) {
@@ -9713,14 +9713,14 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder getStoresBuilder(
           int index) {
         return getStoresFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder getStoresOrBuilder(
           int index) {
@@ -9730,7 +9730,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public java.util.List 
            getStoresOrBuilderList() {
@@ -9741,14 +9741,14 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder addStoresBuilder() {
         return getStoresFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder addStoresBuilder(
           int index) {
@@ -9756,7 +9756,7 @@ public final class WALProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .StoreDescriptor stores = 3;
+       * repeated .hbase.pb.StoreDescriptor stores = 3;
        */
       public java.util.List 
            getStoresBuilderList() {
@@ -9810,7 +9810,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:BulkLoadDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.BulkLoadDescriptor)
     }
 
     static {
@@ -9818,19 +9818,19 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:BulkLoadDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.BulkLoadDescriptor)
   }
 
   public interface RegionEventDescriptorOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .RegionEventDescriptor.EventType event_type = 1;
+    // required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
     /**
-     * required .RegionEventDescriptor.EventType event_type = 1;
+     * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
      */
     boolean hasEventType();
     /**
-     * required .RegionEventDescriptor.EventType event_type = 1;
+     * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType getEventType();
 
@@ -9864,34 +9864,34 @@ public final class WALProtos {
      */
     long getLogSequenceNumber();
 
-    // repeated .StoreDescriptor stores = 5;
+    // repeated .hbase.pb.StoreDescriptor stores = 5;
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     java.util.List 
         getStoresList();
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getStores(int index);
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     int getStoresCount();
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     java.util.List 
         getStoresOrBuilderList();
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder getStoresOrBuilder(
         int index);
 
-    // optional .ServerName server = 6;
+    // optional .hbase.pb.ServerName server = 6;
     /**
-     * optional .ServerName server = 6;
+     * optional .hbase.pb.ServerName server = 6;
      *
      * 
      * Server who opened the region
@@ -9899,7 +9899,7 @@ public final class WALProtos {
      */
     boolean hasServer();
     /**
-     * optional .ServerName server = 6;
+     * optional .hbase.pb.ServerName server = 6;
      *
      * 
      * Server who opened the region
@@ -9907,7 +9907,7 @@ public final class WALProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer();
     /**
-     * optional .ServerName server = 6;
+     * optional .hbase.pb.ServerName server = 6;
      *
      * 
      * Server who opened the region
@@ -9934,7 +9934,7 @@ public final class WALProtos {
     com.google.protobuf.ByteString getRegionName();
   }
   /**
-   * Protobuf type {@code RegionEventDescriptor}
+   * Protobuf type {@code hbase.pb.RegionEventDescriptor}
    *
    * 
    **
@@ -10058,12 +10058,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_RegionEventDescriptor_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_RegionEventDescriptor_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_RegionEventDescriptor_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_RegionEventDescriptor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.Builder.class);
     }
@@ -10084,7 +10084,7 @@ public final class WALProtos {
     }
 
     /**
-     * Protobuf enum {@code RegionEventDescriptor.EventType}
+     * Protobuf enum {@code hbase.pb.RegionEventDescriptor.EventType}
      */
     public enum EventType
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -10162,21 +10162,21 @@ public final class WALProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:RegionEventDescriptor.EventType)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.RegionEventDescriptor.EventType)
     }
 
     private int bitField0_;
-    // required .RegionEventDescriptor.EventType event_type = 1;
+    // required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
     public static final int EVENT_TYPE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType eventType_;
     /**
-     * required .RegionEventDescriptor.EventType event_type = 1;
+     * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
      */
     public boolean hasEventType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .RegionEventDescriptor.EventType event_type = 1;
+     * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType getEventType() {
       return eventType_;
@@ -10230,47 +10230,47 @@ public final class WALProtos {
       return logSequenceNumber_;
     }
 
-    // repeated .StoreDescriptor stores = 5;
+    // repeated .hbase.pb.StoreDescriptor stores = 5;
     public static final int STORES_FIELD_NUMBER = 5;
     private java.util.List stores_;
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     public java.util.List getStoresList() {
       return stores_;
     }
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     public java.util.List 
         getStoresOrBuilderList() {
       return stores_;
     }
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     public int getStoresCount() {
       return stores_.size();
     }
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getStores(int index) {
       return stores_.get(index);
     }
     /**
-     * repeated .StoreDescriptor stores = 5;
+     * repeated .hbase.pb.StoreDescriptor stores = 5;
      */
     public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder getStoresOrBuilder(
         int index) {
       return stores_.get(index);
     }
 
-    // optional .ServerName server = 6;
+    // optional .hbase.pb.ServerName server = 6;
     public static final int SERVER_FIELD_NUMBER = 6;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_;
     /**
-     * optional .ServerName server = 6;
+     * optional .hbase.pb.ServerName server = 6;
      *
      * 
      * Server who opened the region
@@ -10280,7 +10280,7 @@ public final class WALProtos {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .ServerName server = 6;
+     * optional .hbase.pb.ServerName server = 6;
      *
      * 
      * Server who opened the region
@@ -10290,7 +10290,7 @@ public final class WALProtos {
       return server_;
     }
     /**
-     * optional .ServerName server = 6;
+     * optional .hbase.pb.ServerName server = 6;
      *
      * 
      * Server who opened the region
@@ -10595,7 +10595,7 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code RegionEventDescriptor}
+     * Protobuf type {@code hbase.pb.RegionEventDescriptor}
      *
      * 
      **
@@ -10607,12 +10607,12 @@ public final class WALProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_RegionEventDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_RegionEventDescriptor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_RegionEventDescriptor_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_RegionEventDescriptor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.Builder.class);
       }
@@ -10670,7 +10670,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_RegionEventDescriptor_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_RegionEventDescriptor_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor getDefaultInstanceForType() {
@@ -10837,22 +10837,22 @@ public final class WALProtos {
       }
       private int bitField0_;
 
-      // required .RegionEventDescriptor.EventType event_type = 1;
+      // required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
       private org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType eventType_ = org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType.REGION_OPEN;
       /**
-       * required .RegionEventDescriptor.EventType event_type = 1;
+       * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
        */
       public boolean hasEventType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .RegionEventDescriptor.EventType event_type = 1;
+       * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType getEventType() {
         return eventType_;
       }
       /**
-       * required .RegionEventDescriptor.EventType event_type = 1;
+       * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
        */
       public Builder setEventType(org.apache.hadoop.hbase.protobuf.generated.WALProtos.RegionEventDescriptor.EventType value) {
         if (value == null) {
@@ -10864,7 +10864,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * required .RegionEventDescriptor.EventType event_type = 1;
+       * required .hbase.pb.RegionEventDescriptor.EventType event_type = 1;
        */
       public Builder clearEventType() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -10978,7 +10978,7 @@ public final class WALProtos {
         return this;
       }
 
-      // repeated .StoreDescriptor stores = 5;
+      // repeated .hbase.pb.StoreDescriptor stores = 5;
       private java.util.List stores_ =
         java.util.Collections.emptyList();
       private void ensureStoresIsMutable() {
@@ -10992,7 +10992,7 @@ public final class WALProtos {
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder> storesBuilder_;
 
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public java.util.List getStoresList() {
         if (storesBuilder_ == null) {
@@ -11002,7 +11002,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public int getStoresCount() {
         if (storesBuilder_ == null) {
@@ -11012,7 +11012,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor getStores(int index) {
         if (storesBuilder_ == null) {
@@ -11022,7 +11022,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder setStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor value) {
@@ -11039,7 +11039,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder setStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder builderForValue) {
@@ -11053,7 +11053,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder addStores(org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor value) {
         if (storesBuilder_ == null) {
@@ -11069,7 +11069,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder addStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor value) {
@@ -11086,7 +11086,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder addStores(
           org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder builderForValue) {
@@ -11100,7 +11100,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder addStores(
           int index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder builderForValue) {
@@ -11114,7 +11114,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder addAllStores(
           java.lang.Iterable values) {
@@ -11128,7 +11128,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder clearStores() {
         if (storesBuilder_ == null) {
@@ -11141,7 +11141,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public Builder removeStores(int index) {
         if (storesBuilder_ == null) {
@@ -11154,14 +11154,14 @@ public final class WALProtos {
         return this;
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder getStoresBuilder(
           int index) {
         return getStoresFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptorOrBuilder getStoresOrBuilder(
           int index) {
@@ -11171,7 +11171,7 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public java.util.List 
            getStoresOrBuilderList() {
@@ -11182,14 +11182,14 @@ public final class WALProtos {
         }
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder addStoresBuilder() {
         return getStoresFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.Builder addStoresBuilder(
           int index) {
@@ -11197,7 +11197,7 @@ public final class WALProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor.getDefaultInstance());
       }
       /**
-       * repeated .StoreDescriptor stores = 5;
+       * repeated .hbase.pb.StoreDescriptor stores = 5;
        */
       public java.util.List 
            getStoresBuilderList() {
@@ -11218,12 +11218,12 @@ public final class WALProtos {
         return storesBuilder_;
       }
 
-      // optional .ServerName server = 6;
+      // optional .hbase.pb.ServerName server = 6;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_;
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11233,7 +11233,7 @@ public final class WALProtos {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11247,7 +11247,7 @@ public final class WALProtos {
         }
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11267,7 +11267,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11285,7 +11285,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11308,7 +11308,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11325,7 +11325,7 @@ public final class WALProtos {
         return this;
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11337,7 +11337,7 @@ public final class WALProtos {
         return getServerFieldBuilder().getBuilder();
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11351,7 +11351,7 @@ public final class WALProtos {
         }
       }
       /**
-       * optional .ServerName server = 6;
+       * optional .hbase.pb.ServerName server = 6;
        *
        * 
        * Server who opened the region
@@ -11423,7 +11423,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:RegionEventDescriptor)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.RegionEventDescriptor)
     }
 
     static {
@@ -11431,14 +11431,14 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:RegionEventDescriptor)
+    // @@protoc_insertion_point(class_scope:hbase.pb.RegionEventDescriptor)
   }
 
   public interface WALTrailerOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * Protobuf type {@code WALTrailer}
+   * Protobuf type {@code hbase.pb.WALTrailer}
    *
    * 
    **
@@ -11509,12 +11509,12 @@ public final class WALProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALTrailer_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALTrailer_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALTrailer_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALTrailer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALTrailer.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALTrailer.Builder.class);
     }
@@ -11665,7 +11665,7 @@ public final class WALProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code WALTrailer}
+     * Protobuf type {@code hbase.pb.WALTrailer}
      *
      * 
      **
@@ -11680,12 +11680,12 @@ public final class WALProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALTrailerOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALTrailer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALTrailer_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALTrailer_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALTrailer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALTrailer.class, org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALTrailer.Builder.class);
       }
@@ -11719,7 +11719,7 @@ public final class WALProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_WALTrailer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.WALProtos.internal_static_hbase_pb_WALTrailer_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALTrailer getDefaultInstanceForType() {
@@ -11777,7 +11777,7 @@ public final class WALProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:WALTrailer)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.WALTrailer)
     }
 
     static {
@@ -11785,59 +11785,59 @@ public final class WALProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:WALTrailer)
+    // @@protoc_insertion_point(class_scope:hbase.pb.WALTrailer)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WALHeader_descriptor;
+    internal_static_hbase_pb_WALHeader_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WALHeader_fieldAccessorTable;
+      internal_static_hbase_pb_WALHeader_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WALKey_descriptor;
+    internal_static_hbase_pb_WALKey_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WALKey_fieldAccessorTable;
+      internal_static_hbase_pb_WALKey_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FamilyScope_descriptor;
+    internal_static_hbase_pb_FamilyScope_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FamilyScope_fieldAccessorTable;
+      internal_static_hbase_pb_FamilyScope_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_CompactionDescriptor_descriptor;
+    internal_static_hbase_pb_CompactionDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_CompactionDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_CompactionDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FlushDescriptor_descriptor;
+    internal_static_hbase_pb_FlushDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FlushDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_FlushDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_FlushDescriptor_StoreFlushDescriptor_descriptor;
+    internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_StoreDescriptor_descriptor;
+    internal_static_hbase_pb_StoreDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_StoreDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_StoreDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_BulkLoadDescriptor_descriptor;
+    internal_static_hbase_pb_BulkLoadDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_BulkLoadDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_BulkLoadDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RegionEventDescriptor_descriptor;
+    internal_static_hbase_pb_RegionEventDescriptor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RegionEventDescriptor_fieldAccessorTable;
+      internal_static_hbase_pb_RegionEventDescriptor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_WALTrailer_descriptor;
+    internal_static_hbase_pb_WALTrailer_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_WALTrailer_fieldAccessorTable;
+      internal_static_hbase_pb_WALTrailer_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -11847,117 +11847,119 @@ public final class WALProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\tWAL.proto\032\013HBase.proto\032\014Client.proto\"\217" +
-      "\001\n\tWALHeader\022\027\n\017has_compression\030\001 \001(\010\022\026\n" +
-      "\016encryption_key\030\002 \001(\014\022\033\n\023has_tag_compres" +
-      "sion\030\003 \001(\010\022\027\n\017writer_cls_name\030\004 \001(\t\022\033\n\023c" +
-      "ell_codec_cls_name\030\005 \001(\t\"\240\002\n\006WALKey\022\033\n\023e" +
-      "ncoded_region_name\030\001 \002(\014\022\022\n\ntable_name\030\002" +
-      " \002(\014\022\033\n\023log_sequence_number\030\003 \002(\004\022\022\n\nwri" +
-      "te_time\030\004 \002(\004\022\035\n\ncluster_id\030\005 \001(\0132\005.UUID" +
-      "B\002\030\001\022\034\n\006scopes\030\006 \003(\0132\014.FamilyScope\022\032\n\022fo" +
-      "llowing_kv_count\030\007 \001(\r\022\032\n\013cluster_ids\030\010 ",
-      "\003(\0132\005.UUID\022\022\n\nnonceGroup\030\t \001(\004\022\r\n\005nonce\030" +
-      "\n \001(\004\022\034\n\024orig_sequence_number\030\013 \001(\004\"=\n\013F" +
-      "amilyScope\022\016\n\006family\030\001 \002(\014\022\036\n\nscope_type" +
-      "\030\002 \002(\0162\n.ScopeType\"\276\001\n\024CompactionDescrip" +
-      "tor\022\022\n\ntable_name\030\001 \002(\014\022\033\n\023encoded_regio" +
-      "n_name\030\002 \002(\014\022\023\n\013family_name\030\003 \002(\014\022\030\n\020com" +
-      "paction_input\030\004 \003(\t\022\031\n\021compaction_output" +
-      "\030\005 \003(\t\022\026\n\016store_home_dir\030\006 \002(\t\022\023\n\013region" +
-      "_name\030\007 \001(\014\"\222\003\n\017FlushDescriptor\022,\n\006actio" +
-      "n\030\001 \002(\0162\034.FlushDescriptor.FlushAction\022\022\n",
-      "\ntable_name\030\002 \002(\014\022\033\n\023encoded_region_name" +
-      "\030\003 \002(\014\022\035\n\025flush_sequence_number\030\004 \001(\004\022<\n" +
-      "\rstore_flushes\030\005 \003(\0132%.FlushDescriptor.S" +
-      "toreFlushDescriptor\022\023\n\013region_name\030\006 \001(\014" +
-      "\032Y\n\024StoreFlushDescriptor\022\023\n\013family_name\030" +
-      "\001 \002(\014\022\026\n\016store_home_dir\030\002 \002(\t\022\024\n\014flush_o" +
-      "utput\030\003 \003(\t\"S\n\013FlushAction\022\017\n\013START_FLUS" +
-      "H\020\000\022\020\n\014COMMIT_FLUSH\020\001\022\017\n\013ABORT_FLUSH\020\002\022\020" +
-      "\n\014CANNOT_FLUSH\020\003\"R\n\017StoreDescriptor\022\023\n\013f" +
-      "amily_name\030\001 \002(\014\022\026\n\016store_home_dir\030\002 \002(\t",
-      "\022\022\n\nstore_file\030\003 \003(\t\"\215\001\n\022BulkLoadDescrip" +
-      "tor\022\036\n\ntable_name\030\001 \002(\0132\n.TableName\022\033\n\023e" +
-      "ncoded_region_name\030\002 \002(\014\022 \n\006stores\030\003 \003(\013" +
-      "2\020.StoreDescriptor\022\030\n\020bulkload_seq_num\030\004" +
-      " \002(\003\"\237\002\n\025RegionEventDescriptor\0224\n\nevent_" +
-      "type\030\001 \002(\0162 .RegionEventDescriptor.Event" +
-      "Type\022\022\n\ntable_name\030\002 \002(\014\022\033\n\023encoded_regi" +
-      "on_name\030\003 \002(\014\022\033\n\023log_sequence_number\030\004 \001" +
-      "(\004\022 \n\006stores\030\005 \003(\0132\020.StoreDescriptor\022\033\n\006" +
-      "server\030\006 \001(\0132\013.ServerName\022\023\n\013region_name",
-      "\030\007 \001(\014\".\n\tEventType\022\017\n\013REGION_OPEN\020\000\022\020\n\014" +
-      "REGION_CLOSE\020\001\"\014\n\nWALTrailer*F\n\tScopeTyp" +
-      "e\022\033\n\027REPLICATION_SCOPE_LOCAL\020\000\022\034\n\030REPLIC" +
-      "ATION_SCOPE_GLOBAL\020\001B?\n*org.apache.hadoo" +
-      "p.hbase.protobuf.generatedB\tWALProtosH\001\210" +
-      "\001\000\240\001\001"
+      "\n\tWAL.proto\022\010hbase.pb\032\013HBase.proto\032\014Clie" +
+      "nt.proto\"\217\001\n\tWALHeader\022\027\n\017has_compressio" +
+      "n\030\001 \001(\010\022\026\n\016encryption_key\030\002 \001(\014\022\033\n\023has_t" +
+      "ag_compression\030\003 \001(\010\022\027\n\017writer_cls_name\030" +
+      "\004 \001(\t\022\033\n\023cell_codec_cls_name\030\005 \001(\t\"\273\002\n\006W" +
+      "ALKey\022\033\n\023encoded_region_name\030\001 \002(\014\022\022\n\nta" +
+      "ble_name\030\002 \002(\014\022\033\n\023log_sequence_number\030\003 " +
+      "\002(\004\022\022\n\nwrite_time\030\004 \002(\004\022&\n\ncluster_id\030\005 " +
+      "\001(\0132\016.hbase.pb.UUIDB\002\030\001\022%\n\006scopes\030\006 \003(\0132" +
+      "\025.hbase.pb.FamilyScope\022\032\n\022following_kv_c",
+      "ount\030\007 \001(\r\022#\n\013cluster_ids\030\010 \003(\0132\016.hbase." +
+      "pb.UUID\022\022\n\nnonceGroup\030\t \001(\004\022\r\n\005nonce\030\n \001" +
+      "(\004\022\034\n\024orig_sequence_number\030\013 \001(\004\"F\n\013Fami" +
+      "lyScope\022\016\n\006family\030\001 \002(\014\022\'\n\nscope_type\030\002 " +
+      "\002(\0162\023.hbase.pb.ScopeType\"\276\001\n\024CompactionD" +
+      "escriptor\022\022\n\ntable_name\030\001 \002(\014\022\033\n\023encoded" +
+      "_region_name\030\002 \002(\014\022\023\n\013family_name\030\003 \002(\014\022" +
+      "\030\n\020compaction_input\030\004 \003(\t\022\031\n\021compaction_" +
+      "output\030\005 \003(\t\022\026\n\016store_home_dir\030\006 \002(\t\022\023\n\013" +
+      "region_name\030\007 \001(\014\"\244\003\n\017FlushDescriptor\0225\n",
+      "\006action\030\001 \002(\0162%.hbase.pb.FlushDescriptor" +
+      ".FlushAction\022\022\n\ntable_name\030\002 \002(\014\022\033\n\023enco" +
+      "ded_region_name\030\003 \002(\014\022\035\n\025flush_sequence_" +
+      "number\030\004 \001(\004\022E\n\rstore_flushes\030\005 \003(\0132..hb" +
+      "ase.pb.FlushDescriptor.StoreFlushDescrip" +
+      "tor\022\023\n\013region_name\030\006 \001(\014\032Y\n\024StoreFlushDe" +
+      "scriptor\022\023\n\013family_name\030\001 \002(\014\022\026\n\016store_h" +
+      "ome_dir\030\002 \002(\t\022\024\n\014flush_output\030\003 \003(\t\"S\n\013F" +
+      "lushAction\022\017\n\013START_FLUSH\020\000\022\020\n\014COMMIT_FL" +
+      "USH\020\001\022\017\n\013ABORT_FLUSH\020\002\022\020\n\014CANNOT_FLUSH\020\003",
+      "\"R\n\017StoreDescriptor\022\023\n\013family_name\030\001 \002(\014" +
+      "\022\026\n\016store_home_dir\030\002 \002(\t\022\022\n\nstore_file\030\003" +
+      " \003(\t\"\237\001\n\022BulkLoadDescriptor\022\'\n\ntable_nam" +
+      "e\030\001 \002(\0132\023.hbase.pb.TableName\022\033\n\023encoded_" +
+      "region_name\030\002 \002(\014\022)\n\006stores\030\003 \003(\0132\031.hbas" +
+      "e.pb.StoreDescriptor\022\030\n\020bulkload_seq_num" +
+      "\030\004 \002(\003\"\272\002\n\025RegionEventDescriptor\022=\n\neven" +
+      "t_type\030\001 \002(\0162).hbase.pb.RegionEventDescr" +
+      "iptor.EventType\022\022\n\ntable_name\030\002 \002(\014\022\033\n\023e" +
+      "ncoded_region_name\030\003 \002(\014\022\033\n\023log_sequence",
+      "_number\030\004 \001(\004\022)\n\006stores\030\005 \003(\0132\031.hbase.pb" +
+      ".StoreDescriptor\022$\n\006server\030\006 \001(\0132\024.hbase" +
+      ".pb.ServerName\022\023\n\013region_name\030\007 \001(\014\".\n\tE" +
+      "ventType\022\017\n\013REGION_OPEN\020\000\022\020\n\014REGION_CLOS" +
+      "E\020\001\"\014\n\nWALTrailer*F\n\tScopeType\022\033\n\027REPLIC" +
+      "ATION_SCOPE_LOCAL\020\000\022\034\n\030REPLICATION_SCOPE" +
+      "_GLOBAL\020\001B?\n*org.apache.hadoop.hbase.pro" +
+      "tobuf.generatedB\tWALProtosH\001\210\001\000\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_WALHeader_descriptor =
+          internal_static_hbase_pb_WALHeader_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_WALHeader_fieldAccessorTable = new
+          internal_static_hbase_pb_WALHeader_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WALHeader_descriptor,
+              internal_static_hbase_pb_WALHeader_descriptor,
               new java.lang.String[] { "HasCompression", "EncryptionKey", "HasTagCompression", "WriterClsName", "CellCodecClsName", });
-          internal_static_WALKey_descriptor =
+          internal_static_hbase_pb_WALKey_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_WALKey_fieldAccessorTable = new
+          internal_static_hbase_pb_WALKey_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WALKey_descriptor,
+              internal_static_hbase_pb_WALKey_descriptor,
               new java.lang.String[] { "EncodedRegionName", "TableName", "LogSequenceNumber", "WriteTime", "ClusterId", "Scopes", "FollowingKvCount", "ClusterIds", "NonceGroup", "Nonce", "OrigSequenceNumber", });
-          internal_static_FamilyScope_descriptor =
+          internal_static_hbase_pb_FamilyScope_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_FamilyScope_fieldAccessorTable = new
+          internal_static_hbase_pb_FamilyScope_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FamilyScope_descriptor,
+              internal_static_hbase_pb_FamilyScope_descriptor,
               new java.lang.String[] { "Family", "ScopeType", });
-          internal_static_CompactionDescriptor_descriptor =
+          internal_static_hbase_pb_CompactionDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_CompactionDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_CompactionDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_CompactionDescriptor_descriptor,
+              internal_static_hbase_pb_CompactionDescriptor_descriptor,
               new java.lang.String[] { "TableName", "EncodedRegionName", "FamilyName", "CompactionInput", "CompactionOutput", "StoreHomeDir", "RegionName", });
-          internal_static_FlushDescriptor_descriptor =
+          internal_static_hbase_pb_FlushDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_FlushDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_FlushDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FlushDescriptor_descriptor,
+              internal_static_hbase_pb_FlushDescriptor_descriptor,
               new java.lang.String[] { "Action", "TableName", "EncodedRegionName", "FlushSequenceNumber", "StoreFlushes", "RegionName", });
-          internal_static_FlushDescriptor_StoreFlushDescriptor_descriptor =
-            internal_static_FlushDescriptor_descriptor.getNestedTypes().get(0);
-          internal_static_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_descriptor =
+            internal_static_hbase_pb_FlushDescriptor_descriptor.getNestedTypes().get(0);
+          internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_FlushDescriptor_StoreFlushDescriptor_descriptor,
+              internal_static_hbase_pb_FlushDescriptor_StoreFlushDescriptor_descriptor,
               new java.lang.String[] { "FamilyName", "StoreHomeDir", "FlushOutput", });
-          internal_static_StoreDescriptor_descriptor =
+          internal_static_hbase_pb_StoreDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_StoreDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_StoreDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_StoreDescriptor_descriptor,
+              internal_static_hbase_pb_StoreDescriptor_descriptor,
               new java.lang.String[] { "FamilyName", "StoreHomeDir", "StoreFile", });
-          internal_static_BulkLoadDescriptor_descriptor =
+          internal_static_hbase_pb_BulkLoadDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_BulkLoadDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_BulkLoadDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_BulkLoadDescriptor_descriptor,
+              internal_static_hbase_pb_BulkLoadDescriptor_descriptor,
               new java.lang.String[] { "TableName", "EncodedRegionName", "Stores", "BulkloadSeqNum", });
-          internal_static_RegionEventDescriptor_descriptor =
+          internal_static_hbase_pb_RegionEventDescriptor_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_RegionEventDescriptor_fieldAccessorTable = new
+          internal_static_hbase_pb_RegionEventDescriptor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RegionEventDescriptor_descriptor,
+              internal_static_hbase_pb_RegionEventDescriptor_descriptor,
               new java.lang.String[] { "EventType", "TableName", "EncodedRegionName", "LogSequenceNumber", "Stores", "Server", "RegionName", });
-          internal_static_WALTrailer_descriptor =
+          internal_static_hbase_pb_WALTrailer_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_WALTrailer_fieldAccessorTable = new
+          internal_static_hbase_pb_WALTrailer_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_WALTrailer_descriptor,
+              internal_static_hbase_pb_WALTrailer_descriptor,
               new java.lang.String[] { });
           return null;
         }
diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java
index f15e980cd2d..4371739c4a1 100644
--- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java
+++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java
@@ -11,9 +11,9 @@ public final class ZooKeeperProtos {
   public interface MetaRegionServerOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      * The ServerName hosting the meta region currently, or destination server,
@@ -22,7 +22,7 @@ public final class ZooKeeperProtos {
      */
     boolean hasServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      * The ServerName hosting the meta region currently, or destination server,
@@ -31,7 +31,7 @@ public final class ZooKeeperProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer();
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      * The ServerName hosting the meta region currently, or destination server,
@@ -62,9 +62,9 @@ public final class ZooKeeperProtos {
      */
     int getRpcVersion();
 
-    // optional .RegionState.State state = 3;
+    // optional .hbase.pb.RegionState.State state = 3;
     /**
-     * optional .RegionState.State state = 3;
+     * optional .hbase.pb.RegionState.State state = 3;
      *
      * 
      * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -72,7 +72,7 @@ public final class ZooKeeperProtos {
      */
     boolean hasState();
     /**
-     * optional .RegionState.State state = 3;
+     * optional .hbase.pb.RegionState.State state = 3;
      *
      * 
      * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -81,7 +81,7 @@ public final class ZooKeeperProtos {
     org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State getState();
   }
   /**
-   * Protobuf type {@code MetaRegionServer}
+   * Protobuf type {@code hbase.pb.MetaRegionServer}
    *
    * 
    **
@@ -179,12 +179,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_MetaRegionServer_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_MetaRegionServer_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_MetaRegionServer_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_MetaRegionServer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MetaRegionServer.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MetaRegionServer.Builder.class);
     }
@@ -205,11 +205,11 @@ public final class ZooKeeperProtos {
     }
 
     private int bitField0_;
-    // required .ServerName server = 1;
+    // required .hbase.pb.ServerName server = 1;
     public static final int SERVER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_;
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      * The ServerName hosting the meta region currently, or destination server,
@@ -220,7 +220,7 @@ public final class ZooKeeperProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      * The ServerName hosting the meta region currently, or destination server,
@@ -231,7 +231,7 @@ public final class ZooKeeperProtos {
       return server_;
     }
     /**
-     * required .ServerName server = 1;
+     * required .hbase.pb.ServerName server = 1;
      *
      * 
      * The ServerName hosting the meta region currently, or destination server,
@@ -270,11 +270,11 @@ public final class ZooKeeperProtos {
       return rpcVersion_;
     }
 
-    // optional .RegionState.State state = 3;
+    // optional .hbase.pb.RegionState.State state = 3;
     public static final int STATE_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State state_;
     /**
-     * optional .RegionState.State state = 3;
+     * optional .hbase.pb.RegionState.State state = 3;
      *
      * 
      * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -284,7 +284,7 @@ public final class ZooKeeperProtos {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .RegionState.State state = 3;
+     * optional .hbase.pb.RegionState.State state = 3;
      *
      * 
      * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -484,7 +484,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code MetaRegionServer}
+     * Protobuf type {@code hbase.pb.MetaRegionServer}
      *
      * 
      **
@@ -496,12 +496,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MetaRegionServerOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_MetaRegionServer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_MetaRegionServer_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_MetaRegionServer_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_MetaRegionServer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MetaRegionServer.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MetaRegionServer.Builder.class);
       }
@@ -546,7 +546,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_MetaRegionServer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_MetaRegionServer_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MetaRegionServer getDefaultInstanceForType() {
@@ -641,12 +641,12 @@ public final class ZooKeeperProtos {
       }
       private int bitField0_;
 
-      // required .ServerName server = 1;
+      // required .hbase.pb.ServerName server = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_;
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -657,7 +657,7 @@ public final class ZooKeeperProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -672,7 +672,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -693,7 +693,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -712,7 +712,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -736,7 +736,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -754,7 +754,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -767,7 +767,7 @@ public final class ZooKeeperProtos {
         return getServerFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -782,7 +782,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * required .ServerName server = 1;
+       * required .hbase.pb.ServerName server = 1;
        *
        * 
        * The ServerName hosting the meta region currently, or destination server,
@@ -860,10 +860,10 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // optional .RegionState.State state = 3;
+      // optional .hbase.pb.RegionState.State state = 3;
       private org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State state_ = org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionState.State.OFFLINE;
       /**
-       * optional .RegionState.State state = 3;
+       * optional .hbase.pb.RegionState.State state = 3;
        *
        * 
        * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -873,7 +873,7 @@ public final class ZooKeeperProtos {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .RegionState.State state = 3;
+       * optional .hbase.pb.RegionState.State state = 3;
        *
        * 
        * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -883,7 +883,7 @@ public final class ZooKeeperProtos {
         return state_;
       }
       /**
-       * optional .RegionState.State state = 3;
+       * optional .hbase.pb.RegionState.State state = 3;
        *
        * 
        * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -899,7 +899,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .RegionState.State state = 3;
+       * optional .hbase.pb.RegionState.State state = 3;
        *
        * 
        * State of the region transition. OPEN means fully operational 'hbase:meta'
@@ -912,7 +912,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:MetaRegionServer)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.MetaRegionServer)
     }
 
     static {
@@ -920,15 +920,15 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:MetaRegionServer)
+    // @@protoc_insertion_point(class_scope:hbase.pb.MetaRegionServer)
   }
 
   public interface MasterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ServerName master = 1;
+    // required .hbase.pb.ServerName master = 1;
     /**
-     * required .ServerName master = 1;
+     * required .hbase.pb.ServerName master = 1;
      *
      * 
      * The ServerName of the current Master
@@ -936,7 +936,7 @@ public final class ZooKeeperProtos {
      */
     boolean hasMaster();
     /**
-     * required .ServerName master = 1;
+     * required .hbase.pb.ServerName master = 1;
      *
      * 
      * The ServerName of the current Master
@@ -944,7 +944,7 @@ public final class ZooKeeperProtos {
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getMaster();
     /**
-     * required .ServerName master = 1;
+     * required .hbase.pb.ServerName master = 1;
      *
      * 
      * The ServerName of the current Master
@@ -981,7 +981,7 @@ public final class ZooKeeperProtos {
     int getInfoPort();
   }
   /**
-   * Protobuf type {@code Master}
+   * Protobuf type {@code hbase.pb.Master}
    *
    * 
    **
@@ -1073,12 +1073,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_Master_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_Master_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_Master_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_Master_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Master.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Master.Builder.class);
     }
@@ -1099,11 +1099,11 @@ public final class ZooKeeperProtos {
     }
 
     private int bitField0_;
-    // required .ServerName master = 1;
+    // required .hbase.pb.ServerName master = 1;
     public static final int MASTER_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName master_;
     /**
-     * required .ServerName master = 1;
+     * required .hbase.pb.ServerName master = 1;
      *
      * 
      * The ServerName of the current Master
@@ -1113,7 +1113,7 @@ public final class ZooKeeperProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ServerName master = 1;
+     * required .hbase.pb.ServerName master = 1;
      *
      * 
      * The ServerName of the current Master
@@ -1123,7 +1123,7 @@ public final class ZooKeeperProtos {
       return master_;
     }
     /**
-     * required .ServerName master = 1;
+     * required .hbase.pb.ServerName master = 1;
      *
      * 
      * The ServerName of the current Master
@@ -1363,7 +1363,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code Master}
+     * Protobuf type {@code hbase.pb.Master}
      *
      * 
      **
@@ -1375,12 +1375,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.MasterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_Master_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_Master_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_Master_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_Master_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Master.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Master.Builder.class);
       }
@@ -1425,7 +1425,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_Master_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_Master_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Master getDefaultInstanceForType() {
@@ -1520,12 +1520,12 @@ public final class ZooKeeperProtos {
       }
       private int bitField0_;
 
-      // required .ServerName master = 1;
+      // required .hbase.pb.ServerName master = 1;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName master_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> masterBuilder_;
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1535,7 +1535,7 @@ public final class ZooKeeperProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1549,7 +1549,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1569,7 +1569,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1587,7 +1587,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1610,7 +1610,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1627,7 +1627,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1639,7 +1639,7 @@ public final class ZooKeeperProtos {
         return getMasterFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1653,7 +1653,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * required .ServerName master = 1;
+       * required .hbase.pb.ServerName master = 1;
        *
        * 
        * The ServerName of the current Master
@@ -1755,7 +1755,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:Master)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.Master)
     }
 
     static {
@@ -1763,7 +1763,7 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:Master)
+    // @@protoc_insertion_point(class_scope:hbase.pb.Master)
   }
 
   public interface ClusterUpOrBuilder
@@ -1800,7 +1800,7 @@ public final class ZooKeeperProtos {
         getStartDateBytes();
   }
   /**
-   * Protobuf type {@code ClusterUp}
+   * Protobuf type {@code hbase.pb.ClusterUp}
    *
    * 
    **
@@ -1874,12 +1874,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ClusterUp_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ClusterUp_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ClusterUp_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ClusterUp_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ClusterUp.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ClusterUp.Builder.class);
     }
@@ -2110,7 +2110,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ClusterUp}
+     * Protobuf type {@code hbase.pb.ClusterUp}
      *
      * 
      **
@@ -2122,12 +2122,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ClusterUpOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ClusterUp_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ClusterUp_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ClusterUp_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ClusterUp_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ClusterUp.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ClusterUp.Builder.class);
       }
@@ -2163,7 +2163,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ClusterUp_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ClusterUp_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ClusterUp getDefaultInstanceForType() {
@@ -2342,7 +2342,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ClusterUp)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ClusterUp)
     }
 
     static {
@@ -2350,48 +2350,48 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ClusterUp)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ClusterUp)
   }
 
   public interface SplitLogTaskOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .SplitLogTask.State state = 1;
+    // required .hbase.pb.SplitLogTask.State state = 1;
     /**
-     * required .SplitLogTask.State state = 1;
+     * required .hbase.pb.SplitLogTask.State state = 1;
      */
     boolean hasState();
     /**
-     * required .SplitLogTask.State state = 1;
+     * required .hbase.pb.SplitLogTask.State state = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State getState();
 
-    // required .ServerName server_name = 2;
+    // required .hbase.pb.ServerName server_name = 2;
     /**
-     * required .ServerName server_name = 2;
+     * required .hbase.pb.ServerName server_name = 2;
      */
     boolean hasServerName();
     /**
-     * required .ServerName server_name = 2;
+     * required .hbase.pb.ServerName server_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName();
     /**
-     * required .ServerName server_name = 2;
+     * required .hbase.pb.ServerName server_name = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder();
 
-    // optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+    // optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
     /**
-     * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+     * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
      */
     boolean hasMode();
     /**
-     * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+     * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
      */
     org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode getMode();
   }
   /**
-   * Protobuf type {@code SplitLogTask}
+   * Protobuf type {@code hbase.pb.SplitLogTask}
    *
    * 
    **
@@ -2496,12 +2496,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_SplitLogTask_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_SplitLogTask_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_SplitLogTask_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_SplitLogTask_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.Builder.class);
     }
@@ -2522,7 +2522,7 @@ public final class ZooKeeperProtos {
     }
 
     /**
-     * Protobuf enum {@code SplitLogTask.State}
+     * Protobuf enum {@code hbase.pb.SplitLogTask.State}
      */
     public enum State
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -2627,11 +2627,11 @@ public final class ZooKeeperProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:SplitLogTask.State)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.SplitLogTask.State)
     }
 
     /**
-     * Protobuf enum {@code SplitLogTask.RecoveryMode}
+     * Protobuf enum {@code hbase.pb.SplitLogTask.RecoveryMode}
      */
     public enum RecoveryMode
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -2718,59 +2718,59 @@ public final class ZooKeeperProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:SplitLogTask.RecoveryMode)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.SplitLogTask.RecoveryMode)
     }
 
     private int bitField0_;
-    // required .SplitLogTask.State state = 1;
+    // required .hbase.pb.SplitLogTask.State state = 1;
     public static final int STATE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State state_;
     /**
-     * required .SplitLogTask.State state = 1;
+     * required .hbase.pb.SplitLogTask.State state = 1;
      */
     public boolean hasState() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .SplitLogTask.State state = 1;
+     * required .hbase.pb.SplitLogTask.State state = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State getState() {
       return state_;
     }
 
-    // required .ServerName server_name = 2;
+    // required .hbase.pb.ServerName server_name = 2;
     public static final int SERVER_NAME_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName serverName_;
     /**
-     * required .ServerName server_name = 2;
+     * required .hbase.pb.ServerName server_name = 2;
      */
     public boolean hasServerName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * required .ServerName server_name = 2;
+     * required .hbase.pb.ServerName server_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName() {
       return serverName_;
     }
     /**
-     * required .ServerName server_name = 2;
+     * required .hbase.pb.ServerName server_name = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder() {
       return serverName_;
     }
 
-    // optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+    // optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
     public static final int MODE_FIELD_NUMBER = 3;
     private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode mode_;
     /**
-     * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+     * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
      */
     public boolean hasMode() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+     * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
      */
     public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode getMode() {
       return mode_;
@@ -2970,7 +2970,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code SplitLogTask}
+     * Protobuf type {@code hbase.pb.SplitLogTask}
      *
      * 
      **
@@ -2983,12 +2983,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTaskOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_SplitLogTask_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_SplitLogTask_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_SplitLogTask_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_SplitLogTask_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.Builder.class);
       }
@@ -3033,7 +3033,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_SplitLogTask_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_SplitLogTask_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask getDefaultInstanceForType() {
@@ -3132,22 +3132,22 @@ public final class ZooKeeperProtos {
       }
       private int bitField0_;
 
-      // required .SplitLogTask.State state = 1;
+      // required .hbase.pb.SplitLogTask.State state = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State state_ = org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State.UNASSIGNED;
       /**
-       * required .SplitLogTask.State state = 1;
+       * required .hbase.pb.SplitLogTask.State state = 1;
        */
       public boolean hasState() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .SplitLogTask.State state = 1;
+       * required .hbase.pb.SplitLogTask.State state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State getState() {
         return state_;
       }
       /**
-       * required .SplitLogTask.State state = 1;
+       * required .hbase.pb.SplitLogTask.State state = 1;
        */
       public Builder setState(org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.State value) {
         if (value == null) {
@@ -3159,7 +3159,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .SplitLogTask.State state = 1;
+       * required .hbase.pb.SplitLogTask.State state = 1;
        */
       public Builder clearState() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -3168,18 +3168,18 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // required .ServerName server_name = 2;
+      // required .hbase.pb.ServerName server_name = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName serverName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverNameBuilder_;
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public boolean hasServerName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServerName() {
         if (serverNameBuilder_ == null) {
@@ -3189,7 +3189,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public Builder setServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverNameBuilder_ == null) {
@@ -3205,7 +3205,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public Builder setServerName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -3219,7 +3219,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public Builder mergeServerName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (serverNameBuilder_ == null) {
@@ -3238,7 +3238,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public Builder clearServerName() {
         if (serverNameBuilder_ == null) {
@@ -3251,7 +3251,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getServerNameBuilder() {
         bitField0_ |= 0x00000002;
@@ -3259,7 +3259,7 @@ public final class ZooKeeperProtos {
         return getServerNameFieldBuilder().getBuilder();
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerNameOrBuilder() {
         if (serverNameBuilder_ != null) {
@@ -3269,7 +3269,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * required .ServerName server_name = 2;
+       * required .hbase.pb.ServerName server_name = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -3285,22 +3285,22 @@ public final class ZooKeeperProtos {
         return serverNameBuilder_;
       }
 
-      // optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+      // optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
       private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode mode_ = org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode.UNKNOWN;
       /**
-       * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+       * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
        */
       public boolean hasMode() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+       * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
        */
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode getMode() {
         return mode_;
       }
       /**
-       * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+       * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
        */
       public Builder setMode(org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode value) {
         if (value == null) {
@@ -3312,7 +3312,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
+       * optional .hbase.pb.SplitLogTask.RecoveryMode mode = 3 [default = UNKNOWN];
        */
       public Builder clearMode() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -3321,7 +3321,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:SplitLogTask)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.SplitLogTask)
     }
 
     static {
@@ -3329,15 +3329,15 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:SplitLogTask)
+    // @@protoc_insertion_point(class_scope:hbase.pb.SplitLogTask)
   }
 
   public interface DeprecatedTableStateOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .DeprecatedTableState.State state = 1 [default = ENABLED];
+    // required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
     /**
-     * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+     * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
      *
      * 
      * This is the table's state.  If no znode for a table,
@@ -3347,7 +3347,7 @@ public final class ZooKeeperProtos {
      */
     boolean hasState();
     /**
-     * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+     * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
      *
      * 
      * This is the table's state.  If no znode for a table,
@@ -3358,7 +3358,7 @@ public final class ZooKeeperProtos {
     org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.State getState();
   }
   /**
-   * Protobuf type {@code DeprecatedTableState}
+   * Protobuf type {@code hbase.pb.DeprecatedTableState}
    *
    * 
    **
@@ -3439,12 +3439,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_DeprecatedTableState_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_DeprecatedTableState_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_DeprecatedTableState_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_DeprecatedTableState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.Builder.class);
     }
@@ -3465,7 +3465,7 @@ public final class ZooKeeperProtos {
     }
 
     /**
-     * Protobuf enum {@code DeprecatedTableState.State}
+     * Protobuf enum {@code hbase.pb.DeprecatedTableState.State}
      *
      * 
      * Table's current state
@@ -3565,15 +3565,15 @@ public final class ZooKeeperProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:DeprecatedTableState.State)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.DeprecatedTableState.State)
     }
 
     private int bitField0_;
-    // required .DeprecatedTableState.State state = 1 [default = ENABLED];
+    // required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
     public static final int STATE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.State state_;
     /**
-     * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+     * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
      *
      * 
      * This is the table's state.  If no znode for a table,
@@ -3585,7 +3585,7 @@ public final class ZooKeeperProtos {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+     * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
      *
      * 
      * This is the table's state.  If no znode for a table,
@@ -3749,7 +3749,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code DeprecatedTableState}
+     * Protobuf type {@code hbase.pb.DeprecatedTableState}
      *
      * 
      **
@@ -3762,12 +3762,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableStateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_DeprecatedTableState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_DeprecatedTableState_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_DeprecatedTableState_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_DeprecatedTableState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.Builder.class);
       }
@@ -3803,7 +3803,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_DeprecatedTableState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_DeprecatedTableState_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState getDefaultInstanceForType() {
@@ -3876,10 +3876,10 @@ public final class ZooKeeperProtos {
       }
       private int bitField0_;
 
-      // required .DeprecatedTableState.State state = 1 [default = ENABLED];
+      // required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
       private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.State state_ = org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.DeprecatedTableState.State.ENABLED;
       /**
-       * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+       * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
        *
        * 
        * This is the table's state.  If no znode for a table,
@@ -3891,7 +3891,7 @@ public final class ZooKeeperProtos {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+       * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
        *
        * 
        * This is the table's state.  If no znode for a table,
@@ -3903,7 +3903,7 @@ public final class ZooKeeperProtos {
         return state_;
       }
       /**
-       * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+       * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
        *
        * 
        * This is the table's state.  If no znode for a table,
@@ -3921,7 +3921,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .DeprecatedTableState.State state = 1 [default = ENABLED];
+       * required .hbase.pb.DeprecatedTableState.State state = 1 [default = ENABLED];
        *
        * 
        * This is the table's state.  If no znode for a table,
@@ -3936,7 +3936,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:DeprecatedTableState)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.DeprecatedTableState)
     }
 
     static {
@@ -3944,7 +3944,7 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:DeprecatedTableState)
+    // @@protoc_insertion_point(class_scope:hbase.pb.DeprecatedTableState)
   }
 
   public interface ReplicationPeerOrBuilder
@@ -3995,58 +3995,58 @@ public final class ZooKeeperProtos {
     com.google.protobuf.ByteString
         getReplicationEndpointImplBytes();
 
-    // repeated .BytesBytesPair data = 3;
+    // repeated .hbase.pb.BytesBytesPair data = 3;
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     java.util.List 
         getDataList();
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getData(int index);
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     int getDataCount();
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     java.util.List 
         getDataOrBuilderList();
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getDataOrBuilder(
         int index);
 
-    // repeated .NameStringPair configuration = 4;
+    // repeated .hbase.pb.NameStringPair configuration = 4;
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     java.util.List 
         getConfigurationList();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index);
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     int getConfigurationCount();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     java.util.List 
         getConfigurationOrBuilderList();
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code ReplicationPeer}
+   * Protobuf type {@code hbase.pb.ReplicationPeer}
    *
    * 
    **
@@ -4147,12 +4147,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationPeer_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationPeer_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationPeer_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationPeer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationPeer.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationPeer.Builder.class);
     }
@@ -4274,72 +4274,72 @@ public final class ZooKeeperProtos {
       }
     }
 
-    // repeated .BytesBytesPair data = 3;
+    // repeated .hbase.pb.BytesBytesPair data = 3;
     public static final int DATA_FIELD_NUMBER = 3;
     private java.util.List data_;
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     public java.util.List getDataList() {
       return data_;
     }
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     public java.util.List 
         getDataOrBuilderList() {
       return data_;
     }
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     public int getDataCount() {
       return data_.size();
     }
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getData(int index) {
       return data_.get(index);
     }
     /**
-     * repeated .BytesBytesPair data = 3;
+     * repeated .hbase.pb.BytesBytesPair data = 3;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getDataOrBuilder(
         int index) {
       return data_.get(index);
     }
 
-    // repeated .NameStringPair configuration = 4;
+    // repeated .hbase.pb.NameStringPair configuration = 4;
     public static final int CONFIGURATION_FIELD_NUMBER = 4;
     private java.util.List configuration_;
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public java.util.List getConfigurationList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public java.util.List 
         getConfigurationOrBuilderList() {
       return configuration_;
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public int getConfigurationCount() {
       return configuration_.size();
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
       return configuration_.get(index);
     }
     /**
-     * repeated .NameStringPair configuration = 4;
+     * repeated .hbase.pb.NameStringPair configuration = 4;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
         int index) {
@@ -4555,7 +4555,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicationPeer}
+     * Protobuf type {@code hbase.pb.ReplicationPeer}
      *
      * 
      **
@@ -4567,12 +4567,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationPeerOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationPeer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationPeer_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationPeer_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationPeer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationPeer.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationPeer.Builder.class);
       }
@@ -4624,7 +4624,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationPeer_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationPeer_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationPeer getDefaultInstanceForType() {
@@ -4968,7 +4968,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // repeated .BytesBytesPair data = 3;
+      // repeated .hbase.pb.BytesBytesPair data = 3;
       private java.util.List data_ =
         java.util.Collections.emptyList();
       private void ensureDataIsMutable() {
@@ -4982,7 +4982,7 @@ public final class ZooKeeperProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder> dataBuilder_;
 
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public java.util.List getDataList() {
         if (dataBuilder_ == null) {
@@ -4992,7 +4992,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public int getDataCount() {
         if (dataBuilder_ == null) {
@@ -5002,7 +5002,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair getData(int index) {
         if (dataBuilder_ == null) {
@@ -5012,7 +5012,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder setData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -5029,7 +5029,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder setData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -5043,7 +5043,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder addData(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
         if (dataBuilder_ == null) {
@@ -5059,7 +5059,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder addData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair value) {
@@ -5076,7 +5076,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder addData(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -5090,7 +5090,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder addData(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder builderForValue) {
@@ -5104,7 +5104,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder addAllData(
           java.lang.Iterable values) {
@@ -5118,7 +5118,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder clearData() {
         if (dataBuilder_ == null) {
@@ -5131,7 +5131,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public Builder removeData(int index) {
         if (dataBuilder_ == null) {
@@ -5144,14 +5144,14 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder getDataBuilder(
           int index) {
         return getDataFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPairOrBuilder getDataOrBuilder(
           int index) {
@@ -5161,7 +5161,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public java.util.List 
            getDataOrBuilderList() {
@@ -5172,14 +5172,14 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addDataBuilder() {
         return getDataFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.Builder addDataBuilder(
           int index) {
@@ -5187,7 +5187,7 @@ public final class ZooKeeperProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BytesBytesPair.getDefaultInstance());
       }
       /**
-       * repeated .BytesBytesPair data = 3;
+       * repeated .hbase.pb.BytesBytesPair data = 3;
        */
       public java.util.List 
            getDataBuilderList() {
@@ -5208,7 +5208,7 @@ public final class ZooKeeperProtos {
         return dataBuilder_;
       }
 
-      // repeated .NameStringPair configuration = 4;
+      // repeated .hbase.pb.NameStringPair configuration = 4;
       private java.util.List configuration_ =
         java.util.Collections.emptyList();
       private void ensureConfigurationIsMutable() {
@@ -5222,7 +5222,7 @@ public final class ZooKeeperProtos {
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder> configurationBuilder_;
 
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List getConfigurationList() {
         if (configurationBuilder_ == null) {
@@ -5232,7 +5232,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public int getConfigurationCount() {
         if (configurationBuilder_ == null) {
@@ -5242,7 +5242,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair getConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -5252,7 +5252,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -5269,7 +5269,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder setConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -5283,7 +5283,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
         if (configurationBuilder_ == null) {
@@ -5299,7 +5299,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair value) {
@@ -5316,7 +5316,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -5330,7 +5330,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addConfiguration(
           int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder builderForValue) {
@@ -5344,7 +5344,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder addAllConfiguration(
           java.lang.Iterable values) {
@@ -5358,7 +5358,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder clearConfiguration() {
         if (configurationBuilder_ == null) {
@@ -5371,7 +5371,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public Builder removeConfiguration(int index) {
         if (configurationBuilder_ == null) {
@@ -5384,14 +5384,14 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder getConfigurationBuilder(
           int index) {
         return getConfigurationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder(
           int index) {
@@ -5401,7 +5401,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List 
            getConfigurationOrBuilderList() {
@@ -5412,14 +5412,14 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder() {
         return getConfigurationFieldBuilder().addBuilder(
             org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.Builder addConfigurationBuilder(
           int index) {
@@ -5427,7 +5427,7 @@ public final class ZooKeeperProtos {
             index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.getDefaultInstance());
       }
       /**
-       * repeated .NameStringPair configuration = 4;
+       * repeated .hbase.pb.NameStringPair configuration = 4;
        */
       public java.util.List 
            getConfigurationBuilderList() {
@@ -5448,7 +5448,7 @@ public final class ZooKeeperProtos {
         return configurationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicationPeer)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationPeer)
     }
 
     static {
@@ -5456,24 +5456,24 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicationPeer)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicationPeer)
   }
 
   public interface ReplicationStateOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .ReplicationState.State state = 1;
+    // required .hbase.pb.ReplicationState.State state = 1;
     /**
-     * required .ReplicationState.State state = 1;
+     * required .hbase.pb.ReplicationState.State state = 1;
      */
     boolean hasState();
     /**
-     * required .ReplicationState.State state = 1;
+     * required .hbase.pb.ReplicationState.State state = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State getState();
   }
   /**
-   * Protobuf type {@code ReplicationState}
+   * Protobuf type {@code hbase.pb.ReplicationState}
    *
    * 
    **
@@ -5553,12 +5553,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationState_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationState_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationState_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationState_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.Builder.class);
     }
@@ -5579,7 +5579,7 @@ public final class ZooKeeperProtos {
     }
 
     /**
-     * Protobuf enum {@code ReplicationState.State}
+     * Protobuf enum {@code hbase.pb.ReplicationState.State}
      */
     public enum State
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -5657,21 +5657,21 @@ public final class ZooKeeperProtos {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:ReplicationState.State)
+      // @@protoc_insertion_point(enum_scope:hbase.pb.ReplicationState.State)
     }
 
     private int bitField0_;
-    // required .ReplicationState.State state = 1;
+    // required .hbase.pb.ReplicationState.State state = 1;
     public static final int STATE_FIELD_NUMBER = 1;
     private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State state_;
     /**
-     * required .ReplicationState.State state = 1;
+     * required .hbase.pb.ReplicationState.State state = 1;
      */
     public boolean hasState() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .ReplicationState.State state = 1;
+     * required .hbase.pb.ReplicationState.State state = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State getState() {
       return state_;
@@ -5829,7 +5829,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicationState}
+     * Protobuf type {@code hbase.pb.ReplicationState}
      *
      * 
      **
@@ -5841,12 +5841,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationStateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationState_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationState_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationState_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.Builder.class);
       }
@@ -5882,7 +5882,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationState_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationState_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState getDefaultInstanceForType() {
@@ -5955,22 +5955,22 @@ public final class ZooKeeperProtos {
       }
       private int bitField0_;
 
-      // required .ReplicationState.State state = 1;
+      // required .hbase.pb.ReplicationState.State state = 1;
       private org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State state_ = org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State.ENABLED;
       /**
-       * required .ReplicationState.State state = 1;
+       * required .hbase.pb.ReplicationState.State state = 1;
        */
       public boolean hasState() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .ReplicationState.State state = 1;
+       * required .hbase.pb.ReplicationState.State state = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State getState() {
         return state_;
       }
       /**
-       * required .ReplicationState.State state = 1;
+       * required .hbase.pb.ReplicationState.State state = 1;
        */
       public Builder setState(org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationState.State value) {
         if (value == null) {
@@ -5982,7 +5982,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * required .ReplicationState.State state = 1;
+       * required .hbase.pb.ReplicationState.State state = 1;
        */
       public Builder clearState() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -5991,7 +5991,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicationState)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationState)
     }
 
     static {
@@ -5999,7 +5999,7 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicationState)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicationState)
   }
 
   public interface ReplicationHLogPositionOrBuilder
@@ -6016,7 +6016,7 @@ public final class ZooKeeperProtos {
     long getPosition();
   }
   /**
-   * Protobuf type {@code ReplicationHLogPosition}
+   * Protobuf type {@code hbase.pb.ReplicationHLogPosition}
    *
    * 
    **
@@ -6090,12 +6090,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationHLogPosition_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationHLogPosition_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationHLogPosition_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationHLogPosition_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationHLogPosition.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationHLogPosition.Builder.class);
     }
@@ -6284,7 +6284,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicationHLogPosition}
+     * Protobuf type {@code hbase.pb.ReplicationHLogPosition}
      *
      * 
      **
@@ -6296,12 +6296,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationHLogPositionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationHLogPosition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationHLogPosition_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationHLogPosition_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationHLogPosition_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationHLogPosition.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationHLogPosition.Builder.class);
       }
@@ -6337,7 +6337,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationHLogPosition_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationHLogPosition_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationHLogPosition getDefaultInstanceForType() {
@@ -6443,7 +6443,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicationHLogPosition)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationHLogPosition)
     }
 
     static {
@@ -6451,7 +6451,7 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicationHLogPosition)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicationHLogPosition)
   }
 
   public interface ReplicationLockOrBuilder
@@ -6473,7 +6473,7 @@ public final class ZooKeeperProtos {
         getLockOwnerBytes();
   }
   /**
-   * Protobuf type {@code ReplicationLock}
+   * Protobuf type {@code hbase.pb.ReplicationLock}
    *
    * 
    **
@@ -6547,12 +6547,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationLock_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationLock_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationLock_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationLock_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationLock.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationLock.Builder.class);
     }
@@ -6768,7 +6768,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code ReplicationLock}
+     * Protobuf type {@code hbase.pb.ReplicationLock}
      *
      * 
      **
@@ -6780,12 +6780,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationLockOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationLock_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationLock_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationLock_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationLock_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationLock.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationLock.Builder.class);
       }
@@ -6821,7 +6821,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_ReplicationLock_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_ReplicationLock_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.ReplicationLock getDefaultInstanceForType() {
@@ -6970,7 +6970,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:ReplicationLock)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationLock)
     }
 
     static {
@@ -6978,37 +6978,37 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:ReplicationLock)
+    // @@protoc_insertion_point(class_scope:hbase.pb.ReplicationLock)
   }
 
   public interface TableLockOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .TableName table_name = 1;
+    // optional .hbase.pb.TableName table_name = 1;
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     boolean hasTableName();
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName();
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder();
 
-    // optional .ServerName lock_owner = 2;
+    // optional .hbase.pb.ServerName lock_owner = 2;
     /**
-     * optional .ServerName lock_owner = 2;
+     * optional .hbase.pb.ServerName lock_owner = 2;
      */
     boolean hasLockOwner();
     /**
-     * optional .ServerName lock_owner = 2;
+     * optional .hbase.pb.ServerName lock_owner = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getLockOwner();
     /**
-     * optional .ServerName lock_owner = 2;
+     * optional .hbase.pb.ServerName lock_owner = 2;
      */
     org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getLockOwnerOrBuilder();
 
@@ -7058,7 +7058,7 @@ public final class ZooKeeperProtos {
     long getCreateTime();
   }
   /**
-   * Protobuf type {@code TableLock}
+   * Protobuf type {@code hbase.pb.TableLock}
    *
    * 
    **
@@ -7173,12 +7173,12 @@ public final class ZooKeeperProtos {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_TableLock_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableLock_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_TableLock_fieldAccessorTable
+      return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableLock_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableLock.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableLock.Builder.class);
     }
@@ -7199,45 +7199,45 @@ public final class ZooKeeperProtos {
     }
 
     private int bitField0_;
-    // optional .TableName table_name = 1;
+    // optional .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_;
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     public boolean hasTableName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
       return tableName_;
     }
     /**
-     * optional .TableName table_name = 1;
+     * optional .hbase.pb.TableName table_name = 1;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
       return tableName_;
     }
 
-    // optional .ServerName lock_owner = 2;
+    // optional .hbase.pb.ServerName lock_owner = 2;
     public static final int LOCK_OWNER_FIELD_NUMBER = 2;
     private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName lockOwner_;
     /**
-     * optional .ServerName lock_owner = 2;
+     * optional .hbase.pb.ServerName lock_owner = 2;
      */
     public boolean hasLockOwner() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .ServerName lock_owner = 2;
+     * optional .hbase.pb.ServerName lock_owner = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getLockOwner() {
       return lockOwner_;
     }
     /**
-     * optional .ServerName lock_owner = 2;
+     * optional .hbase.pb.ServerName lock_owner = 2;
      */
     public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getLockOwnerOrBuilder() {
       return lockOwner_;
@@ -7579,7 +7579,7 @@ public final class ZooKeeperProtos {
       return builder;
     }
     /**
-     * Protobuf type {@code TableLock}
+     * Protobuf type {@code hbase.pb.TableLock}
      *
      * 
      **
@@ -7591,12 +7591,12 @@ public final class ZooKeeperProtos {
        implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableLockOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_TableLock_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableLock_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_TableLock_fieldAccessorTable
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableLock_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableLock.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableLock.Builder.class);
       }
@@ -7652,7 +7652,7 @@ public final class ZooKeeperProtos {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_TableLock_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableLock_descriptor;
       }
 
       public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableLock getDefaultInstanceForType() {
@@ -7778,18 +7778,18 @@ public final class ZooKeeperProtos {
       }
       private int bitField0_;
 
-      // optional .TableName table_name = 1;
+      // optional .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 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_;
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public boolean hasTableName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() {
         if (tableNameBuilder_ == null) {
@@ -7799,7 +7799,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -7815,7 +7815,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder setTableName(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) {
@@ -7829,7 +7829,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) {
         if (tableNameBuilder_ == null) {
@@ -7848,7 +7848,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public Builder clearTableName() {
         if (tableNameBuilder_ == null) {
@@ -7861,7 +7861,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() {
         bitField0_ |= 0x00000001;
@@ -7869,7 +7869,7 @@ public final class ZooKeeperProtos {
         return getTableNameFieldBuilder().getBuilder();
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() {
         if (tableNameBuilder_ != null) {
@@ -7879,7 +7879,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * optional .TableName table_name = 1;
+       * optional .hbase.pb.TableName table_name = 1;
        */
       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> 
@@ -7895,18 +7895,18 @@ public final class ZooKeeperProtos {
         return tableNameBuilder_;
       }
 
-      // optional .ServerName lock_owner = 2;
+      // optional .hbase.pb.ServerName lock_owner = 2;
       private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName lockOwner_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> lockOwnerBuilder_;
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public boolean hasLockOwner() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getLockOwner() {
         if (lockOwnerBuilder_ == null) {
@@ -7916,7 +7916,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public Builder setLockOwner(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (lockOwnerBuilder_ == null) {
@@ -7932,7 +7932,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public Builder setLockOwner(
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) {
@@ -7946,7 +7946,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public Builder mergeLockOwner(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) {
         if (lockOwnerBuilder_ == null) {
@@ -7965,7 +7965,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public Builder clearLockOwner() {
         if (lockOwnerBuilder_ == null) {
@@ -7978,7 +7978,7 @@ public final class ZooKeeperProtos {
         return this;
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getLockOwnerBuilder() {
         bitField0_ |= 0x00000002;
@@ -7986,7 +7986,7 @@ public final class ZooKeeperProtos {
         return getLockOwnerFieldBuilder().getBuilder();
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getLockOwnerOrBuilder() {
         if (lockOwnerBuilder_ != null) {
@@ -7996,7 +7996,7 @@ public final class ZooKeeperProtos {
         }
       }
       /**
-       * optional .ServerName lock_owner = 2;
+       * optional .hbase.pb.ServerName lock_owner = 2;
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> 
@@ -8185,7 +8185,7 @@ public final class ZooKeeperProtos {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:TableLock)
+      // @@protoc_insertion_point(builder_scope:hbase.pb.TableLock)
     }
 
     static {
@@ -8193,59 +8193,59 @@ public final class ZooKeeperProtos {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:TableLock)
+    // @@protoc_insertion_point(class_scope:hbase.pb.TableLock)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_MetaRegionServer_descriptor;
+    internal_static_hbase_pb_MetaRegionServer_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_MetaRegionServer_fieldAccessorTable;
+      internal_static_hbase_pb_MetaRegionServer_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_Master_descriptor;
+    internal_static_hbase_pb_Master_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_Master_fieldAccessorTable;
+      internal_static_hbase_pb_Master_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ClusterUp_descriptor;
+    internal_static_hbase_pb_ClusterUp_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ClusterUp_fieldAccessorTable;
+      internal_static_hbase_pb_ClusterUp_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SplitLogTask_descriptor;
+    internal_static_hbase_pb_SplitLogTask_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SplitLogTask_fieldAccessorTable;
+      internal_static_hbase_pb_SplitLogTask_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeprecatedTableState_descriptor;
+    internal_static_hbase_pb_DeprecatedTableState_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeprecatedTableState_fieldAccessorTable;
+      internal_static_hbase_pb_DeprecatedTableState_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicationPeer_descriptor;
+    internal_static_hbase_pb_ReplicationPeer_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicationPeer_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicationPeer_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicationState_descriptor;
+    internal_static_hbase_pb_ReplicationState_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicationState_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicationState_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicationHLogPosition_descriptor;
+    internal_static_hbase_pb_ReplicationHLogPosition_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicationHLogPosition_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicationHLogPosition_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ReplicationLock_descriptor;
+    internal_static_hbase_pb_ReplicationLock_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ReplicationLock_fieldAccessorTable;
+      internal_static_hbase_pb_ReplicationLock_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TableLock_descriptor;
+    internal_static_hbase_pb_TableLock_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TableLock_fieldAccessorTable;
+      internal_static_hbase_pb_TableLock_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -8255,102 +8255,105 @@ public final class ZooKeeperProtos {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017ZooKeeper.proto\032\013HBase.proto\032\023ClusterS" +
-      "tatus.proto\"g\n\020MetaRegionServer\022\033\n\006serve" +
-      "r\030\001 \002(\0132\013.ServerName\022\023\n\013rpc_version\030\002 \001(" +
-      "\r\022!\n\005state\030\003 \001(\0162\022.RegionState.State\"M\n\006" +
-      "Master\022\033\n\006master\030\001 \002(\0132\013.ServerName\022\023\n\013r" +
-      "pc_version\030\002 \001(\r\022\021\n\tinfo_port\030\003 \001(\r\"\037\n\tC" +
-      "lusterUp\022\022\n\nstart_date\030\001 \002(\t\"\214\002\n\014SplitLo" +
-      "gTask\022\"\n\005state\030\001 \002(\0162\023.SplitLogTask.Stat" +
-      "e\022 \n\013server_name\030\002 \002(\0132\013.ServerName\0221\n\004m" +
-      "ode\030\003 \001(\0162\032.SplitLogTask.RecoveryMode:\007U",
-      "NKNOWN\"C\n\005State\022\016\n\nUNASSIGNED\020\000\022\t\n\005OWNED" +
-      "\020\001\022\014\n\010RESIGNED\020\002\022\010\n\004DONE\020\003\022\007\n\003ERR\020\004\">\n\014R" +
-      "ecoveryMode\022\013\n\007UNKNOWN\020\000\022\021\n\rLOG_SPLITTIN" +
-      "G\020\001\022\016\n\nLOG_REPLAY\020\002\"\214\001\n\024DeprecatedTableS" +
-      "tate\0223\n\005state\030\001 \002(\0162\033.DeprecatedTableSta" +
-      "te.State:\007ENABLED\"?\n\005State\022\013\n\007ENABLED\020\000\022" +
-      "\014\n\010DISABLED\020\001\022\r\n\tDISABLING\020\002\022\014\n\010ENABLING" +
-      "\020\003\"\215\001\n\017ReplicationPeer\022\022\n\nclusterkey\030\001 \002" +
-      "(\t\022\037\n\027replicationEndpointImpl\030\002 \001(\t\022\035\n\004d" +
-      "ata\030\003 \003(\0132\017.BytesBytesPair\022&\n\rconfigurat",
-      "ion\030\004 \003(\0132\017.NameStringPair\"^\n\020Replicatio" +
-      "nState\022&\n\005state\030\001 \002(\0162\027.ReplicationState" +
-      ".State\"\"\n\005State\022\013\n\007ENABLED\020\000\022\014\n\010DISABLED" +
-      "\020\001\"+\n\027ReplicationHLogPosition\022\020\n\010positio" +
-      "n\030\001 \002(\003\"%\n\017ReplicationLock\022\022\n\nlock_owner" +
-      "\030\001 \002(\t\"\230\001\n\tTableLock\022\036\n\ntable_name\030\001 \001(\013" +
-      "2\n.TableName\022\037\n\nlock_owner\030\002 \001(\0132\013.Serve" +
-      "rName\022\021\n\tthread_id\030\003 \001(\003\022\021\n\tis_shared\030\004 " +
-      "\001(\010\022\017\n\007purpose\030\005 \001(\t\022\023\n\013create_time\030\006 \001(" +
-      "\003BE\n*org.apache.hadoop.hbase.protobuf.ge",
-      "neratedB\017ZooKeeperProtosH\001\210\001\001\240\001\001"
+      "\n\017ZooKeeper.proto\022\010hbase.pb\032\013HBase.proto" +
+      "\032\023ClusterStatus.proto\"y\n\020MetaRegionServe" +
+      "r\022$\n\006server\030\001 \002(\0132\024.hbase.pb.ServerName\022" +
+      "\023\n\013rpc_version\030\002 \001(\r\022*\n\005state\030\003 \001(\0162\033.hb" +
+      "ase.pb.RegionState.State\"V\n\006Master\022$\n\006ma" +
+      "ster\030\001 \002(\0132\024.hbase.pb.ServerName\022\023\n\013rpc_" +
+      "version\030\002 \001(\r\022\021\n\tinfo_port\030\003 \001(\r\"\037\n\tClus" +
+      "terUp\022\022\n\nstart_date\030\001 \002(\t\"\247\002\n\014SplitLogTa" +
+      "sk\022+\n\005state\030\001 \002(\0162\034.hbase.pb.SplitLogTas" +
+      "k.State\022)\n\013server_name\030\002 \002(\0132\024.hbase.pb.",
+      "ServerName\022:\n\004mode\030\003 \001(\0162#.hbase.pb.Spli" +
+      "tLogTask.RecoveryMode:\007UNKNOWN\"C\n\005State\022" +
+      "\016\n\nUNASSIGNED\020\000\022\t\n\005OWNED\020\001\022\014\n\010RESIGNED\020\002" +
+      "\022\010\n\004DONE\020\003\022\007\n\003ERR\020\004\">\n\014RecoveryMode\022\013\n\007U" +
+      "NKNOWN\020\000\022\021\n\rLOG_SPLITTING\020\001\022\016\n\nLOG_REPLA" +
+      "Y\020\002\"\225\001\n\024DeprecatedTableState\022<\n\005state\030\001 " +
+      "\002(\0162$.hbase.pb.DeprecatedTableState.Stat" +
+      "e:\007ENABLED\"?\n\005State\022\013\n\007ENABLED\020\000\022\014\n\010DISA" +
+      "BLED\020\001\022\r\n\tDISABLING\020\002\022\014\n\010ENABLING\020\003\"\237\001\n\017" +
+      "ReplicationPeer\022\022\n\nclusterkey\030\001 \002(\t\022\037\n\027r",
+      "eplicationEndpointImpl\030\002 \001(\t\022&\n\004data\030\003 \003" +
+      "(\0132\030.hbase.pb.BytesBytesPair\022/\n\rconfigur" +
+      "ation\030\004 \003(\0132\030.hbase.pb.NameStringPair\"g\n" +
+      "\020ReplicationState\022/\n\005state\030\001 \002(\0162 .hbase" +
+      ".pb.ReplicationState.State\"\"\n\005State\022\013\n\007E" +
+      "NABLED\020\000\022\014\n\010DISABLED\020\001\"+\n\027ReplicationHLo" +
+      "gPosition\022\020\n\010position\030\001 \002(\003\"%\n\017Replicati" +
+      "onLock\022\022\n\nlock_owner\030\001 \002(\t\"\252\001\n\tTableLock" +
+      "\022\'\n\ntable_name\030\001 \001(\0132\023.hbase.pb.TableNam" +
+      "e\022(\n\nlock_owner\030\002 \001(\0132\024.hbase.pb.ServerN",
+      "ame\022\021\n\tthread_id\030\003 \001(\003\022\021\n\tis_shared\030\004 \001(" +
+      "\010\022\017\n\007purpose\030\005 \001(\t\022\023\n\013create_time\030\006 \001(\003B" +
+      "E\n*org.apache.hadoop.hbase.protobuf.gene" +
+      "ratedB\017ZooKeeperProtosH\001\210\001\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_MetaRegionServer_descriptor =
+          internal_static_hbase_pb_MetaRegionServer_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_MetaRegionServer_fieldAccessorTable = new
+          internal_static_hbase_pb_MetaRegionServer_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_MetaRegionServer_descriptor,
+              internal_static_hbase_pb_MetaRegionServer_descriptor,
               new java.lang.String[] { "Server", "RpcVersion", "State", });
-          internal_static_Master_descriptor =
+          internal_static_hbase_pb_Master_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_Master_fieldAccessorTable = new
+          internal_static_hbase_pb_Master_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_Master_descriptor,
+              internal_static_hbase_pb_Master_descriptor,
               new java.lang.String[] { "Master", "RpcVersion", "InfoPort", });
-          internal_static_ClusterUp_descriptor =
+          internal_static_hbase_pb_ClusterUp_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_ClusterUp_fieldAccessorTable = new
+          internal_static_hbase_pb_ClusterUp_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ClusterUp_descriptor,
+              internal_static_hbase_pb_ClusterUp_descriptor,
               new java.lang.String[] { "StartDate", });
-          internal_static_SplitLogTask_descriptor =
+          internal_static_hbase_pb_SplitLogTask_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_SplitLogTask_fieldAccessorTable = new
+          internal_static_hbase_pb_SplitLogTask_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SplitLogTask_descriptor,
+              internal_static_hbase_pb_SplitLogTask_descriptor,
               new java.lang.String[] { "State", "ServerName", "Mode", });
-          internal_static_DeprecatedTableState_descriptor =
+          internal_static_hbase_pb_DeprecatedTableState_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_DeprecatedTableState_fieldAccessorTable = new
+          internal_static_hbase_pb_DeprecatedTableState_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeprecatedTableState_descriptor,
+              internal_static_hbase_pb_DeprecatedTableState_descriptor,
               new java.lang.String[] { "State", });
-          internal_static_ReplicationPeer_descriptor =
+          internal_static_hbase_pb_ReplicationPeer_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_ReplicationPeer_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicationPeer_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicationPeer_descriptor,
+              internal_static_hbase_pb_ReplicationPeer_descriptor,
               new java.lang.String[] { "Clusterkey", "ReplicationEndpointImpl", "Data", "Configuration", });
-          internal_static_ReplicationState_descriptor =
+          internal_static_hbase_pb_ReplicationState_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_ReplicationState_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicationState_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicationState_descriptor,
+              internal_static_hbase_pb_ReplicationState_descriptor,
               new java.lang.String[] { "State", });
-          internal_static_ReplicationHLogPosition_descriptor =
+          internal_static_hbase_pb_ReplicationHLogPosition_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_ReplicationHLogPosition_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicationHLogPosition_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicationHLogPosition_descriptor,
+              internal_static_hbase_pb_ReplicationHLogPosition_descriptor,
               new java.lang.String[] { "Position", });
-          internal_static_ReplicationLock_descriptor =
+          internal_static_hbase_pb_ReplicationLock_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_ReplicationLock_fieldAccessorTable = new
+          internal_static_hbase_pb_ReplicationLock_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ReplicationLock_descriptor,
+              internal_static_hbase_pb_ReplicationLock_descriptor,
               new java.lang.String[] { "LockOwner", });
-          internal_static_TableLock_descriptor =
+          internal_static_hbase_pb_TableLock_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_TableLock_fieldAccessorTable = new
+          internal_static_hbase_pb_TableLock_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TableLock_descriptor,
+              internal_static_hbase_pb_TableLock_descriptor,
               new java.lang.String[] { "TableName", "LockOwner", "ThreadId", "IsShared", "Purpose", "CreateTime", });
           return null;
         }
diff --git a/hbase-protocol/src/main/protobuf/AccessControl.proto b/hbase-protocol/src/main/protobuf/AccessControl.proto
index 505bad7a841..e67540b3a75 100644
--- a/hbase-protocol/src/main/protobuf/AccessControl.proto
+++ b/hbase-protocol/src/main/protobuf/AccessControl.proto
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "AccessControlProtos";
diff --git a/hbase-protocol/src/main/protobuf/Admin.proto b/hbase-protocol/src/main/protobuf/Admin.proto
index b9bdf6e84f2..f7787f55f70 100644
--- a/hbase-protocol/src/main/protobuf/Admin.proto
+++ b/hbase-protocol/src/main/protobuf/Admin.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for Admin service.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "AdminProtos";
diff --git a/hbase-protocol/src/main/protobuf/Aggregate.proto b/hbase-protocol/src/main/protobuf/Aggregate.proto
index 01ce9c39bd2..4d32e709dc7 100644
--- a/hbase-protocol/src/main/protobuf/Aggregate.proto
+++ b/hbase-protocol/src/main/protobuf/Aggregate.proto
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "AggregateProtos";
diff --git a/hbase-protocol/src/main/protobuf/Authentication.proto b/hbase-protocol/src/main/protobuf/Authentication.proto
index f1d03aee028..2f64799f283 100644
--- a/hbase-protocol/src/main/protobuf/Authentication.proto
+++ b/hbase-protocol/src/main/protobuf/Authentication.proto
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "AuthenticationProtos";
diff --git a/hbase-protocol/src/main/protobuf/Cell.proto b/hbase-protocol/src/main/protobuf/Cell.proto
index 98deb2cfbd9..2c6103540fb 100644
--- a/hbase-protocol/src/main/protobuf/Cell.proto
+++ b/hbase-protocol/src/main/protobuf/Cell.proto
@@ -17,6 +17,7 @@
  */
 
 // Cell and KeyValue protos
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "CellProtos";
diff --git a/hbase-protocol/src/main/protobuf/Client.proto b/hbase-protocol/src/main/protobuf/Client.proto
index c857c6310ce..3390de7d617 100644
--- a/hbase-protocol/src/main/protobuf/Client.proto
+++ b/hbase-protocol/src/main/protobuf/Client.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for Client service.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ClientProtos";
diff --git a/hbase-protocol/src/main/protobuf/ClusterId.proto b/hbase-protocol/src/main/protobuf/ClusterId.proto
index b3116f70672..aed8cfcab27 100644
--- a/hbase-protocol/src/main/protobuf/ClusterId.proto
+++ b/hbase-protocol/src/main/protobuf/ClusterId.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are shared throughout HBase
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ClusterIdProtos";
diff --git a/hbase-protocol/src/main/protobuf/ClusterStatus.proto b/hbase-protocol/src/main/protobuf/ClusterStatus.proto
index 597d553a08c..228be7ebb55 100644
--- a/hbase-protocol/src/main/protobuf/ClusterStatus.proto
+++ b/hbase-protocol/src/main/protobuf/ClusterStatus.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for ClustStatus
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ClusterStatusProtos";
diff --git a/hbase-protocol/src/main/protobuf/Comparator.proto b/hbase-protocol/src/main/protobuf/Comparator.proto
index a44ec84632d..496b68dd3f7 100644
--- a/hbase-protocol/src/main/protobuf/Comparator.proto
+++ b/hbase-protocol/src/main/protobuf/Comparator.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for filters
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ComparatorProtos";
diff --git a/hbase-protocol/src/main/protobuf/Encryption.proto b/hbase-protocol/src/main/protobuf/Encryption.proto
index 77440472185..97ab5b24939 100644
--- a/hbase-protocol/src/main/protobuf/Encryption.proto
+++ b/hbase-protocol/src/main/protobuf/Encryption.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers used for encryption
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "EncryptionProtos";
diff --git a/hbase-protocol/src/main/protobuf/ErrorHandling.proto b/hbase-protocol/src/main/protobuf/ErrorHandling.proto
index 1c1488c1ca3..be9a7437d44 100644
--- a/hbase-protocol/src/main/protobuf/ErrorHandling.proto
+++ b/hbase-protocol/src/main/protobuf/ErrorHandling.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for error handling
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ErrorHandlingProtos";
diff --git a/hbase-protocol/src/main/protobuf/FS.proto b/hbase-protocol/src/main/protobuf/FS.proto
index ca819e36607..9e931205cd6 100644
--- a/hbase-protocol/src/main/protobuf/FS.proto
+++ b/hbase-protocol/src/main/protobuf/FS.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are written into the filesystem
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "FSProtos";
diff --git a/hbase-protocol/src/main/protobuf/Filter.proto b/hbase-protocol/src/main/protobuf/Filter.proto
index a0bfd54fe7d..67d57172052 100644
--- a/hbase-protocol/src/main/protobuf/Filter.proto
+++ b/hbase-protocol/src/main/protobuf/Filter.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for filters
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "FilterProtos";
diff --git a/hbase-protocol/src/main/protobuf/HBase.proto b/hbase-protocol/src/main/protobuf/HBase.proto
index 00e2850b87d..d09598a7d77 100644
--- a/hbase-protocol/src/main/protobuf/HBase.proto
+++ b/hbase-protocol/src/main/protobuf/HBase.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are shared throughout HBase
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "HBaseProtos";
diff --git a/hbase-protocol/src/main/protobuf/HFile.proto b/hbase-protocol/src/main/protobuf/HFile.proto
index 84e0e899898..5c5e4f38f5b 100644
--- a/hbase-protocol/src/main/protobuf/HFile.proto
+++ b/hbase-protocol/src/main/protobuf/HFile.proto
@@ -15,6 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "HFileProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/LoadBalancer.proto b/hbase-protocol/src/main/protobuf/LoadBalancer.proto
index 431b087ee16..f9c5d0d73cf 100644
--- a/hbase-protocol/src/main/protobuf/LoadBalancer.proto
+++ b/hbase-protocol/src/main/protobuf/LoadBalancer.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers to represent the state of the load balancer.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "LoadBalancerProtos";
diff --git a/hbase-protocol/src/main/protobuf/MapReduce.proto b/hbase-protocol/src/main/protobuf/MapReduce.proto
index eeb1b66d3f2..f96ffdffff2 100644
--- a/hbase-protocol/src/main/protobuf/MapReduce.proto
+++ b/hbase-protocol/src/main/protobuf/MapReduce.proto
@@ -17,6 +17,7 @@
  */
 
  //This file includes protocol buffers used in MapReduce only.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "MapReduceProtos";
diff --git a/hbase-protocol/src/main/protobuf/Master.proto b/hbase-protocol/src/main/protobuf/Master.proto
index 69371fae54e..10a7854075a 100644
--- a/hbase-protocol/src/main/protobuf/Master.proto
+++ b/hbase-protocol/src/main/protobuf/Master.proto
@@ -18,6 +18,7 @@
 
 // All to do with the Master.  Includes schema management since these
 // changes are run by the Master process.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "MasterProtos";
diff --git a/hbase-protocol/src/main/protobuf/MasterProcedure.proto b/hbase-protocol/src/main/protobuf/MasterProcedure.proto
index d29ea21df2b..c4454340f1e 100644
--- a/hbase-protocol/src/main/protobuf/MasterProcedure.proto
+++ b/hbase-protocol/src/main/protobuf/MasterProcedure.proto
@@ -15,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "MasterProcedureProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/MultiRowMutation.proto b/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
index cf1518e1abd..747afacc134 100644
--- a/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
+++ b/hbase-protocol/src/main/protobuf/MultiRowMutation.proto
@@ -15,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
+
 import "Client.proto";
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "MultiRowMutationProtos";
diff --git a/hbase-protocol/src/main/protobuf/Procedure.proto b/hbase-protocol/src/main/protobuf/Procedure.proto
index 46ff9670d97..bdcb2f51e69 100644
--- a/hbase-protocol/src/main/protobuf/Procedure.proto
+++ b/hbase-protocol/src/main/protobuf/Procedure.proto
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ProcedureProtos";
diff --git a/hbase-protocol/src/main/protobuf/Quota.proto b/hbase-protocol/src/main/protobuf/Quota.proto
index 6ef15fe22ac..a8303b14196 100644
--- a/hbase-protocol/src/main/protobuf/Quota.proto
+++ b/hbase-protocol/src/main/protobuf/Quota.proto
@@ -15,6 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "QuotaProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/RPC.proto b/hbase-protocol/src/main/protobuf/RPC.proto
index a5d60d8197a..5645c0623a8 100644
--- a/hbase-protocol/src/main/protobuf/RPC.proto
+++ b/hbase-protocol/src/main/protobuf/RPC.proto
@@ -15,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
+
 import "Tracing.proto"; 
 import "HBase.proto";
 
diff --git a/hbase-protocol/src/main/protobuf/RegionServerStatus.proto b/hbase-protocol/src/main/protobuf/RegionServerStatus.proto
index 33de5010a96..fda9de20d23 100644
--- a/hbase-protocol/src/main/protobuf/RegionServerStatus.proto
+++ b/hbase-protocol/src/main/protobuf/RegionServerStatus.proto
@@ -17,6 +17,7 @@
  */
 
 // This file contains protocol buffers that are used for RegionServerStatusProtocol.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "RegionServerStatusProtos";
diff --git a/hbase-protocol/src/main/protobuf/RowProcessor.proto b/hbase-protocol/src/main/protobuf/RowProcessor.proto
index cf665c6ad40..cf2f30f3529 100644
--- a/hbase-protocol/src/main/protobuf/RowProcessor.proto
+++ b/hbase-protocol/src/main/protobuf/RowProcessor.proto
@@ -20,6 +20,8 @@
  * See BaseRowProcessorEndpoint for the implementation.
  * See HRegion#processRowsWithLocks() for details.
  */
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "RowProcessorProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto b/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
index f499a52ca55..814735b2892 100644
--- a/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
+++ b/hbase-protocol/src/main/protobuf/SecureBulkLoad.proto
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "SecureBulkLoadProtos";
diff --git a/hbase-protocol/src/main/protobuf/Snapshot.proto b/hbase-protocol/src/main/protobuf/Snapshot.proto
index 34cb919798d..ae1a1e680ac 100644
--- a/hbase-protocol/src/main/protobuf/Snapshot.proto
+++ b/hbase-protocol/src/main/protobuf/Snapshot.proto
@@ -15,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "SnapshotProtos";
 option java_generic_services = true;
diff --git a/hbase-protocol/src/main/protobuf/Tracing.proto b/hbase-protocol/src/main/protobuf/Tracing.proto
index 5ab350b22a8..5a64cfce7e3 100644
--- a/hbase-protocol/src/main/protobuf/Tracing.proto
+++ b/hbase-protocol/src/main/protobuf/Tracing.proto
@@ -15,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "TracingProtos";
 option java_generate_equals_and_hash = true;
diff --git a/hbase-protocol/src/main/protobuf/VisibilityLabels.proto b/hbase-protocol/src/main/protobuf/VisibilityLabels.proto
index febc0136df0..d2dc44d30cf 100644
--- a/hbase-protocol/src/main/protobuf/VisibilityLabels.proto
+++ b/hbase-protocol/src/main/protobuf/VisibilityLabels.proto
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "VisibilityLabelsProtos";
diff --git a/hbase-protocol/src/main/protobuf/WAL.proto b/hbase-protocol/src/main/protobuf/WAL.proto
index 9853e36467f..cb9bd8f5c35 100644
--- a/hbase-protocol/src/main/protobuf/WAL.proto
+++ b/hbase-protocol/src/main/protobuf/WAL.proto
@@ -15,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package hbase.pb;
+
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "WALProtos";
 option java_generic_services = false;
diff --git a/hbase-protocol/src/main/protobuf/ZooKeeper.proto b/hbase-protocol/src/main/protobuf/ZooKeeper.proto
index 617e2cf0f3c..54652af4359 100644
--- a/hbase-protocol/src/main/protobuf/ZooKeeper.proto
+++ b/hbase-protocol/src/main/protobuf/ZooKeeper.proto
@@ -18,6 +18,7 @@
 
 // ZNode data in hbase are serialized protobufs with a four byte
 // 'magic' 'PBUF' prefix.
+package hbase.pb;
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "ZooKeeperProtos";