From 8d4b96a95f2da73644e344d4a6e8b75dbac19b23 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Wed, 8 Aug 2018 12:12:45 -0400 Subject: [PATCH 1/2] rename autogenerated gapic client to be prefixed with Bigtable --- ...a => BaseBigtableInstanceAdminClient.java} | 354 +++++++++--------- ...=> BaseBigtableInstanceAdminSettings.java} | 33 +- ...java => BaseBigtableTableAdminClient.java} | 285 +++++++------- ...va => BaseBigtableTableAdminSettings.java} | 33 +- .../cloud/bigtable/admin/v2/package-info.java | 17 +- .../v2/stub/BigtableInstanceAdminStub.java | 2 +- .../BigtableInstanceAdminStubSettings.java | 8 +- .../admin/v2/stub/BigtableTableAdminStub.java | 4 +- .../stub/BigtableTableAdminStubSettings.java | 10 +- .../stub/GrpcBigtableInstanceAdminStub.java | 2 +- .../v2/stub/GrpcBigtableTableAdminStub.java | 4 +- ... BaseBigtableInstanceAdminClientTest.java} | 12 +- ... => BaseBigtableTableAdminClientTest.java} | 14 +- 13 files changed, 389 insertions(+), 389 deletions(-) rename google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/{BigtableInstanceAdminClient.java => BaseBigtableInstanceAdminClient.java} (79%) rename google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/{BigtableInstanceAdminSettings.java => BaseBigtableInstanceAdminSettings.java} (94%) rename google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/{BigtableTableAdminClient.java => BaseBigtableTableAdminClient.java} (83%) rename google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/{BigtableTableAdminSettings.java => BaseBigtableTableAdminSettings.java} (91%) rename google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableInstanceAdminClientTest.java => BaseBigtableInstanceAdminClientTest.java} (98%) rename google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/{BigtableTableAdminClientTest.java => BaseBigtableTableAdminClientTest.java} (98%) diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java similarity index 79% rename from google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java rename to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java index 5a67f6769b68..b0b9caefbc2a 100644 --- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java +++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java @@ -84,14 +84,14 @@ * * 
  * 
- * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+ * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
  *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
- *   Instance response = bigtableInstanceAdminClient.getInstance(name);
+ *   Instance response = baseBigtableInstanceAdminClient.getInstance(name);
  * }
  * 
  *
* - *

Note: close() needs to be called on the bigtableInstanceAdminClient object to clean up + *

Note: close() needs to be called on the baseBigtableInstanceAdminClient object to clean up * resources such as threads. In the example above, try-with-resources is used, which automatically * calls close(). * @@ -115,19 +115,19 @@ * these names, this class includes a format method for each type of name, and additionally a parse * method to extract the individual identifiers contained within names that are returned. * - *

This class can be customized by passing in a custom instance of BigtableInstanceAdminSettings - * to create(). For example: + *

This class can be customized by passing in a custom instance of + * BaseBigtableInstanceAdminSettings to create(). For example: * *

To customize credentials: * * 

  * 
- * BigtableInstanceAdminSettings bigtableInstanceAdminSettings =
- *     BigtableInstanceAdminSettings.newBuilder()
+ * BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings =
+ *     BaseBigtableInstanceAdminSettings.newBuilder()
  *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
- * BigtableInstanceAdminClient bigtableInstanceAdminClient =
- *     BigtableInstanceAdminClient.create(bigtableInstanceAdminSettings);
+ * BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient =
+ *     BaseBigtableInstanceAdminClient.create(baseBigtableInstanceAdminSettings);
  * 
  *
* @@ -135,62 +135,64 @@ * * 
  * 
- * BigtableInstanceAdminSettings bigtableInstanceAdminSettings =
- *     BigtableInstanceAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
- * BigtableInstanceAdminClient bigtableInstanceAdminClient =
- *     BigtableInstanceAdminClient.create(bigtableInstanceAdminSettings);
+ * BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings =
+ *     BaseBigtableInstanceAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient =
+ *     BaseBigtableInstanceAdminClient.create(baseBigtableInstanceAdminSettings);
  * 
  *
*/ @Generated("by gapic-generator") @BetaApi -public class BigtableInstanceAdminClient implements BackgroundResource { - private final BigtableInstanceAdminSettings settings; +public class BaseBigtableInstanceAdminClient implements BackgroundResource { + private final BaseBigtableInstanceAdminSettings settings; private final BigtableInstanceAdminStub stub; private final OperationsClient operationsClient; - /** Constructs an instance of BigtableInstanceAdminClient with default settings. */ - public static final BigtableInstanceAdminClient create() throws IOException { - return create(BigtableInstanceAdminSettings.newBuilder().build()); + /** Constructs an instance of BaseBigtableInstanceAdminClient with default settings. */ + public static final BaseBigtableInstanceAdminClient create() throws IOException { + return create(BaseBigtableInstanceAdminSettings.newBuilder().build()); } /** - * Constructs an instance of BigtableInstanceAdminClient, using the given settings. The channels - * are created based on the settings passed in, or defaults for any settings that are not set. + * Constructs an instance of BaseBigtableInstanceAdminClient, using the given settings. The + * channels are created based on the settings passed in, or defaults for any settings that are not + * set. */ - public static final BigtableInstanceAdminClient create(BigtableInstanceAdminSettings settings) - throws IOException { - return new BigtableInstanceAdminClient(settings); + public static final BaseBigtableInstanceAdminClient create( + BaseBigtableInstanceAdminSettings settings) throws IOException { + return new BaseBigtableInstanceAdminClient(settings); } /** - * Constructs an instance of BigtableInstanceAdminClient, using the given stub for making calls. - * This is for advanced usage - prefer to use BigtableInstanceAdminSettings}. + * Constructs an instance of BaseBigtableInstanceAdminClient, using the given stub for making + * calls. This is for advanced usage - prefer to use BaseBigtableInstanceAdminSettings}. */ @BetaApi("A restructuring of stub classes is planned, so this may break in the future") - public static final BigtableInstanceAdminClient create(BigtableInstanceAdminStub stub) { - return new BigtableInstanceAdminClient(stub); + public static final BaseBigtableInstanceAdminClient create(BigtableInstanceAdminStub stub) { + return new BaseBigtableInstanceAdminClient(stub); } /** - * Constructs an instance of BigtableInstanceAdminClient, using the given settings. This is + * Constructs an instance of BaseBigtableInstanceAdminClient, using the given settings. This is * protected so that it is easy to make a subclass, but otherwise, the static factory methods * should be preferred. */ - protected BigtableInstanceAdminClient(BigtableInstanceAdminSettings settings) throws IOException { + protected BaseBigtableInstanceAdminClient(BaseBigtableInstanceAdminSettings settings) + throws IOException { this.settings = settings; this.stub = ((BigtableInstanceAdminStubSettings) settings.getStubSettings()).createStub(); this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } @BetaApi("A restructuring of stub classes is planned, so this may break in the future") - protected BigtableInstanceAdminClient(BigtableInstanceAdminStub stub) { + protected BaseBigtableInstanceAdminClient(BigtableInstanceAdminStub stub) { this.settings = null; this.stub = stub; this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } - public final BigtableInstanceAdminSettings getSettings() { + public final BaseBigtableInstanceAdminSettings getSettings() { return settings; } @@ -216,12 +218,12 @@ public final OperationsClient getOperationsClient() { *

Sample code: * * 


-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   String instanceId = "";
    *   Instance instance = Instance.newBuilder().build();
    *   Map<String, Cluster> clusters = new HashMap<>();
-   *   Instance response = bigtableInstanceAdminClient.createInstanceAsync(parent, instanceId, instance, clusters).get();
+   *   Instance response = baseBigtableInstanceAdminClient.createInstanceAsync(parent, instanceId, instance, clusters).get();
    * }
    *
* @@ -258,12 +260,12 @@ public final OperationFuture createInstanceAsy *

Sample code: * * 


-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   String instanceId = "";
    *   Instance instance = Instance.newBuilder().build();
    *   Map<String, Cluster> clusters = new HashMap<>();
-   *   Instance response = bigtableInstanceAdminClient.createInstanceAsync(parent.toString(), instanceId, instance, clusters).get();
+   *   Instance response = baseBigtableInstanceAdminClient.createInstanceAsync(parent.toString(), instanceId, instance, clusters).get();
    * }
    *
* @@ -300,7 +302,7 @@ public final OperationFuture createInstanceAsy *

Sample code: * * 


-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   String instanceId = "";
    *   Instance instance = Instance.newBuilder().build();
@@ -311,7 +313,7 @@ public final OperationFuture createInstanceAsy
    *     .setInstance(instance)
    *     .putAllClusters(clusters)
    *     .build();
-   *   Instance response = bigtableInstanceAdminClient.createInstanceAsync(request).get();
+   *   Instance response = baseBigtableInstanceAdminClient.createInstanceAsync(request).get();
    * }
    *
* @@ -332,7 +334,7 @@ public final OperationFuture createInstanceAsy *

Sample code: * * 


-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   String instanceId = "";
    *   Instance instance = Instance.newBuilder().build();
@@ -343,7 +345,7 @@ public final OperationFuture createInstanceAsy
    *     .setInstance(instance)
    *     .putAllClusters(clusters)
    *     .build();
-   *   OperationFuture<Operation> future = bigtableInstanceAdminClient.createInstanceOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableInstanceAdminClient.createInstanceOperationCallable().futureCall(request);
    *   // Do something
    *   Instance response = future.get();
    * }
@@ -362,7 +364,7 @@ public final OperationFuture createInstanceAsy
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   String instanceId = "";
    *   Instance instance = Instance.newBuilder().build();
@@ -373,7 +375,7 @@ public final OperationFuture createInstanceAsy
    *     .setInstance(instance)
    *     .putAllClusters(clusters)
    *     .build();
-   *   ApiFuture<Operation> future = bigtableInstanceAdminClient.createInstanceCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableInstanceAdminClient.createInstanceCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -390,9 +392,9 @@ public final UnaryCallable createInstanceCalla
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   Instance response = bigtableInstanceAdminClient.getInstance(name);
+   *   Instance response = baseBigtableInstanceAdminClient.getInstance(name);
    * }
    * 

    *
@@ -414,9 +416,9 @@ public final Instance getInstance(InstanceName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   Instance response = bigtableInstanceAdminClient.getInstance(name.toString());
+   *   Instance response = baseBigtableInstanceAdminClient.getInstance(name.toString());
    * }
    * 

    *
@@ -437,12 +439,12 @@ public final Instance getInstance(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   GetInstanceRequest request = GetInstanceRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   Instance response = bigtableInstanceAdminClient.getInstance(request);
+   *   Instance response = baseBigtableInstanceAdminClient.getInstance(request);
    * }
    * 

    *
@@ -460,12 +462,12 @@ private final Instance getInstance(GetInstanceRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   GetInstanceRequest request = GetInstanceRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Instance> future = bigtableInstanceAdminClient.getInstanceCallable().futureCall(request);
+   *   ApiFuture<Instance> future = baseBigtableInstanceAdminClient.getInstanceCallable().futureCall(request);
    *   // Do something
    *   Instance response = future.get();
    * }
@@ -482,9 +484,9 @@ public final UnaryCallable getInstanceCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   ListInstancesResponse response = bigtableInstanceAdminClient.listInstances(parent);
+   *   ListInstancesResponse response = baseBigtableInstanceAdminClient.listInstances(parent);
    * }
    * 

    *
@@ -508,9 +510,9 @@ public final ListInstancesResponse listInstances(ProjectName parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   ListInstancesResponse response = bigtableInstanceAdminClient.listInstances(parent.toString());
+   *   ListInstancesResponse response = baseBigtableInstanceAdminClient.listInstances(parent.toString());
    * }
    * 

    *
@@ -531,12 +533,12 @@ public final ListInstancesResponse listInstances(String parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   ListInstancesRequest request = ListInstancesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ListInstancesResponse response = bigtableInstanceAdminClient.listInstances(request);
+   *   ListInstancesResponse response = baseBigtableInstanceAdminClient.listInstances(request);
    * }
    * 

    *
@@ -554,12 +556,12 @@ public final ListInstancesResponse listInstances(ListInstancesRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   ListInstancesRequest request = ListInstancesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ApiFuture<ListInstancesResponse> future = bigtableInstanceAdminClient.listInstancesCallable().futureCall(request);
+   *   ApiFuture<ListInstancesResponse> future = baseBigtableInstanceAdminClient.listInstancesCallable().futureCall(request);
    *   // Do something
    *   ListInstancesResponse response = future.get();
    * }
@@ -576,10 +578,10 @@ public final UnaryCallable listInst
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   Instance instance = Instance.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   Instance response = bigtableInstanceAdminClient.partialUpdateInstanceAsync(instance, updateMask).get();
+   *   Instance response = baseBigtableInstanceAdminClient.partialUpdateInstanceAsync(instance, updateMask).get();
    * }
    * 

    *
@@ -608,14 +610,14 @@ public final OperationFuture partialUpdateInst
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   Instance instance = Instance.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   PartialUpdateInstanceRequest request = PartialUpdateInstanceRequest.newBuilder()
    *     .setInstance(instance)
    *     .setUpdateMask(updateMask)
    *     .build();
-   *   Instance response = bigtableInstanceAdminClient.partialUpdateInstanceAsync(request).get();
+   *   Instance response = baseBigtableInstanceAdminClient.partialUpdateInstanceAsync(request).get();
    * }
    * 

    *
@@ -636,14 +638,14 @@ public final OperationFuture partialUpdateInst
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   Instance instance = Instance.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   PartialUpdateInstanceRequest request = PartialUpdateInstanceRequest.newBuilder()
    *     .setInstance(instance)
    *     .setUpdateMask(updateMask)
    *     .build();
-   *   OperationFuture<Operation> future = bigtableInstanceAdminClient.partialUpdateInstanceOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableInstanceAdminClient.partialUpdateInstanceOperationCallable().futureCall(request);
    *   // Do something
    *   Instance response = future.get();
    * }
