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/BigtableTableAdminClient.java
index cfd358c994bb..f760e21bd4b7 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/BigtableTableAdminClient.java
@@ -388,38 +388,37 @@ public ApiFuture<Table> getTableAsync(String tableId) {
   }
 
   /**
-   * Lists all TableNames in the instance.
+   * Lists all table ids in the instance.
    *
    * <p>Sample code:
    *
    * <pre>{@code
-   * List<TableName> tableNames = client.listTables();
-   * for(TableName name : tableNames) {
+   * List<String> tableIds = client.listTables();
+   * for(String tableId: tableIds) {
    *   System.out.println(name.getTable());
    * }
    * }</pre>
    */
-  // TODO(igorbernstein2): consider changing this method to use relative table ids.
   @SuppressWarnings("WeakerAccess")
-  public List<TableName> listTables() {
+  public List<String> listTables() {
     return awaitFuture(listTablesAsync());
   }
 
   /**
-   * Asynchronously lists all TableNames in the instance.
+   * Asynchronously lists all table ids in the instance.
    *
    * <p>Sample code:
    *
    * <pre>{@code
-   * ApiFuture<List<TableName>> listFuture = client.listTables();
+   * ApiFuture<List<String>> listFuture = client.listTables();
    *
    * ApiFutures.addCallback(
    *   listFuture,
-   *   new ApiFutureCallback<List<TableName>>() {
-   *     public void onSuccess(List<TableName> tableNames) {
+   *   new ApiFutureCallback<List<String>>() {
+   *     public void onSuccess(List<String> tableIds) {
    *       System.out.println("Got list of tables:");
-   *       for (TableName name : tableNames) {
-   *         System.out.println(name.getTable());
+   *       for (String tableId : tableIds) {
+   *         System.out.println(tableId);
    *       }
    *     }
    *
@@ -431,9 +430,8 @@ public List<TableName> listTables() {
    * );
    * }</pre>
    */
-  // TODO(igorbernstein2): consider changing this method to use relative table ids.
   @SuppressWarnings("WeakerAccess")
-  public ApiFuture<List<TableName>> listTablesAsync() {
+  public ApiFuture<List<String>> listTablesAsync() {
     ListTablesRequest request = ListTablesRequest.newBuilder().setParent(instanceName.toString())
         .build();
 
@@ -484,12 +482,12 @@ public ApiFuture<List<com.google.bigtable.admin.v2.Table>> apply(
 
     // Wrap all of the accumulated protos.
     return ApiFutures.transform(allProtos,
-        new ApiFunction<List<com.google.bigtable.admin.v2.Table>, List<TableName>>() {
+        new ApiFunction<List<com.google.bigtable.admin.v2.Table>, List<String>>() {
           @Override
-          public List<TableName> apply(List<com.google.bigtable.admin.v2.Table> protos) {
-            List<TableName> results = Lists.newArrayListWithCapacity(protos.size());
+          public List<String> apply(List<com.google.bigtable.admin.v2.Table> protos) {
+            List<String> results = Lists.newArrayListWithCapacity(protos.size());
             for (com.google.bigtable.admin.v2.Table proto : protos) {
-              results.add(TableName.parse(proto.getName()));
+              results.add(TableName.parse(proto.getName()).getTable());
             }
             return results;
           }
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/BigtableTableAdminClientTest.java
index 86d52f1cceb3..7d0fc0bc67cf 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/BigtableTableAdminClientTest.java
@@ -39,7 +39,6 @@
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest;
 import com.google.cloud.bigtable.admin.v2.models.Table;
-import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStub;
 import com.google.cloud.bigtable.admin.v2.stub.EnhancedBigtableTableAdminStub;
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
@@ -255,12 +254,12 @@ public void testListTables() {
     );
 
     // Execute
-    List<TableName> actualResults = adminClient.listTables();
+    List<String> actualResults = adminClient.listTables();
 
     // Verify
-    List<TableName> expectedResults = Lists.newArrayList();
+    List<String> expectedResults = Lists.newArrayList();
     for (com.google.bigtable.admin.v2.Table expectedProto : expectedProtos) {
-      expectedResults.add(TableName.parse(expectedProto.getName()));
+      expectedResults.add(TableName.parse(expectedProto.getName()).getTable());
     }
 
     assertThat(actualResults).containsExactlyElementsIn(expectedResults);
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java
index 63bc060bb1f6..5c15952c693a 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java
+++ b/google-cloud-clients/google-cloud-bigtable-admin/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableTableAdminClientIT.java
@@ -16,22 +16,22 @@
 package com.google.cloud.bigtable.admin.v2.it;
 
 import static com.google.cloud.bigtable.admin.v2.models.GCRules.GCRULES;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.bigtable.admin.v2.InstanceName;
-import com.google.bigtable.admin.v2.TableName;
 import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
 import com.google.cloud.bigtable.admin.v2.models.ColumnFamily;
+import com.google.cloud.bigtable.admin.v2.models.ConsistencyToken;
+import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 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;
 import com.google.cloud.bigtable.admin.v2.models.GCRules.VersionRule;
-import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
 import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest;
-import com.google.cloud.bigtable.admin.v2.models.ConsistencyToken;
 import com.google.cloud.bigtable.admin.v2.models.Table;
 import com.google.common.collect.Maps;
 import com.google.protobuf.ByteString;
@@ -205,7 +205,7 @@ public void listTables() {
 
     try {
       tableAdmin.createTable(CreateTableRequest.of(tableId));
-      List<TableName> tables = tableAdmin.listTables();
+      List<String> tables = tableAdmin.listTables();
       assertNotNull(tables);
       assertFalse("List tables did not return any tables", tables.isEmpty());
     } finally {
@@ -219,7 +219,7 @@ public void listTablesAsync() throws Exception {
 
     try {
       tableAdmin.createTable(CreateTableRequest.of(tableId));
-      List<TableName> tables = tableAdmin.listTablesAsync().get();
+      List<String> tables = tableAdmin.listTablesAsync().get();
       assertNotNull(tables);
       assertFalse("List tables did not return any tables", tables.isEmpty());
     } finally {