diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java
index 5fe82277c3d6..3351fc09bce4 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java
@@ -59,8 +59,8 @@
  * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
  *   CreateTable createTableReq =
  *     TableAdminRequests.createTable("tableId")
- *       .addColumnFamily("cf1")
- *       .addColumnFamily("cf2", GCRULES.maxVersions(10))
+ *       .addFamily("cf1")
+ *       .addFamily("cf2", GCRULES.maxVersions(10))
  *       .addSplit(ByteString.copyFromUtf8("b"))
  *       .addSplit(ByteString.copyFromUtf8("q"));
  *   client.createTable(createTableReq);
@@ -80,9 +80,9 @@
  * BigtableTableAdminSettings bigtableTableAdminSettings =
  *   BigtableTableAdminSettings.newBuilder()
  *   .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
- *     .build();
+ *   .build();
  * TableAdminClient client =
- * TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
+ *   TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
  * }</pre>
  *
  * To customize the endpoint:
@@ -91,7 +91,7 @@
  * BigtableTableAdminSettings bigtableTableAdminSettings =
  *     BigtableTableAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
  * TableAdminClient client =
- * TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
+ *   TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
  * }</pre>
  */
 @BetaApi
@@ -173,7 +173,7 @@ public void close() {
    * try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *   CreateTable createTableReq =
    *     TableAdminRequests.createTable("tableId")
-   *       .addColumnFamily("cf2", GCRULES.maxVersions(10))
+   *       .addFamily("cf2", GCRULES.maxVersions(10))
    *   client.createTable(createTableReq);
    * }
    * }</pre>
@@ -197,8 +197,7 @@ public Table createTable(CreateTable createTable) {
    *  try(TableAdminClient client =  TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
    *    CreateTable createTableReq =
    *      TableAdminRequests.createTable("tableId")
-   *        .addColumnFamily("cf2", GCRULES.maxVersions(10))
-   *
+   *        .addFamily("cf2", GCRULES.maxVersions(10))
    *    client.createTableAsync(createTableReq);
    *  }
    *  }</pre>
@@ -612,11 +611,11 @@ public boolean isConsistent(String tableId, ConsistencyToken token) {
    * @return ApiFuture<Boolean>
    */
   public ApiFuture<Boolean> isConsistentAsync(String tableId, ConsistencyToken token) {
-    ApiFuture<CheckConsistencyResponse> CheckConsResp =
+    ApiFuture<CheckConsistencyResponse> checkConsResp =
         stub.checkConsistencyCallable().futureCall(token.toProto(getTableName(tableId)));
 
     return ApiFutures.transform(
-        CheckConsResp,
+        checkConsResp,
         new ApiFunction<CheckConsistencyResponse, Boolean>() {
           @Override
           public Boolean apply(CheckConsistencyResponse input) {
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/GCRules.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/GCRules.java
index 70537e5d995c..6817d305e783 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/GCRules.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/GCRules.java
@@ -208,7 +208,7 @@ private VersionRule(int maxVersion) {
 
     /** Gets the configured maximum versions */
     public int getMaxVersions() {
-      return toProto().getMaxNumVersions();
+      return builder.getMaxNumVersions();
     }
 
     @Override
@@ -240,9 +240,7 @@ private DurationRule(Duration duration) {
      * @return Duration
      */
     public Duration getMaxAge() {
-      long seconds = toProto().getMaxAge().getSeconds();
-      int nanos = toProto().getMaxAge().getNanos();
-      return Duration.ofSeconds(seconds, nanos);
+      return Duration.ofSeconds(builder.getSeconds(), builder.getNanos());
     }
 
     @Override
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequests.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequests.java
index 3c7c653028ee..59c3cb3fb30a 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequests.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequests.java
@@ -83,7 +83,7 @@ private CreateTable(String tableId) {
      *
      * @param familyId
      */
-    public CreateTable addColumnFamily(String familyId) {
+    public CreateTable addFamily(String familyId) {
       Preconditions.checkNotNull(familyId);
       tableRequest.putColumnFamilies(familyId, ColumnFamily.newBuilder().build());
       return this;
@@ -95,7 +95,7 @@ public CreateTable addColumnFamily(String familyId) {
      * @param familyId
      * @param gcRule
      */
-    public CreateTable addColumnFamily(String familyId, GCRule gcRule) {
+    public CreateTable addFamily(String familyId, GCRule gcRule) {
       Preconditions.checkNotNull(familyId);
       tableRequest.putColumnFamilies(
           familyId, ColumnFamily.newBuilder().setGcRule(gcRule.toProto()).build());
diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java
index 37878597fd5a..7cd8bff9854e 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java
@@ -58,8 +58,8 @@ public void createTable() throws Exception {
     String tableId = "adminCreateTest";
     CreateTable createTableReq =
         TableAdminRequests.createTable(tableId)
-            .addColumnFamily("cf1")
-            .addColumnFamily("cf2", GCRULES.maxVersions(10))
+            .addFamily("cf1")
+            .addFamily("cf2", GCRULES.maxVersions(10))
             .addSplit(ByteString.copyFromUtf8("b"))
             .addSplit(ByteString.copyFromUtf8("q"));
 
diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequestsTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequestsTest.java
index cb8bee2013cd..d33940e18f0a 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequestsTest.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequestsTest.java
@@ -38,8 +38,8 @@ public class TableAdminRequestsTest {
   public void createTable() {
     CreateTableRequest actual =
         TableAdminRequests.createTable("tableId")
-            .addColumnFamily("cf1")
-            .addColumnFamily("cf2", GCRules.GCRULES.maxVersions(1))
+            .addFamily("cf1")
+            .addFamily("cf2", GCRules.GCRULES.maxVersions(1))
             .addSplit(ByteString.copyFromUtf8("c"))
             .toProto(instanceName);