@@ -662,14 +664,14 @@ public final OperationFuture partialUpdateInst
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   Instance instance = Instance.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   PartialUpdateInstanceRequest request = PartialUpdateInstanceRequest.newBuilder()
    *     .setInstance(instance)
    *     .setUpdateMask(updateMask)
    *     .build();
-   *   ApiFuture<Operation> future = bigtableInstanceAdminClient.partialUpdateInstanceCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableInstanceAdminClient.partialUpdateInstanceCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -687,9 +689,9 @@ public final OperationFuture partialUpdateInst
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   bigtableInstanceAdminClient.deleteInstance(name);
+   *   baseBigtableInstanceAdminClient.deleteInstance(name);
    * }
    * 

    *
@@ -711,9 +713,9 @@ public final void deleteInstance(InstanceName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   bigtableInstanceAdminClient.deleteInstance(name.toString());
+   *   baseBigtableInstanceAdminClient.deleteInstance(name.toString());
    * }
    * 

    *
@@ -734,12 +736,12 @@ public final void deleteInstance(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   bigtableInstanceAdminClient.deleteInstance(request);
+   *   baseBigtableInstanceAdminClient.deleteInstance(request);
    * }
    * 

    *
@@ -757,12 +759,12 @@ private final void deleteInstance(DeleteInstanceRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Void> future = bigtableInstanceAdminClient.deleteInstanceCallable().futureCall(request);
+   *   ApiFuture<Void> future = baseBigtableInstanceAdminClient.deleteInstanceCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
@@ -779,11 +781,11 @@ public final UnaryCallable deleteInstanceCallable(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String clusterId = "";
    *   Cluster cluster = Cluster.newBuilder().build();
-   *   Cluster response = bigtableInstanceAdminClient.createClusterAsync(parent, clusterId, cluster).get();
+   *   Cluster response = baseBigtableInstanceAdminClient.createClusterAsync(parent, clusterId, cluster).get();
    * }
    * 

    *
@@ -815,11 +817,11 @@ public final OperationFuture createClusterAsync(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String clusterId = "";
    *   Cluster cluster = Cluster.newBuilder().build();
-   *   Cluster response = bigtableInstanceAdminClient.createClusterAsync(parent.toString(), clusterId, cluster).get();
+   *   Cluster response = baseBigtableInstanceAdminClient.createClusterAsync(parent.toString(), clusterId, cluster).get();
    * }
    * 

    *
@@ -851,7 +853,7 @@ public final OperationFuture createClusterAsync(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String clusterId = "";
    *   Cluster cluster = Cluster.newBuilder().build();
@@ -860,7 +862,7 @@ public final OperationFuture createClusterAsync(
    *     .setClusterId(clusterId)
    *     .setCluster(cluster)
    *     .build();
-   *   Cluster response = bigtableInstanceAdminClient.createClusterAsync(request).get();
+   *   Cluster response = baseBigtableInstanceAdminClient.createClusterAsync(request).get();
    * }
    * 

    *
@@ -881,7 +883,7 @@ public final OperationFuture createClusterAsync(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String clusterId = "";
    *   Cluster cluster = Cluster.newBuilder().build();
@@ -890,7 +892,7 @@ public final OperationFuture createClusterAsync(
    *     .setClusterId(clusterId)
    *     .setCluster(cluster)
    *     .build();
-   *   OperationFuture<Operation> future = bigtableInstanceAdminClient.createClusterOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableInstanceAdminClient.createClusterOperationCallable().futureCall(request);
    *   // Do something
    *   Cluster response = future.get();
    * }
@@ -909,7 +911,7 @@ public final OperationFuture createClusterAsync(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String clusterId = "";
    *   Cluster cluster = Cluster.newBuilder().build();
@@ -918,7 +920,7 @@ public final OperationFuture createClusterAsync(
    *     .setClusterId(clusterId)
    *     .setCluster(cluster)
    *     .build();
-   *   ApiFuture<Operation> future = bigtableInstanceAdminClient.createClusterCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableInstanceAdminClient.createClusterCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -935,9 +937,9 @@ public final UnaryCallable createClusterCallabl
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   Cluster response = bigtableInstanceAdminClient.getCluster(name);
+   *   Cluster response = baseBigtableInstanceAdminClient.getCluster(name);
    * }
    * 

    *
@@ -959,9 +961,9 @@ public final Cluster getCluster(ClusterName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   Cluster response = bigtableInstanceAdminClient.getCluster(name.toString());
+   *   Cluster response = baseBigtableInstanceAdminClient.getCluster(name.toString());
    * }
    * 

    *
@@ -982,12 +984,12 @@ public final Cluster getCluster(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   GetClusterRequest request = GetClusterRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   Cluster response = bigtableInstanceAdminClient.getCluster(request);
+   *   Cluster response = baseBigtableInstanceAdminClient.getCluster(request);
    * }
    * 

    *
@@ -1005,12 +1007,12 @@ private final Cluster getCluster(GetClusterRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   GetClusterRequest request = GetClusterRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Cluster> future = bigtableInstanceAdminClient.getClusterCallable().futureCall(request);
+   *   ApiFuture<Cluster> future = baseBigtableInstanceAdminClient.getClusterCallable().futureCall(request);
    *   // Do something
    *   Cluster response = future.get();
    * }
@@ -1027,9 +1029,9 @@ public final UnaryCallable getClusterCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   ListClustersResponse response = bigtableInstanceAdminClient.listClusters(parent);
+   *   ListClustersResponse response = baseBigtableInstanceAdminClient.listClusters(parent);
    * }
    * 

    *
@@ -1055,9 +1057,9 @@ public final ListClustersResponse listClusters(InstanceName parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   ListClustersResponse response = bigtableInstanceAdminClient.listClusters(parent.toString());
+   *   ListClustersResponse response = baseBigtableInstanceAdminClient.listClusters(parent.toString());
    * }
    * 

    *
@@ -1080,12 +1082,12 @@ public final ListClustersResponse listClusters(String parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListClustersRequest request = ListClustersRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ListClustersResponse response = bigtableInstanceAdminClient.listClusters(request);
+   *   ListClustersResponse response = baseBigtableInstanceAdminClient.listClusters(request);
    * }
    * 

    *
@@ -1103,12 +1105,12 @@ public final ListClustersResponse listClusters(ListClustersRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListClustersRequest request = ListClustersRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ApiFuture<ListClustersResponse> future = bigtableInstanceAdminClient.listClustersCallable().futureCall(request);
+   *   ApiFuture<ListClustersResponse> future = baseBigtableInstanceAdminClient.listClustersCallable().futureCall(request);
    *   // Do something
    *   ListClustersResponse response = future.get();
    * }
@@ -1125,16 +1127,14 @@ public final UnaryCallable listCluste
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   LocationName location = LocationName.of("[PROJECT]", "[LOCATION]");
    *   int serveNodes = 0;
    *   Cluster request = Cluster.newBuilder()
    *     .setName(name.toString())
-   *     .setLocation(location.toString())
    *     .setServeNodes(serveNodes)
    *     .build();
-   *   Cluster response = bigtableInstanceAdminClient.updateClusterAsync(request).get();
+   *   Cluster response = baseBigtableInstanceAdminClient.updateClusterAsync(request).get();
    * }
    * 

    *
@@ -1154,16 +1154,14 @@ public final OperationFuture updateClusterAsync(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   LocationName location = LocationName.of("[PROJECT]", "[LOCATION]");
    *   int serveNodes = 0;
    *   Cluster request = Cluster.newBuilder()
    *     .setName(name.toString())
-   *     .setLocation(location.toString())
    *     .setServeNodes(serveNodes)
    *     .build();
-   *   OperationFuture<Operation> future = bigtableInstanceAdminClient.updateClusterOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableInstanceAdminClient.updateClusterOperationCallable().futureCall(request);
    *   // Do something
    *   Cluster response = future.get();
    * }
@@ -1182,16 +1180,14 @@ public final OperationFuture updateClusterAsync(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   LocationName location = LocationName.of("[PROJECT]", "[LOCATION]");
    *   int serveNodes = 0;
    *   Cluster request = Cluster.newBuilder()
    *     .setName(name.toString())
-   *     .setLocation(location.toString())
    *     .setServeNodes(serveNodes)
    *     .build();
-   *   ApiFuture<Operation> future = bigtableInstanceAdminClient.updateClusterCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableInstanceAdminClient.updateClusterCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -1208,9 +1204,9 @@ public final UnaryCallable updateClusterCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   bigtableInstanceAdminClient.deleteCluster(name);
+   *   baseBigtableInstanceAdminClient.deleteCluster(name);
    * }
    * 

    *
@@ -1232,9 +1228,9 @@ public final void deleteCluster(ClusterName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   bigtableInstanceAdminClient.deleteCluster(name.toString());
+   *   baseBigtableInstanceAdminClient.deleteCluster(name.toString());
    * }
    * 

    *
@@ -1255,12 +1251,12 @@ public final void deleteCluster(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   DeleteClusterRequest request = DeleteClusterRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   bigtableInstanceAdminClient.deleteCluster(request);
+   *   baseBigtableInstanceAdminClient.deleteCluster(request);
    * }
    * 

    *
@@ -1278,12 +1274,12 @@ private final void deleteCluster(DeleteClusterRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   ClusterName name = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   DeleteClusterRequest request = DeleteClusterRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Void> future = bigtableInstanceAdminClient.deleteClusterCallable().futureCall(request);
+   *   ApiFuture<Void> future = baseBigtableInstanceAdminClient.deleteClusterCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
@@ -1300,11 +1296,11 @@ public final UnaryCallable deleteClusterCallable()
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String appProfileId = "";
    *   AppProfile appProfile = AppProfile.newBuilder().build();
-   *   AppProfile response = bigtableInstanceAdminClient.createAppProfile(parent, appProfileId, appProfile);
+   *   AppProfile response = baseBigtableInstanceAdminClient.createAppProfile(parent, appProfileId, appProfile);
    * }
    * 

    *
@@ -1335,11 +1331,11 @@ public final AppProfile createAppProfile(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String appProfileId = "";
    *   AppProfile appProfile = AppProfile.newBuilder().build();
-   *   AppProfile response = bigtableInstanceAdminClient.createAppProfile(parent.toString(), appProfileId, appProfile);
+   *   AppProfile response = baseBigtableInstanceAdminClient.createAppProfile(parent.toString(), appProfileId, appProfile);
    * }
    * 

    *
@@ -1370,7 +1366,7 @@ public final AppProfile createAppProfile(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String appProfileId = "";
    *   AppProfile appProfile = AppProfile.newBuilder().build();
@@ -1379,7 +1375,7 @@ public final AppProfile createAppProfile(
    *     .setAppProfileId(appProfileId)
    *     .setAppProfile(appProfile)
    *     .build();
-   *   AppProfile response = bigtableInstanceAdminClient.createAppProfile(request);
+   *   AppProfile response = baseBigtableInstanceAdminClient.createAppProfile(request);
    * }
    * 

    *
@@ -1397,7 +1393,7 @@ public final AppProfile createAppProfile(CreateAppProfileRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String appProfileId = "";
    *   AppProfile appProfile = AppProfile.newBuilder().build();
@@ -1406,7 +1402,7 @@ public final AppProfile createAppProfile(CreateAppProfileRequest request) {
    *     .setAppProfileId(appProfileId)
    *     .setAppProfile(appProfile)
    *     .build();
-   *   ApiFuture<AppProfile> future = bigtableInstanceAdminClient.createAppProfileCallable().futureCall(request);
+   *   ApiFuture<AppProfile> future = baseBigtableInstanceAdminClient.createAppProfileCallable().futureCall(request);
    *   // Do something
    *   AppProfile response = future.get();
    * }
@@ -1423,9 +1419,9 @@ public final UnaryCallable createAppProfile
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
-   *   AppProfile response = bigtableInstanceAdminClient.getAppProfile(name);
+   *   AppProfile response = baseBigtableInstanceAdminClient.getAppProfile(name);
    * }
    * 

    *
@@ -1447,9 +1443,9 @@ public final AppProfile getAppProfile(AppProfileName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
-   *   AppProfile response = bigtableInstanceAdminClient.getAppProfile(name.toString());
+   *   AppProfile response = baseBigtableInstanceAdminClient.getAppProfile(name.toString());
    * }
    * 

    *
@@ -1470,12 +1466,12 @@ public final AppProfile getAppProfile(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
    *   GetAppProfileRequest request = GetAppProfileRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   AppProfile response = bigtableInstanceAdminClient.getAppProfile(request);
+   *   AppProfile response = baseBigtableInstanceAdminClient.getAppProfile(request);
    * }
    * 

    *
@@ -1493,12 +1489,12 @@ private final AppProfile getAppProfile(GetAppProfileRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
    *   GetAppProfileRequest request = GetAppProfileRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<AppProfile> future = bigtableInstanceAdminClient.getAppProfileCallable().futureCall(request);
+   *   ApiFuture<AppProfile> future = baseBigtableInstanceAdminClient.getAppProfileCallable().futureCall(request);
    *   // Do something
    *   AppProfile response = future.get();
    * }
@@ -1515,9 +1511,9 @@ public final UnaryCallable getAppProfileCallab
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   for (AppProfile element : bigtableInstanceAdminClient.listAppProfiles(parent).iterateAll()) {
+   *   for (AppProfile element : baseBigtableInstanceAdminClient.listAppProfiles(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1542,9 +1538,9 @@ public final ListAppProfilesPagedResponse listAppProfiles(InstanceName parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   for (AppProfile element : bigtableInstanceAdminClient.listAppProfiles(parent.toString()).iterateAll()) {
+   *   for (AppProfile element : baseBigtableInstanceAdminClient.listAppProfiles(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1566,12 +1562,12 @@ public final ListAppProfilesPagedResponse listAppProfiles(String parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListAppProfilesRequest request = ListAppProfilesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   for (AppProfile element : bigtableInstanceAdminClient.listAppProfiles(request).iterateAll()) {
+   *   for (AppProfile element : baseBigtableInstanceAdminClient.listAppProfiles(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1591,12 +1587,12 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListAppProfilesRequest request = ListAppProfilesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ApiFuture<ListAppProfilesPagedResponse> future = bigtableInstanceAdminClient.listAppProfilesPagedCallable().futureCall(request);
+   *   ApiFuture<ListAppProfilesPagedResponse> future = baseBigtableInstanceAdminClient.listAppProfilesPagedCallable().futureCall(request);
    *   // Do something
    *   for (AppProfile element : future.get().iterateAll()) {
    *     // doThingsWith(element);
@@ -1616,13 +1612,13 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListAppProfilesRequest request = ListAppProfilesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
    *   while (true) {
-   *     ListAppProfilesResponse response = bigtableInstanceAdminClient.listAppProfilesCallable().call(request);
+   *     ListAppProfilesResponse response = baseBigtableInstanceAdminClient.listAppProfilesCallable().call(request);
    *     for (AppProfile element : response.getAppProfilesList()) {
    *       // doThingsWith(element);
    *     }
@@ -1648,10 +1644,10 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfile appProfile = AppProfile.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   AppProfile response = bigtableInstanceAdminClient.updateAppProfileAsync(appProfile, updateMask).get();
+   *   AppProfile response = baseBigtableInstanceAdminClient.updateAppProfileAsync(appProfile, updateMask).get();
    * }
    * 

    *
@@ -1680,14 +1676,14 @@ public final OperationFuture updateAppProf
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfile appProfile = AppProfile.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   UpdateAppProfileRequest request = UpdateAppProfileRequest.newBuilder()
    *     .setAppProfile(appProfile)
    *     .setUpdateMask(updateMask)
    *     .build();
-   *   AppProfile response = bigtableInstanceAdminClient.updateAppProfileAsync(request).get();
+   *   AppProfile response = baseBigtableInstanceAdminClient.updateAppProfileAsync(request).get();
    * }
    * 

    *
@@ -1708,14 +1704,14 @@ public final OperationFuture updateAppProf
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfile appProfile = AppProfile.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   UpdateAppProfileRequest request = UpdateAppProfileRequest.newBuilder()
    *     .setAppProfile(appProfile)
    *     .setUpdateMask(updateMask)
    *     .build();
-   *   OperationFuture<Operation> future = bigtableInstanceAdminClient.updateAppProfileOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableInstanceAdminClient.updateAppProfileOperationCallable().futureCall(request);
    *   // Do something
    *   AppProfile response = future.get();
    * }
@@ -1734,14 +1730,14 @@ public final OperationFuture updateAppProf
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfile appProfile = AppProfile.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   UpdateAppProfileRequest request = UpdateAppProfileRequest.newBuilder()
    *     .setAppProfile(appProfile)
    *     .setUpdateMask(updateMask)
    *     .build();
-   *   ApiFuture<Operation> future = bigtableInstanceAdminClient.updateAppProfileCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableInstanceAdminClient.updateAppProfileCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -1758,9 +1754,9 @@ public final UnaryCallable updateAppProfileC
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
-   *   bigtableInstanceAdminClient.deleteAppProfile(name);
+   *   baseBigtableInstanceAdminClient.deleteAppProfile(name);
    * }
    * 

    *
@@ -1782,9 +1778,9 @@ public final void deleteAppProfile(AppProfileName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
-   *   bigtableInstanceAdminClient.deleteAppProfile(name.toString());
+   *   baseBigtableInstanceAdminClient.deleteAppProfile(name.toString());
    * }
    * 

    *
@@ -1805,14 +1801,14 @@ public final void deleteAppProfile(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
    *   boolean ignoreWarnings = false;
    *   DeleteAppProfileRequest request = DeleteAppProfileRequest.newBuilder()
    *     .setName(name.toString())
    *     .setIgnoreWarnings(ignoreWarnings)
    *     .build();
-   *   bigtableInstanceAdminClient.deleteAppProfile(request);
+   *   baseBigtableInstanceAdminClient.deleteAppProfile(request);
    * }
    * 

    *
@@ -1830,14 +1826,14 @@ public final void deleteAppProfile(DeleteAppProfileRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
    *   boolean ignoreWarnings = false;
    *   DeleteAppProfileRequest request = DeleteAppProfileRequest.newBuilder()
    *     .setName(name.toString())
    *     .setIgnoreWarnings(ignoreWarnings)
    *     .build();
-   *   ApiFuture<Void> future = bigtableInstanceAdminClient.deleteAppProfileCallable().futureCall(request);
+   *   ApiFuture<Void> future = baseBigtableInstanceAdminClient.deleteAppProfileCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
@@ -1855,9 +1851,9 @@ public final UnaryCallable deleteAppProfileCalla
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
-   *   Policy response = bigtableInstanceAdminClient.getIamPolicy(formattedResource);
+   *   Policy response = baseBigtableInstanceAdminClient.getIamPolicy(formattedResource);
    * }
    * 

    *
@@ -1880,12 +1876,12 @@ public final Policy getIamPolicy(String resource) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
    *     .setResource(formattedResource)
    *     .build();
-   *   Policy response = bigtableInstanceAdminClient.getIamPolicy(request);
+   *   Policy response = baseBigtableInstanceAdminClient.getIamPolicy(request);
    * }
    * 

    *
@@ -1904,12 +1900,12 @@ private final Policy getIamPolicy(GetIamPolicyRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
    *     .setResource(formattedResource)
    *     .build();
-   *   ApiFuture<Policy> future = bigtableInstanceAdminClient.getIamPolicyCallable().futureCall(request);
+   *   ApiFuture<Policy> future = baseBigtableInstanceAdminClient.getIamPolicyCallable().futureCall(request);
    *   // Do something
    *   Policy response = future.get();
    * }
@@ -1926,10 +1922,10 @@ public final UnaryCallable getIamPolicyCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   Policy policy = Policy.newBuilder().build();
-   *   Policy response = bigtableInstanceAdminClient.setIamPolicy(formattedResource, policy);
+   *   Policy response = baseBigtableInstanceAdminClient.setIamPolicy(formattedResource, policy);
    * }
    * 

    *
@@ -1955,14 +1951,14 @@ public final Policy setIamPolicy(String resource, Policy policy) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   Policy policy = Policy.newBuilder().build();
    *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
    *     .setResource(formattedResource)
    *     .setPolicy(policy)
    *     .build();
-   *   Policy response = bigtableInstanceAdminClient.setIamPolicy(request);
+   *   Policy response = baseBigtableInstanceAdminClient.setIamPolicy(request);
    * }
    * 

    *
@@ -1980,14 +1976,14 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   Policy policy = Policy.newBuilder().build();
    *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
    *     .setResource(formattedResource)
    *     .setPolicy(policy)
    *     .build();
-   *   ApiFuture<Policy> future = bigtableInstanceAdminClient.setIamPolicyCallable().futureCall(request);
+   *   ApiFuture<Policy> future = baseBigtableInstanceAdminClient.setIamPolicyCallable().futureCall(request);
    *   // Do something
    *   Policy response = future.get();
    * }
@@ -2004,10 +2000,10 @@ public final UnaryCallable setIamPolicyCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   List<String> permissions = new ArrayList<>();
-   *   TestIamPermissionsResponse response = bigtableInstanceAdminClient.testIamPermissions(formattedResource, permissions);
+   *   TestIamPermissionsResponse response = baseBigtableInstanceAdminClient.testIamPermissions(formattedResource, permissions);
    * }
    * 

    *
@@ -2037,14 +2033,14 @@ public final TestIamPermissionsResponse testIamPermissions(
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   List<String> permissions = new ArrayList<>();
    *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
    *     .setResource(formattedResource)
    *     .addAllPermissions(permissions)
    *     .build();
-   *   TestIamPermissionsResponse response = bigtableInstanceAdminClient.testIamPermissions(request);
+   *   TestIamPermissionsResponse response = baseBigtableInstanceAdminClient.testIamPermissions(request);
    * }
    * 

    *
@@ -2062,14 +2058,14 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * 
Sample code:
    *
    * 

-   * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+   * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   String formattedResource = InstanceName.format("[PROJECT]", "[INSTANCE]");
    *   List<String> permissions = new ArrayList<>();
    *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
    *     .setResource(formattedResource)
    *     .addAllPermissions(permissions)
    *     .build();
-   *   ApiFuture<TestIamPermissionsResponse> future = bigtableInstanceAdminClient.testIamPermissionsCallable().futureCall(request);
+   *   ApiFuture<TestIamPermissionsResponse> future = baseBigtableInstanceAdminClient.testIamPermissionsCallable().futureCall(request);
    *   // Do something
    *   TestIamPermissionsResponse response = future.get();
    * }
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java
similarity index 94%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java
index be3c9e201fc9..8069e05658b6 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.admin.v2;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
@@ -68,7 +68,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * Settings class to configure an instance of {@link BigtableInstanceAdminClient}.
+ * Settings class to configure an instance of {@link BaseBigtableInstanceAdminClient}.
  *
  * 
The default instance has everything set to sensible defaults:
  *
@@ -84,17 +84,18 @@
  *
  * 
  * 
- * BigtableInstanceAdminSettings.Builder bigtableInstanceAdminSettingsBuilder =
- *     BigtableInstanceAdminSettings.newBuilder();
- * bigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
+ * BaseBigtableInstanceAdminSettings.Builder baseBigtableInstanceAdminSettingsBuilder =
+ *     BaseBigtableInstanceAdminSettings.newBuilder();
+ * baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
- * BigtableInstanceAdminSettings bigtableInstanceAdminSettings = bigtableInstanceAdminSettingsBuilder.build();
+ * BaseBigtableInstanceAdminSettings baseBigtableInstanceAdminSettings = baseBigtableInstanceAdminSettingsBuilder.build();
  * 
  * 

  */
 @Generated("by gapic-generator")
 @BetaApi
-public class BigtableInstanceAdminSettings extends ClientSettings {
+public class BaseBigtableInstanceAdminSettings
+    extends ClientSettings {
   /** Returns the object with the settings used for calls to createInstance. */
   public UnaryCallSettings createInstanceSettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings()).createInstanceSettings();
@@ -232,9 +233,9 @@ public UnaryCallSettings setIamPolicySettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings()).testIamPermissionsSettings();
   }
 
-  public static final BigtableInstanceAdminSettings create(BigtableInstanceAdminStubSettings stub)
-      throws IOException {
-    return new BigtableInstanceAdminSettings.Builder(stub.toBuilder()).build();
+  public static final BaseBigtableInstanceAdminSettings create(
+      BigtableInstanceAdminStubSettings stub) throws IOException {
+    return new BaseBigtableInstanceAdminSettings.Builder(stub.toBuilder()).build();
   }
 
   /** Returns a builder for the default ExecutorProvider for this service. */
@@ -286,13 +287,13 @@ public Builder toBuilder() {
     return new Builder(this);
   }
 
-  protected BigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
+  protected BaseBigtableInstanceAdminSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
   }
 
-  /** Builder for BigtableInstanceAdminSettings. */
+  /** Builder for BaseBigtableInstanceAdminSettings. */
   public static class Builder
-      extends ClientSettings.Builder {
+      extends ClientSettings.Builder {
     protected Builder() throws IOException {
       this((ClientContext) null);
     }
@@ -305,7 +306,7 @@ private static Builder createDefault() {
       return new Builder(BigtableInstanceAdminStubSettings.newBuilder());
     }
 
-    protected Builder(BigtableInstanceAdminSettings settings) {
+    protected Builder(BaseBigtableInstanceAdminSettings settings) {
       super(settings.getStubSettings().toBuilder());
     }
 
@@ -471,8 +472,8 @@ public UnaryCallSettings.Builder setIamPolicySettin
     }
 
     @Override
-    public BigtableInstanceAdminSettings build() throws IOException {
-      return new BigtableInstanceAdminSettings(this);
+    public BaseBigtableInstanceAdminSettings build() throws IOException {
+      return new BaseBigtableInstanceAdminSettings(this);
     }
   }
 }
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
similarity index 83%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
index 79e8e7d0bdd1..168d78d71cd3 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
@@ -74,18 +74,18 @@
  *
  * 
  * 
- * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+ * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
  *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
  *   String tableId = "";
  *   Table table = Table.newBuilder().build();
- *   Table response = bigtableTableAdminClient.createTable(parent, tableId, table);
+ *   Table response = baseBigtableTableAdminClient.createTable(parent, tableId, table);
  * }
  * 
  * 

  *
- * 
Note: close() needs to be called on the bigtableTableAdminClient object to clean up resources
- * such as threads. In the example above, try-with-resources is used, which automatically calls
- * close().
+ * 
Note: close() needs to be called on the baseBigtableTableAdminClient object to clean up
+ * resources such as threads. In the example above, try-with-resources is used, which automatically
+ * calls close().
  *
  * 
The surface of this class includes several types of Java methods for each of the API's
  * methods:
@@ -107,19 +107,19 @@
  * these names, this class includes a format method for each type of name, and additionally a parse
  * method to extract the individual identifiers contained within names that are returned.
  *
- * 
This class can be customized by passing in a custom instance of BigtableTableAdminSettings to
- * create(). For example:
+ * 
This class can be customized by passing in a custom instance of BaseBigtableTableAdminSettings
+ * to create(). For example:
  *
  * 
To customize credentials:
  *
  * 
  * 
- * BigtableTableAdminSettings bigtableTableAdminSettings =
- *     BigtableTableAdminSettings.newBuilder()
+ * BaseBigtableTableAdminSettings baseBigtableTableAdminSettings =
+ *     BaseBigtableTableAdminSettings.newBuilder()
  *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
- * BigtableTableAdminClient bigtableTableAdminClient =
- *     BigtableTableAdminClient.create(bigtableTableAdminSettings);
+ * BaseBigtableTableAdminClient baseBigtableTableAdminClient =
+ *     BaseBigtableTableAdminClient.create(baseBigtableTableAdminSettings);
  * 
  * 

  *
@@ -127,62 +127,63 @@
  *
  * 
  * 
- * BigtableTableAdminSettings bigtableTableAdminSettings =
- *     BigtableTableAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
- * BigtableTableAdminClient bigtableTableAdminClient =
- *     BigtableTableAdminClient.create(bigtableTableAdminSettings);
+ * BaseBigtableTableAdminSettings baseBigtableTableAdminSettings =
+ *     BaseBigtableTableAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * BaseBigtableTableAdminClient baseBigtableTableAdminClient =
+ *     BaseBigtableTableAdminClient.create(baseBigtableTableAdminSettings);
  * 
  * 

  */
 @Generated("by gapic-generator")
 @BetaApi
-public class BigtableTableAdminClient implements BackgroundResource {
-  private final BigtableTableAdminSettings settings;
+public class BaseBigtableTableAdminClient implements BackgroundResource {
+  private final BaseBigtableTableAdminSettings settings;
   private final BigtableTableAdminStub stub;
   private final OperationsClient operationsClient;
 
-  /** Constructs an instance of BigtableTableAdminClient with default settings. */
-  public static final BigtableTableAdminClient create() throws IOException {
-    return create(BigtableTableAdminSettings.newBuilder().build());
+  /** Constructs an instance of BaseBigtableTableAdminClient with default settings. */
+  public static final BaseBigtableTableAdminClient create() throws IOException {
+    return create(BaseBigtableTableAdminSettings.newBuilder().build());
   }
 
   /**
-   * Constructs an instance of BigtableTableAdminClient, using the given settings. The channels are
-   * created based on the settings passed in, or defaults for any settings that are not set.
+   * Constructs an instance of BaseBigtableTableAdminClient, using the given settings. The channels
+   * are created based on the settings passed in, or defaults for any settings that are not set.
    */
-  public static final BigtableTableAdminClient create(BigtableTableAdminSettings settings)
+  public static final BaseBigtableTableAdminClient create(BaseBigtableTableAdminSettings settings)
       throws IOException {
-    return new BigtableTableAdminClient(settings);
+    return new BaseBigtableTableAdminClient(settings);
   }
 
   /**
-   * Constructs an instance of BigtableTableAdminClient, using the given stub for making calls. This
-   * is for advanced usage - prefer to use BigtableTableAdminSettings}.
+   * Constructs an instance of BaseBigtableTableAdminClient, using the given stub for making calls.
+   * This is for advanced usage - prefer to use BaseBigtableTableAdminSettings}.
    */
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-  public static final BigtableTableAdminClient create(BigtableTableAdminStub stub) {
-    return new BigtableTableAdminClient(stub);
+  public static final BaseBigtableTableAdminClient create(BigtableTableAdminStub stub) {
+    return new BaseBigtableTableAdminClient(stub);
   }
 
   /**
-   * Constructs an instance of BigtableTableAdminClient, using the given settings. This is protected
-   * so that it is easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
+   * Constructs an instance of BaseBigtableTableAdminClient, using the given settings. This is
+   * protected so that it is easy to make a subclass, but otherwise, the static factory methods
+   * should be preferred.
    */
-  protected BigtableTableAdminClient(BigtableTableAdminSettings settings) throws IOException {
+  protected BaseBigtableTableAdminClient(BaseBigtableTableAdminSettings settings)
+      throws IOException {
     this.settings = settings;
     this.stub = ((BigtableTableAdminStubSettings) settings.getStubSettings()).createStub();
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-  protected BigtableTableAdminClient(BigtableTableAdminStub stub) {
+  protected BaseBigtableTableAdminClient(BigtableTableAdminStub stub) {
     this.settings = null;
     this.stub = stub;
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  public final BigtableTableAdminSettings getSettings() {
+  public final BaseBigtableTableAdminSettings getSettings() {
     return settings;
   }
 
@@ -209,11 +210,11 @@ public final OperationsClient getOperationsClient() {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   Table table = Table.newBuilder().build();
-   *   Table response = bigtableTableAdminClient.createTable(parent, tableId, table);
+   *   Table response = baseBigtableTableAdminClient.createTable(parent, tableId, table);
    * }
    * 

    *
@@ -243,11 +244,11 @@ public final Table createTable(InstanceName parent, String tableId, Table table)
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   Table table = Table.newBuilder().build();
-   *   Table response = bigtableTableAdminClient.createTable(parent.toString(), tableId, table);
+   *   Table response = baseBigtableTableAdminClient.createTable(parent.toString(), tableId, table);
    * }
    * 

    *
@@ -277,7 +278,7 @@ public final Table createTable(String parent, String tableId, Table table) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   Table table = Table.newBuilder().build();
@@ -286,7 +287,7 @@ public final Table createTable(String parent, String tableId, Table table) {
    *     .setTableId(tableId)
    *     .setTable(table)
    *     .build();
-   *   Table response = bigtableTableAdminClient.createTable(request);
+   *   Table response = baseBigtableTableAdminClient.createTable(request);
    * }
    * 

    *
@@ -305,7 +306,7 @@ public final Table createTable(CreateTableRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   Table table = Table.newBuilder().build();
@@ -314,7 +315,7 @@ public final Table createTable(CreateTableRequest request) {
    *     .setTableId(tableId)
    *     .setTable(table)
    *     .build();
-   *   ApiFuture<Table> future = bigtableTableAdminClient.createTableCallable().futureCall(request);
+   *   ApiFuture<Table> future = baseBigtableTableAdminClient.createTableCallable().futureCall(request);
    *   // Do something
    *   Table response = future.get();
    * }
@@ -337,11 +338,11 @@ public final UnaryCallable createTableCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   SnapshotName sourceSnapshot = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
-   *   Table response = bigtableTableAdminClient.createTableFromSnapshotAsync(parent, tableId, sourceSnapshot).get();
+   *   Table response = baseBigtableTableAdminClient.createTableFromSnapshotAsync(parent, tableId, sourceSnapshot).get();
    * }
    * 

    *
@@ -381,11 +382,11 @@ public final OperationFuture createTable
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   SnapshotName sourceSnapshot = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
-   *   Table response = bigtableTableAdminClient.createTableFromSnapshotAsync(parent.toString(), tableId, sourceSnapshot.toString()).get();
+   *   Table response = baseBigtableTableAdminClient.createTableFromSnapshotAsync(parent.toString(), tableId, sourceSnapshot.toString()).get();
    * }
    * 

    *
@@ -425,7 +426,7 @@ public final OperationFuture createTable
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   SnapshotName sourceSnapshot = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
@@ -434,7 +435,7 @@ public final OperationFuture createTable
    *     .setTableId(tableId)
    *     .setSourceSnapshot(sourceSnapshot.toString())
    *     .build();
-   *   Table response = bigtableTableAdminClient.createTableFromSnapshotAsync(request).get();
+   *   Table response = baseBigtableTableAdminClient.createTableFromSnapshotAsync(request).get();
    * }
    * 

    *
@@ -461,7 +462,7 @@ public final OperationFuture createTable
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   SnapshotName sourceSnapshot = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
@@ -470,7 +471,7 @@ public final OperationFuture createTable
    *     .setTableId(tableId)
    *     .setSourceSnapshot(sourceSnapshot.toString())
    *     .build();
-   *   OperationFuture<Operation> future = bigtableTableAdminClient.createTableFromSnapshotOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableTableAdminClient.createTableFromSnapshotOperationCallable().futureCall(request);
    *   // Do something
    *   Table response = future.get();
    * }
@@ -496,7 +497,7 @@ public final OperationFuture createTable
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   String tableId = "";
    *   SnapshotName sourceSnapshot = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
@@ -505,7 +506,7 @@ public final OperationFuture createTable
    *     .setTableId(tableId)
    *     .setSourceSnapshot(sourceSnapshot.toString())
    *     .build();
-   *   ApiFuture<Operation> future = bigtableTableAdminClient.createTableFromSnapshotCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableTableAdminClient.createTableFromSnapshotCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -523,9 +524,9 @@ public final OperationFuture createTable
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   for (Table element : bigtableTableAdminClient.listTables(parent).iterateAll()) {
+   *   for (Table element : baseBigtableTableAdminClient.listTables(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -548,9 +549,9 @@ public final ListTablesPagedResponse listTables(InstanceName parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
-   *   for (Table element : bigtableTableAdminClient.listTables(parent.toString()).iterateAll()) {
+   *   for (Table element : baseBigtableTableAdminClient.listTables(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -572,12 +573,12 @@ public final ListTablesPagedResponse listTables(String parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListTablesRequest request = ListTablesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   for (Table element : bigtableTableAdminClient.listTables(request).iterateAll()) {
+   *   for (Table element : baseBigtableTableAdminClient.listTables(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -597,12 +598,12 @@ public final ListTablesPagedResponse listTables(ListTablesRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListTablesRequest request = ListTablesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ApiFuture<ListTablesPagedResponse> future = bigtableTableAdminClient.listTablesPagedCallable().futureCall(request);
+   *   ApiFuture<ListTablesPagedResponse> future = baseBigtableTableAdminClient.listTablesPagedCallable().futureCall(request);
    *   // Do something
    *   for (Table element : future.get().iterateAll()) {
    *     // doThingsWith(element);
@@ -621,13 +622,13 @@ public final UnaryCallable listTable
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
    *   ListTablesRequest request = ListTablesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
    *   while (true) {
-   *     ListTablesResponse response = bigtableTableAdminClient.listTablesCallable().call(request);
+   *     ListTablesResponse response = baseBigtableTableAdminClient.listTablesCallable().call(request);
    *     for (Table element : response.getTablesList()) {
    *       // doThingsWith(element);
    *     }
@@ -652,9 +653,9 @@ public final UnaryCallable listTablesCall
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
-   *   Table response = bigtableTableAdminClient.getTable(name);
+   *   Table response = baseBigtableTableAdminClient.getTable(name);
    * }
    * 

    *
@@ -676,9 +677,9 @@ public final Table getTable(TableName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
-   *   Table response = bigtableTableAdminClient.getTable(name.toString());
+   *   Table response = baseBigtableTableAdminClient.getTable(name.toString());
    * }
    * 

    *
@@ -699,12 +700,12 @@ public final Table getTable(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   GetTableRequest request = GetTableRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   Table response = bigtableTableAdminClient.getTable(request);
+   *   Table response = baseBigtableTableAdminClient.getTable(request);
    * }
    * 

    *
@@ -722,12 +723,12 @@ public final Table getTable(GetTableRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   GetTableRequest request = GetTableRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Table> future = bigtableTableAdminClient.getTableCallable().futureCall(request);
+   *   ApiFuture<Table> future = baseBigtableTableAdminClient.getTableCallable().futureCall(request);
    *   // Do something
    *   Table response = future.get();
    * }
@@ -744,9 +745,9 @@ public final UnaryCallable getTableCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
-   *   bigtableTableAdminClient.deleteTable(name);
+   *   baseBigtableTableAdminClient.deleteTable(name);
    * }
    * 

    *
@@ -768,9 +769,9 @@ public final void deleteTable(TableName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
-   *   bigtableTableAdminClient.deleteTable(name.toString());
+   *   baseBigtableTableAdminClient.deleteTable(name.toString());
    * }
    * 

    *
@@ -791,12 +792,12 @@ public final void deleteTable(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   DeleteTableRequest request = DeleteTableRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   bigtableTableAdminClient.deleteTable(request);
+   *   baseBigtableTableAdminClient.deleteTable(request);
    * }
    * 

    *
@@ -814,12 +815,12 @@ private final void deleteTable(DeleteTableRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   DeleteTableRequest request = DeleteTableRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Void> future = bigtableTableAdminClient.deleteTableCallable().futureCall(request);
+   *   ApiFuture<Void> future = baseBigtableTableAdminClient.deleteTableCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
@@ -838,10 +839,10 @@ public final UnaryCallable deleteTableCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   List<ModifyColumnFamiliesRequest.Modification> modifications = new ArrayList<>();
-   *   Table response = bigtableTableAdminClient.modifyColumnFamilies(name, modifications);
+   *   Table response = baseBigtableTableAdminClient.modifyColumnFamilies(name, modifications);
    * }
    * 

    *
@@ -872,10 +873,10 @@ public final Table modifyColumnFamilies(
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   List<ModifyColumnFamiliesRequest.Modification> modifications = new ArrayList<>();
-   *   Table response = bigtableTableAdminClient.modifyColumnFamilies(name.toString(), modifications);
+   *   Table response = baseBigtableTableAdminClient.modifyColumnFamilies(name.toString(), modifications);
    * }
    * 

    *
@@ -906,14 +907,14 @@ public final Table modifyColumnFamilies(
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   List<ModifyColumnFamiliesRequest.Modification> modifications = new ArrayList<>();
    *   ModifyColumnFamiliesRequest request = ModifyColumnFamiliesRequest.newBuilder()
    *     .setName(name.toString())
    *     .addAllModifications(modifications)
    *     .build();
-   *   Table response = bigtableTableAdminClient.modifyColumnFamilies(request);
+   *   Table response = baseBigtableTableAdminClient.modifyColumnFamilies(request);
    * }
    * 

    *
@@ -933,14 +934,14 @@ public final Table modifyColumnFamilies(ModifyColumnFamiliesRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   List<ModifyColumnFamiliesRequest.Modification> modifications = new ArrayList<>();
    *   ModifyColumnFamiliesRequest request = ModifyColumnFamiliesRequest.newBuilder()
    *     .setName(name.toString())
    *     .addAllModifications(modifications)
    *     .build();
-   *   ApiFuture<Table> future = bigtableTableAdminClient.modifyColumnFamiliesCallable().futureCall(request);
+   *   ApiFuture<Table> future = baseBigtableTableAdminClient.modifyColumnFamiliesCallable().futureCall(request);
    *   // Do something
    *   Table response = future.get();
    * }
@@ -958,12 +959,12 @@ public final UnaryCallable modifyColumnFamil
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   DropRowRangeRequest request = DropRowRangeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   bigtableTableAdminClient.dropRowRange(request);
+   *   baseBigtableTableAdminClient.dropRowRange(request);
    * }
    * 

    *
@@ -982,12 +983,12 @@ public final void dropRowRange(DropRowRangeRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   DropRowRangeRequest request = DropRowRangeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Void> future = bigtableTableAdminClient.dropRowRangeCallable().futureCall(request);
+   *   ApiFuture<Void> future = baseBigtableTableAdminClient.dropRowRangeCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
@@ -1006,9 +1007,9 @@ public final UnaryCallable dropRowRangeCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
-   *   GenerateConsistencyTokenResponse response = bigtableTableAdminClient.generateConsistencyToken(name);
+   *   GenerateConsistencyTokenResponse response = baseBigtableTableAdminClient.generateConsistencyToken(name);
    * }
    * 

    *
@@ -1034,9 +1035,9 @@ public final GenerateConsistencyTokenResponse generateConsistencyToken(TableName
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
-   *   GenerateConsistencyTokenResponse response = bigtableTableAdminClient.generateConsistencyToken(name.toString());
+   *   GenerateConsistencyTokenResponse response = baseBigtableTableAdminClient.generateConsistencyToken(name.toString());
    * }
    * 

    *
@@ -1060,12 +1061,12 @@ public final GenerateConsistencyTokenResponse generateConsistencyToken(String na
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   GenerateConsistencyTokenRequest request = GenerateConsistencyTokenRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   GenerateConsistencyTokenResponse response = bigtableTableAdminClient.generateConsistencyToken(request);
+   *   GenerateConsistencyTokenResponse response = baseBigtableTableAdminClient.generateConsistencyToken(request);
    * }
    * 

    *
@@ -1086,12 +1087,12 @@ private final GenerateConsistencyTokenResponse generateConsistencyToken(
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   GenerateConsistencyTokenRequest request = GenerateConsistencyTokenRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<GenerateConsistencyTokenResponse> future = bigtableTableAdminClient.generateConsistencyTokenCallable().futureCall(request);
+   *   ApiFuture<GenerateConsistencyTokenResponse> future = baseBigtableTableAdminClient.generateConsistencyTokenCallable().futureCall(request);
    *   // Do something
    *   GenerateConsistencyTokenResponse response = future.get();
    * }
@@ -1110,10 +1111,10 @@ private final GenerateConsistencyTokenResponse generateConsistencyToken(
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   String consistencyToken = "";
-   *   CheckConsistencyResponse response = bigtableTableAdminClient.checkConsistency(name, consistencyToken);
+   *   CheckConsistencyResponse response = baseBigtableTableAdminClient.checkConsistency(name, consistencyToken);
    * }
    * 

    *
@@ -1140,10 +1141,10 @@ public final CheckConsistencyResponse checkConsistency(TableName name, String co
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   String consistencyToken = "";
-   *   CheckConsistencyResponse response = bigtableTableAdminClient.checkConsistency(name.toString(), consistencyToken);
+   *   CheckConsistencyResponse response = baseBigtableTableAdminClient.checkConsistency(name.toString(), consistencyToken);
    * }
    * 

    *
@@ -1170,14 +1171,14 @@ public final CheckConsistencyResponse checkConsistency(String name, String consi
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   String consistencyToken = "";
    *   CheckConsistencyRequest request = CheckConsistencyRequest.newBuilder()
    *     .setName(name.toString())
    *     .setConsistencyToken(consistencyToken)
    *     .build();
-   *   CheckConsistencyResponse response = bigtableTableAdminClient.checkConsistency(request);
+   *   CheckConsistencyResponse response = baseBigtableTableAdminClient.checkConsistency(request);
    * }
    * 

    *
@@ -1196,14 +1197,14 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   String consistencyToken = "";
    *   CheckConsistencyRequest request = CheckConsistencyRequest.newBuilder()
    *     .setName(name.toString())
    *     .setConsistencyToken(consistencyToken)
    *     .build();
-   *   ApiFuture<CheckConsistencyResponse> future = bigtableTableAdminClient.checkConsistencyCallable().futureCall(request);
+   *   ApiFuture<CheckConsistencyResponse> future = baseBigtableTableAdminClient.checkConsistencyCallable().futureCall(request);
    *   // Do something
    *   CheckConsistencyResponse response = future.get();
    * }
@@ -1227,12 +1228,12 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   ClusterName cluster = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   SnapshotName snapshotId = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
    *   String description = "";
-   *   Snapshot response = bigtableTableAdminClient.snapshotTableAsync(name, cluster, snapshotId, description).get();
+   *   Snapshot response = baseBigtableTableAdminClient.snapshotTableAsync(name, cluster, snapshotId, description).get();
    * }
    * 

    *
@@ -1274,12 +1275,12 @@ public final OperationFuture snapshotTableAsync
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   ClusterName cluster = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   SnapshotName snapshotId = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
    *   String description = "";
-   *   Snapshot response = bigtableTableAdminClient.snapshotTableAsync(name.toString(), cluster.toString(), snapshotId.toString(), description).get();
+   *   Snapshot response = baseBigtableTableAdminClient.snapshotTableAsync(name.toString(), cluster.toString(), snapshotId.toString(), description).get();
    * }
    * 

    *
@@ -1321,7 +1322,7 @@ public final OperationFuture snapshotTableAsync
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   ClusterName cluster = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   SnapshotName snapshotId = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
@@ -1332,7 +1333,7 @@ public final OperationFuture snapshotTableAsync
    *     .setSnapshotId(snapshotId.toString())
    *     .setDescription(description)
    *     .build();
-   *   Snapshot response = bigtableTableAdminClient.snapshotTableAsync(request).get();
+   *   Snapshot response = baseBigtableTableAdminClient.snapshotTableAsync(request).get();
    * }
    * 

    *
@@ -1359,7 +1360,7 @@ public final OperationFuture snapshotTableAsync
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   ClusterName cluster = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   SnapshotName snapshotId = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
@@ -1370,7 +1371,7 @@ public final OperationFuture snapshotTableAsync
    *     .setSnapshotId(snapshotId.toString())
    *     .setDescription(description)
    *     .build();
-   *   OperationFuture<Operation> future = bigtableTableAdminClient.snapshotTableOperationCallable().futureCall(request);
+   *   OperationFuture<Operation> future = baseBigtableTableAdminClient.snapshotTableOperationCallable().futureCall(request);
    *   // Do something
    *   Snapshot response = future.get();
    * }
@@ -1395,7 +1396,7 @@ public final OperationFuture snapshotTableAsync
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   TableName name = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
    *   ClusterName cluster = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   SnapshotName snapshotId = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
@@ -1406,7 +1407,7 @@ public final OperationFuture snapshotTableAsync
    *     .setSnapshotId(snapshotId.toString())
    *     .setDescription(description)
    *     .build();
-   *   ApiFuture<Operation> future = bigtableTableAdminClient.snapshotTableCallable().futureCall(request);
+   *   ApiFuture<Operation> future = baseBigtableTableAdminClient.snapshotTableCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
    * }
@@ -1428,9 +1429,9 @@ public final UnaryCallable snapshotTableCallabl
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
-   *   Snapshot response = bigtableTableAdminClient.getSnapshot(name);
+   *   Snapshot response = baseBigtableTableAdminClient.getSnapshot(name);
    * }
    * 

    *
@@ -1457,9 +1458,9 @@ public final Snapshot getSnapshot(SnapshotName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
-   *   Snapshot response = bigtableTableAdminClient.getSnapshot(name.toString());
+   *   Snapshot response = baseBigtableTableAdminClient.getSnapshot(name.toString());
    * }
    * 

    *
@@ -1485,12 +1486,12 @@ public final Snapshot getSnapshot(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
    *   GetSnapshotRequest request = GetSnapshotRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   Snapshot response = bigtableTableAdminClient.getSnapshot(request);
+   *   Snapshot response = baseBigtableTableAdminClient.getSnapshot(request);
    * }
    * 

    *
@@ -1513,12 +1514,12 @@ private final Snapshot getSnapshot(GetSnapshotRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
    *   GetSnapshotRequest request = GetSnapshotRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Snapshot> future = bigtableTableAdminClient.getSnapshotCallable().futureCall(request);
+   *   ApiFuture<Snapshot> future = baseBigtableTableAdminClient.getSnapshotCallable().futureCall(request);
    *   // Do something
    *   Snapshot response = future.get();
    * }
@@ -1540,9 +1541,9 @@ public final UnaryCallable getSnapshotCallable() {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   ClusterName parent = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   for (Snapshot element : bigtableTableAdminClient.listSnapshots(parent).iterateAll()) {
+   *   for (Snapshot element : baseBigtableTableAdminClient.listSnapshots(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1574,9 +1575,9 @@ public final ListSnapshotsPagedResponse listSnapshots(ClusterName parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   ClusterName parent = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
-   *   for (Snapshot element : bigtableTableAdminClient.listSnapshots(parent.toString()).iterateAll()) {
+   *   for (Snapshot element : baseBigtableTableAdminClient.listSnapshots(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1605,12 +1606,12 @@ public final ListSnapshotsPagedResponse listSnapshots(String parent) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   ClusterName parent = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   ListSnapshotsRequest request = ListSnapshotsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   for (Snapshot element : bigtableTableAdminClient.listSnapshots(request).iterateAll()) {
+   *   for (Snapshot element : baseBigtableTableAdminClient.listSnapshots(request).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1635,12 +1636,12 @@ public final ListSnapshotsPagedResponse listSnapshots(ListSnapshotsRequest reque
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   ClusterName parent = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   ListSnapshotsRequest request = ListSnapshotsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
-   *   ApiFuture<ListSnapshotsPagedResponse> future = bigtableTableAdminClient.listSnapshotsPagedCallable().futureCall(request);
+   *   ApiFuture<ListSnapshotsPagedResponse> future = baseBigtableTableAdminClient.listSnapshotsPagedCallable().futureCall(request);
    *   // Do something
    *   for (Snapshot element : future.get().iterateAll()) {
    *     // doThingsWith(element);
@@ -1665,13 +1666,13 @@ public final ListSnapshotsPagedResponse listSnapshots(ListSnapshotsRequest reque
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   ClusterName parent = ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]");
    *   ListSnapshotsRequest request = ListSnapshotsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
    *   while (true) {
-   *     ListSnapshotsResponse response = bigtableTableAdminClient.listSnapshotsCallable().call(request);
+   *     ListSnapshotsResponse response = baseBigtableTableAdminClient.listSnapshotsCallable().call(request);
    *     for (Snapshot element : response.getSnapshotsList()) {
    *       // doThingsWith(element);
    *     }
@@ -1701,9 +1702,9 @@ public final UnaryCallable listSnap
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
-   *   bigtableTableAdminClient.deleteSnapshot(name);
+   *   baseBigtableTableAdminClient.deleteSnapshot(name);
    * }
    * 

    *
@@ -1730,9 +1731,9 @@ public final void deleteSnapshot(SnapshotName name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
-   *   bigtableTableAdminClient.deleteSnapshot(name.toString());
+   *   baseBigtableTableAdminClient.deleteSnapshot(name.toString());
    * }
    * 

    *
@@ -1758,12 +1759,12 @@ public final void deleteSnapshot(String name) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
    *   DeleteSnapshotRequest request = DeleteSnapshotRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   bigtableTableAdminClient.deleteSnapshot(request);
+   *   baseBigtableTableAdminClient.deleteSnapshot(request);
    * }
    * 

    *
@@ -1786,12 +1787,12 @@ private final void deleteSnapshot(DeleteSnapshotRequest request) {
    * 
Sample code:
    *
    * 

-   * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+   * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
    *   SnapshotName name = SnapshotName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]", "[SNAPSHOT]");
    *   DeleteSnapshotRequest request = DeleteSnapshotRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
-   *   ApiFuture<Void> future = bigtableTableAdminClient.deleteSnapshotCallable().futureCall(request);
+   *   ApiFuture<Void> future = baseBigtableTableAdminClient.deleteSnapshotCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java
similarity index 91%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java
index ef3e2f867530..b11f94ff4c26 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java
@@ -15,8 +15,8 @@
  */
 package com.google.cloud.bigtable.admin.v2;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListSnapshotsPagedResponse;
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListTablesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListSnapshotsPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
@@ -60,7 +60,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * Settings class to configure an instance of {@link BigtableTableAdminClient}.
+ * Settings class to configure an instance of {@link BaseBigtableTableAdminClient}.
  *
  * 
The default instance has everything set to sensible defaults:
  *
@@ -76,17 +76,17 @@
  *
  * 
  * 
- * BigtableTableAdminSettings.Builder bigtableTableAdminSettingsBuilder =
- *     BigtableTableAdminSettings.newBuilder();
- * bigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
+ * BaseBigtableTableAdminSettings.Builder baseBigtableTableAdminSettingsBuilder =
+ *     BaseBigtableTableAdminSettings.newBuilder();
+ * baseBigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
- * BigtableTableAdminSettings bigtableTableAdminSettings = bigtableTableAdminSettingsBuilder.build();
+ * BaseBigtableTableAdminSettings baseBigtableTableAdminSettings = baseBigtableTableAdminSettingsBuilder.build();
  * 
  * 

  */
 @Generated("by gapic-generator")
 @BetaApi
-public class BigtableTableAdminSettings extends ClientSettings {
+public class BaseBigtableTableAdminSettings extends ClientSettings {
   /** Returns the object with the settings used for calls to createTable. */
   public UnaryCallSettings createTableSettings() {
     return ((BigtableTableAdminStubSettings) getStubSettings()).createTableSettings();
@@ -175,9 +175,9 @@ public UnaryCallSettings deleteSnapshotSettings()
     return ((BigtableTableAdminStubSettings) getStubSettings()).deleteSnapshotSettings();
   }
 
-  public static final BigtableTableAdminSettings create(BigtableTableAdminStubSettings stub)
+  public static final BaseBigtableTableAdminSettings create(BigtableTableAdminStubSettings stub)
       throws IOException {
-    return new BigtableTableAdminSettings.Builder(stub.toBuilder()).build();
+    return new BaseBigtableTableAdminSettings.Builder(stub.toBuilder()).build();
   }
 
   /** Returns a builder for the default ExecutorProvider for this service. */
@@ -229,12 +229,13 @@ public Builder toBuilder() {
     return new Builder(this);
   }
 
-  protected BigtableTableAdminSettings(Builder settingsBuilder) throws IOException {
+  protected BaseBigtableTableAdminSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
   }
 
-  /** Builder for BigtableTableAdminSettings. */
-  public static class Builder extends ClientSettings.Builder {
+  /** Builder for BaseBigtableTableAdminSettings. */
+  public static class Builder
+      extends ClientSettings.Builder {
     protected Builder() throws IOException {
       this((ClientContext) null);
     }
@@ -247,7 +248,7 @@ private static Builder createDefault() {
       return new Builder(BigtableTableAdminStubSettings.newBuilder());
     }
 
-    protected Builder(BigtableTableAdminSettings settings) {
+    protected Builder(BaseBigtableTableAdminSettings settings) {
       super(settings.getStubSettings().toBuilder());
     }
 
@@ -363,8 +364,8 @@ public UnaryCallSettings.Builder deleteSnapshotSet
     }
 
     @Override
-    public BigtableTableAdminSettings build() throws IOException {
-      return new BigtableTableAdminSettings(this);
+    public BaseBigtableTableAdminSettings build() throws IOException {
+      return new BaseBigtableTableAdminSettings(this);
     }
   }
 }
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
index 868792c432d4..64642f97400f 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
@@ -19,38 +19,39 @@
  *
  * 
The interfaces provided are listed below, along with usage samples.
  *
- * 
=========================== BigtableInstanceAdminClient ===========================
+ * 
=============================== BaseBigtableInstanceAdminClient
+ * ===============================
  *
  * 
Service Description: Service for creating, configuring, and deleting Cloud Bigtable Instances
  * and Clusters. Provides access to the Instance and Cluster schemas only, not the tables' metadata
  * or data stored in those tables.
  *
- * 
Sample for BigtableInstanceAdminClient:
+ * 
Sample for BaseBigtableInstanceAdminClient:
  *
  * 
  * 
- * try (BigtableInstanceAdminClient bigtableInstanceAdminClient = BigtableInstanceAdminClient.create()) {
+ * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
  *   InstanceName name = InstanceName.of("[PROJECT]", "[INSTANCE]");
- *   Instance response = bigtableInstanceAdminClient.getInstance(name);
+ *   Instance response = baseBigtableInstanceAdminClient.getInstance(name);
  * }
  * 
  * 

  *
- * ======================== BigtableTableAdminClient ========================
+ * ============================ BaseBigtableTableAdminClient ============================
  *
  * 
Service Description: Service for creating, configuring, and deleting Cloud Bigtable tables.
  *
  * 
Provides access to the table schemas only, not the data stored within the tables.
  *
- * 
Sample for BigtableTableAdminClient:
+ * 
Sample for BaseBigtableTableAdminClient:
  *
  * 
  * 
- * try (BigtableTableAdminClient bigtableTableAdminClient = BigtableTableAdminClient.create()) {
+ * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
  *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
  *   String tableId = "";
  *   Table table = Table.newBuilder().build();
- *   Table response = bigtableTableAdminClient.createTable(parent, tableId, table);
+ *   Table response = baseBigtableTableAdminClient.createTable(parent, tableId, table);
  * }
  * 
  * 

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
index aaccdb4d5045..181b8e2beb97 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.admin.v2.stub;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
index c24aa6a73ea8..844f33a1f9e3 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.admin.v2.stub;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
@@ -102,11 +102,11 @@
  *
  * 
  * 
- * BigtableInstanceAdminStubSettings.Builder bigtableInstanceAdminSettingsBuilder =
+ * BigtableInstanceAdminStubSettings.Builder baseBigtableInstanceAdminSettingsBuilder =
  *     BigtableInstanceAdminStubSettings.newBuilder();
- * bigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
+ * baseBigtableInstanceAdminSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
- * BigtableInstanceAdminStubSettings bigtableInstanceAdminSettings = bigtableInstanceAdminSettingsBuilder.build();
+ * BigtableInstanceAdminStubSettings baseBigtableInstanceAdminSettings = baseBigtableInstanceAdminSettingsBuilder.build();
  * 
  * 

  */
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
index f1a4d26078e4..0c12b84d4a5f 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
@@ -15,8 +15,8 @@
  */
 package com.google.cloud.bigtable.admin.v2.stub;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListSnapshotsPagedResponse;
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListTablesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListSnapshotsPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
index 1713def0773c..3ce8c07eb061 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
@@ -15,8 +15,8 @@
  */
 package com.google.cloud.bigtable.admin.v2.stub;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListSnapshotsPagedResponse;
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListTablesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListSnapshotsPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
@@ -94,11 +94,11 @@
  *
  * 
  * 
- * BigtableTableAdminStubSettings.Builder bigtableTableAdminSettingsBuilder =
+ * BigtableTableAdminStubSettings.Builder baseBigtableTableAdminSettingsBuilder =
  *     BigtableTableAdminStubSettings.newBuilder();
- * bigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
+ * baseBigtableTableAdminSettingsBuilder.createTableSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
- * BigtableTableAdminStubSettings bigtableTableAdminSettings = bigtableTableAdminSettingsBuilder.build();
+ * BigtableTableAdminStubSettings baseBigtableTableAdminSettings = baseBigtableTableAdminSettingsBuilder.build();
  * 
  * 

  */
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
index 82c29c13b08e..7175c6b8428a 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.admin.v2.stub;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
index 8313842143d6..a5b1d69146ba 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
@@ -15,8 +15,8 @@
  */
 package com.google.cloud.bigtable.admin.v2.stub;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListSnapshotsPagedResponse;
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListTablesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListSnapshotsPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java
similarity index 98%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java
index b8c2cf94275d..0e083776f040 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java
@@ -15,7 +15,7 @@
  */
 package com.google.cloud.bigtable.admin.v2;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient.ListAppProfilesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse;
 
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GaxGrpcProperties;
@@ -79,11 +79,11 @@
 import org.junit.Test;
 
 @javax.annotation.Generated("by GAPIC")
-public class BigtableInstanceAdminClientTest {
+public class BaseBigtableInstanceAdminClientTest {
   private static MockBigtableInstanceAdmin mockBigtableInstanceAdmin;
   private static MockBigtableTableAdmin mockBigtableTableAdmin;
   private static MockServiceHelper serviceHelper;
-  private BigtableInstanceAdminClient client;
+  private BaseBigtableInstanceAdminClient client;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
@@ -106,12 +106,12 @@ public static void stopServer() {
   public void setUp() throws IOException {
     serviceHelper.reset();
     channelProvider = serviceHelper.createChannelProvider();
-    BigtableInstanceAdminSettings settings =
-        BigtableInstanceAdminSettings.newBuilder()
+    BaseBigtableInstanceAdminSettings settings =
+        BaseBigtableInstanceAdminSettings.newBuilder()
             .setTransportChannelProvider(channelProvider)
             .setCredentialsProvider(NoCredentialsProvider.create())
             .build();
-    client = BigtableInstanceAdminClient.create(settings);
+    client = BaseBigtableInstanceAdminClient.create(settings);
   }
 
   @After
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java
similarity index 98%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java
index b1820ecd17b4..0d6218ff724a 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java
@@ -15,8 +15,8 @@
  */
 package com.google.cloud.bigtable.admin.v2;
 
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListSnapshotsPagedResponse;
-import static com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient.ListTablesPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListSnapshotsPagedResponse;
+import static com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse;
 
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GaxGrpcProperties;
@@ -69,11 +69,11 @@
 import org.junit.Test;
 
 @javax.annotation.Generated("by GAPIC")
-public class BigtableTableAdminClientTest {
+public class BaseBigtableTableAdminClientTest {
   private static MockBigtableInstanceAdmin mockBigtableInstanceAdmin;
   private static MockBigtableTableAdmin mockBigtableTableAdmin;
   private static MockServiceHelper serviceHelper;
-  private BigtableTableAdminClient client;
+  private BaseBigtableTableAdminClient client;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
@@ -96,12 +96,12 @@ public static void stopServer() {
   public void setUp() throws IOException {
     serviceHelper.reset();
     channelProvider = serviceHelper.createChannelProvider();
-    BigtableTableAdminSettings settings =
-        BigtableTableAdminSettings.newBuilder()
+    BaseBigtableTableAdminSettings settings =
+        BaseBigtableTableAdminSettings.newBuilder()
             .setTransportChannelProvider(channelProvider)
             .setCredentialsProvider(NoCredentialsProvider.create())
             .build();
-    client = BigtableTableAdminClient.create(settings);
+    client = BaseBigtableTableAdminClient.create(settings);
   }
 
   @After

From 1d28d24375127df82092aee8b972a3fce60522cb Mon Sep 17 00:00:00 2001
From: Igor Bernstein 
Date: Wed, 8 Aug 2018 12:13:26 -0400
Subject: [PATCH 2/2] update handwritten layer

---
 ...ent.java => BigtableTableAdminClient.java} | 74 +++++++++----------
 ...s.java => BigtableTableAdminSettings.java} | 16 ++--
 .../admin/v2/models/TableAdminResponses.java  |  4 +-
 ...java => BigtableTableAdminClientTest.java} | 11 +--
 ...va => BigtableTableAdminSettingsTest.java} |  8 +-
 ...T.java => BigtableTableAdminClientIT.java} |  8 +-
 6 files changed, 61 insertions(+), 60 deletions(-)
 rename google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/{TableAdminClient.java => BigtableTableAdminClient.java} (82%)
 rename google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/{TableAdminSettings.java => BigtableTableAdminSettings.java} (86%)
 rename google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/{TableAdminClientTest.java => BigtableTableAdminClientTest.java} (96%)
 rename google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/{TableAdminSettingsTest.java => BigtableTableAdminSettingsTest.java} (88%)
 rename google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/{TableAdminClientIT.java => BigtableTableAdminClientIT.java} (97%)

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
similarity index 82%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
index da24bd59fa79..c6e2ecc38847 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
@@ -55,7 +55,7 @@
  * 
Sample code to get started:
  *
  * 
{@code
- * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+ * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
  *   CreateTable createTableReq =
  *     TableAdminRequests.createTable("tableId")
  *       .addFamily("cf1")
@@ -69,51 +69,51 @@
  * 
Note: close() needs to be called on the client object to clean up resources such as threads.
  * In the example above, try-with-resources is used, which automatically calls close().
  *
- * 
This class can be customized by passing in a custom instance of TableAdminSettings to
+ * 
This class can be customized by passing in a custom instance of BigtableTableAdminSettings to
  * create(). For example:
  *
  * 
To customize credentials:
  *
  * 
{@code
- * TableAdminSettings tableAdminSettings = TableAdminSettings.newBuilder()
+ * BigtableTableAdminSettings tableAdminSettings = BigtableTableAdminSettings.newBuilder()
  *   .setInstanceName(InstanceName.of("[PROJECT]", "[INSTANCE]"))
  *   .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *   .build();
  *
- * TableAdminClient client =
- *   TableAdminClient.create(tableAdminSettings);
+ * BigtableTableAdminClient client =
+ *   BigtableTableAdminClient.create(tableAdminSettings);
  * }

  *
  * To customize the endpoint:
  *
  * 
{@code
- * TableAdminSettings tableAdminSettings = TableAdminSettings.newBuilder()
+ * BigtableTableAdminSettings tableAdminSettings = BigtableTableAdminSettings.newBuilder()
  *   .setInstanceName(InstanceName.of("[PROJECT]", "[INSTANCE]"))
  *   .setEndpoint(myEndpoint).build();
  *
- * TableAdminClient client = TableAdminClient.create(tableAdminSettings);
+ * BigtableTableAdminClient client = BigtableTableAdminClient.create(tableAdminSettings);
  * }

  */
-public class TableAdminClient implements AutoCloseable {
+public class BigtableTableAdminClient implements AutoCloseable {
   private final BigtableTableAdminStub stub;
   private final InstanceName instanceName;
 
-  /** Constructs an instance of TableAdminClient with the given instanceName. */
-  public static TableAdminClient create(@Nonnull InstanceName instanceName) throws IOException {
-    return create(TableAdminSettings.newBuilder().setInstanceName(instanceName).build());
+  /** Constructs an instance of BigtableTableAdminClient with the given instanceName. */
+  public static BigtableTableAdminClient create(@Nonnull InstanceName instanceName) throws IOException {
+    return create(BigtableTableAdminSettings.newBuilder().setInstanceName(instanceName).build());
   }
 
-  /** Constructs an instance of TableAdminClient with the given settings. */
-  public static TableAdminClient create(@Nonnull TableAdminSettings settings) throws IOException {
+  /** Constructs an instance of BigtableTableAdminClient with the given settings. */
+  public static BigtableTableAdminClient create(@Nonnull BigtableTableAdminSettings settings) throws IOException {
     return create(settings.getInstanceName(), settings.getStubSettings().createStub());
   }
 
-  /** Constructs an instance of TableAdminClient with the given instanceName and stub. */
-  public static TableAdminClient create(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
-    return new TableAdminClient(instanceName, stub);
+  /** Constructs an instance of BigtableTableAdminClient with the given instanceName and stub. */
+  public static BigtableTableAdminClient create(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
+    return new BigtableTableAdminClient(instanceName, stub);
   }
 
-  private TableAdminClient(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
+  private BigtableTableAdminClient(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
     Preconditions.checkNotNull(instanceName);
     Preconditions.checkNotNull(stub);
     this.instanceName = instanceName;
@@ -136,7 +136,7 @@ public void close() {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   CreateTable createTableReq =
    *     TableAdminRequests.createTable("tableId")
    *       .addFamily("cf2", GCRULES.maxVersions(10))
@@ -160,7 +160,7 @@ public Table createTable(CreateTable createTable) {
    * 
Sample code:
    *
    * 
{@code
-   *  try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   *  try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *    CreateTable createTableReq =
    *      TableAdminRequests.createTable("tableId")
    *        .addFamily("cf2", GCRULES.maxVersions(10))
@@ -183,7 +183,7 @@ public ApiFuture createTableAsync(CreateTable createTable) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   ModifyFamilies modifyFamiliesReq = TableAdminRequests.modifyFamilies(tableId)
    *     .addFamily("mf1")
    *     .addFamily(
@@ -222,7 +222,7 @@ public Table modifyFamilies(ModifyFamilies modifyFamily) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   ModifyFamilies modifyFamiliesReq = TableAdminRequests.modifyFamilies(tableId)
    *     .addFamily("mf1")
    *     .addFamily(
@@ -259,7 +259,7 @@ public ApiFuture
 modifyFamiliesAsync(ModifyFamilies modifyFamily) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.deleteTable("tableId");
    * }
    * }

@@ -276,7 +276,7 @@ public void deleteTable(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.deleteTableAsync("tableId");
    * }
    * }

@@ -294,7 +294,7 @@ public ApiFuture deleteTableAsync(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.getTable("tableId");
    * }
    * }

@@ -313,7 +313,7 @@ public Table getTable(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.getTableAsync("tableId");
    * }
    * }

@@ -331,7 +331,7 @@ public ApiFuture
 getTableAsync(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.listTables();
    * }
    * }

@@ -347,7 +347,7 @@ public List listTables() {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.listTablesAsync();
    * }
    * }

@@ -372,7 +372,7 @@ public List apply(ListTablesResponse input) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.dropRowRange("tableId");
    * }
    * }

@@ -390,7 +390,7 @@ public void dropRowRange(String tableId, String rowKeyPrefix) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.dropRowRangeAsync("tableId");
    * }
    * }

@@ -408,7 +408,7 @@ public ApiFuture dropRowRangeAsync(String tableId, String rowKeyPrefix) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.dropRowRange("tableId");
    * }
    * }

@@ -426,7 +426,7 @@ public void dropRowRange(String tableId, ByteString rowKeyPrefix) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.dropRowRangeAsync("tableId");
    * }
    * }

@@ -447,7 +447,7 @@ public ApiFuture dropRowRangeAsync(String tableId, ByteString rowKeyPrefix
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.dropAllRows("tableId");
    * }
    * }

@@ -464,7 +464,7 @@ public void dropAllRows(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   client.dropAllRowsAsync("tableId");
    * }
    * }

@@ -485,7 +485,7 @@ public ApiFuture dropAllRowsAsync(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   ConsistencyToken consistencyToken = client.generateConsistencyToken("tableId");
    * }
    * }

@@ -506,7 +506,7 @@ public ConsistencyToken generateConsistencyToken(String tableId) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   ConsistencyToken consistencyToken = client.generateConsistencyToken("tableId");
    * }
    * }

@@ -535,7 +535,7 @@ public ConsistencyToken apply(GenerateConsistencyTokenResponse input) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   boolean consistent = client.isConsistent("tableId", token);
    * }
    * }

@@ -555,7 +555,7 @@ public boolean isConsistent(String tableId, ConsistencyToken token) {
    * 
Sample code:
    *
    * 
{@code
-   * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
+   * try(BigtableTableAdminClient client =  BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   boolean consistent = client.isConsistentAsync("tableId", token);
    * }
    * }

diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminSettings.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
similarity index 86%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminSettings.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
index 4eea4bff59f4..16a296ef0eee 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
@@ -24,14 +24,14 @@
 import javax.annotation.Nullable;
 
 /**
- * Settings class to configure an instance of {@link TableAdminClient}.
+ * Settings class to configure an instance of {@link BigtableTableAdminClient}.
  *
  * 
It must be configured with an {@link InstanceName} and be used to change default RPC settings.
  *
  * 
Example usage:
  *
  * 
{@code
- * TableAdminSettings.Builder tableAdminSettingsBuilder = TableAdminSettings.newBuilder()
+ * BigtableTableAdminSettings.Builder tableAdminSettingsBuilder = BigtableTableAdminSettings.newBuilder()
  *   .setInstanceName(InstanceName.of("my-project", "my-instance");
  *
  * tableAdminSettingsBuilder.stubSettings().createTableSettings()
@@ -43,11 +43,11 @@
  * BigtableTableAdminSettings tableAdminSettings = tableAdminSettingsBuilder.build();
  * }

  */
-public final class TableAdminSettings {
+public final class BigtableTableAdminSettings {
   private final InstanceName instanceName;
   private final BigtableTableAdminStubSettings stubSettings;
 
-  private TableAdminSettings(Builder builder) throws IOException {
+  private BigtableTableAdminSettings(Builder builder) throws IOException {
     this.instanceName = Preconditions.checkNotNull(builder.instanceName, "InstanceName must be set");
     this.stubSettings = Verify.verifyNotNull(builder.stubSettings, "stubSettings should never be null").build();
   }
@@ -73,7 +73,7 @@ public static Builder newBuilder() {
     return new Builder();
   }
 
-  /** Builder for TableAdminSettings. */
+  /** Builder for BigtableTableAdminSettings. */
   public static final class Builder {
     @Nullable
     private InstanceName instanceName;
@@ -83,7 +83,7 @@ private Builder() {
       stubSettings = BigtableTableAdminStubSettings.newBuilder();
     }
 
-    private Builder(TableAdminSettings settings) {
+    private Builder(BigtableTableAdminSettings settings) {
       this.instanceName = settings.instanceName;
       this.stubSettings = settings.stubSettings.toBuilder();
     }
@@ -112,8 +112,8 @@ public BigtableTableAdminStubSettings.Builder stubSettings() {
     }
 
     /** Builds an instance of the settings. */
-    public TableAdminSettings build() throws IOException {
-      return new TableAdminSettings(this);
+    public BigtableTableAdminSettings build() throws IOException {
+      return new BigtableTableAdminSettings(this);
     }
   }
 }
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminResponses.java b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminResponses.java
index 42b9f22a8ecb..170345a8b6b3 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminResponses.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminResponses.java
@@ -29,7 +29,7 @@
 import com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse;
 import com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState;
 import com.google.bigtable.admin.v2.TableName;
-import com.google.cloud.bigtable.admin.v2.TableAdminClient;
+import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.GCRule;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.IntersectionRule;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.UnionRule;
@@ -269,7 +269,7 @@ private GCRule convertGcRule(GcRule source) {
    * Wrapper for {@link GenerateConsistencyTokenResponse#getConsistencyToken()}
    *
    * 
Cannot be created. They are obtained by invoking {@link
-   * TableAdminClient#generateConsistencyToken(String)}
+   * BigtableTableAdminClient#generateConsistencyToken(String)}
    */
   public static final class ConsistencyToken {
     private final String token;
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/TableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
similarity index 96%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/TableAdminClientTest.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
index 0c0b60b8f2dd..d11b3f6d5695 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/TableAdminClientTest.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
@@ -52,8 +52,8 @@
 import com.google.protobuf.Empty;
 
 @RunWith(MockitoJUnitRunner.class)
-public class TableAdminClientTest {
-  private TableAdminClient adminClient;
+public class BigtableTableAdminClientTest {
+  private BigtableTableAdminClient adminClient;
   @Mock private BigtableTableAdminStub mockStub;
 
   @Mock private UnaryCallable mockCreateTableCallable;
@@ -73,7 +73,8 @@ public class TableAdminClientTest {
 
   @Before
   public void setUp() throws Exception {
-    adminClient = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), mockStub);
+    adminClient = BigtableTableAdminClient
+        .create(InstanceName.of("[PROJECT]", "[INSTANCE]"), mockStub);
 
     Mockito.when(mockStub.createTableCallable()).thenReturn(mockCreateTableCallable);
     Mockito.when(mockStub.modifyColumnFamiliesCallable()).thenReturn(mockModifyTableCallable);
@@ -293,12 +294,12 @@ public void convertToTableNames() {
             .addTables(Table.newBuilder().setName("projects/p/instances/i/tables/t2"))
             .build();
 
-    List tableNames = TableAdminClient.convertToTableNames(listTablesResponse);
+    List tableNames = BigtableTableAdminClient.convertToTableNames(listTablesResponse);
     assertEquals(2, tableNames.size());
     assertEquals("projects/p/instances/i/tables/t1", tableNames.get(0).toString());
     assertEquals("projects/p/instances/i/tables/t2", tableNames.get(1).toString());
 
     listTablesResponse = ListTablesResponse.newBuilder().build();
-    assertEquals(0, TableAdminClient.convertToTableNames(listTablesResponse).size());
+    assertEquals(0, BigtableTableAdminClient.convertToTableNames(listTablesResponse).size());
   }
 }
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/TableAdminSettingsTest.java b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java
similarity index 88%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/TableAdminSettingsTest.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java
index 8bf706cf8228..447c86fdc309 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/TableAdminSettingsTest.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java
@@ -22,13 +22,13 @@
 import java.io.IOException;
 import org.junit.Test;
 
-public class TableAdminSettingsTest {
+public class BigtableTableAdminSettingsTest {
 
   @Test
   public void testInstanceName() throws IOException {
     InstanceName instanceName = InstanceName.of("my-project", "my-instance");
 
-    TableAdminSettings.Builder builder = TableAdminSettings.newBuilder()
+    BigtableTableAdminSettings.Builder builder = BigtableTableAdminSettings.newBuilder()
         .setInstanceName(instanceName);
 
     assertThat(builder.getInstanceName()).isEqualTo(instanceName);
@@ -41,7 +41,7 @@ public void testMissingInstanceName() {
     Exception actualException = null;
 
     try {
-      TableAdminSettings.newBuilder().build();
+      BigtableTableAdminSettings.newBuilder().build();
     } catch (Exception e) {
       actualException = e;
     }
@@ -53,7 +53,7 @@ public void testMissingInstanceName() {
   public void testStubSettings() throws IOException {
     InstanceName instanceName = InstanceName.of("my-project", "my-instance");
 
-    TableAdminSettings.Builder builder = TableAdminSettings.newBuilder()
+    BigtableTableAdminSettings.Builder builder = BigtableTableAdminSettings.newBuilder()
         .setInstanceName(instanceName);
 
     builder.stubSettings().createTableSettings()
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java
similarity index 97%
rename from google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java
rename to google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java
index 33195f282062..d4805ed51eb3 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java
@@ -23,7 +23,7 @@
 
 import com.google.bigtable.admin.v2.InstanceName;
 import com.google.bigtable.admin.v2.TableName;
-import com.google.cloud.bigtable.admin.v2.TableAdminClient;
+import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.DurationRule;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.IntersectionRule;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.UnionRule;
@@ -43,10 +43,10 @@
 import org.junit.Test;
 import org.threeten.bp.Duration;
 
-public class TableAdminClientIT {
+public class BigtableTableAdminClientIT {
   private static final String INSTANCE_PROPERTY_NAME = "bigtable.instance";
 
-  private static TableAdminClient tableAdmin;
+  private static BigtableTableAdminClient tableAdmin;
 
   @BeforeClass
   public static void createClient() throws IOException {
@@ -58,7 +58,7 @@ public static void createClient() throws IOException {
     }
 
     InstanceName instanceName = InstanceName.parse(targetInstance);
-    tableAdmin = TableAdminClient.create(instanceName);
+    tableAdmin = BigtableTableAdminClient.create(instanceName);
   }
 
   @AfterClass