accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo-testing] branch master updated: Refactor usages of Connector to AccumuloClient (#36)
Date Wed, 26 Sep 2018 14:11:00 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new fa8cc44  Refactor usages of Connector to AccumuloClient (#36)
fa8cc44 is described below

commit fa8cc4469bc0192cb04e12572123f8f6d9182acc
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Sep 26 10:10:54 2018 -0400

    Refactor usages of Connector to AccumuloClient (#36)
---
 .../org/apache/accumulo/testing/core/TestEnv.java  |  7 +---
 .../core/continuous/ContinuousBatchWalker.java     |  8 ++--
 .../testing/core/continuous/ContinuousIngest.java  |  8 ++--
 .../testing/core/continuous/ContinuousMoru.java    |  2 +-
 .../testing/core/continuous/ContinuousScanner.java |  6 +--
 .../testing/core/continuous/ContinuousUtil.java    | 12 +++---
 .../testing/core/continuous/ContinuousVerify.java  | 14 +++----
 .../testing/core/continuous/ContinuousWalk.java    |  6 +--
 .../testing/core/continuous/CreateTable.java       | 10 ++---
 .../testing/core/continuous/UndefinedAnalyzer.java |  6 +--
 .../accumulo/testing/core/ingest/TestIngest.java   | 16 ++++----
 .../accumulo/testing/core/ingest/VerifyIngest.java |  8 ++--
 .../testing/core/merkle/cli/CompareTables.java     |  8 ++--
 .../testing/core/merkle/cli/ComputeRootHash.java   | 12 +++---
 .../testing/core/merkle/cli/GenerateHashes.java    | 12 +++---
 .../testing/core/merkle/cli/ManualComparison.java  |  4 +-
 .../testing/core/merkle/ingest/RandomWorkload.java |  8 ++--
 .../testing/core/performance/Environment.java      |  4 +-
 .../core/performance/impl/PerfTestRunner.java      |  5 +--
 .../performance/tests/RandomCachedLookupsPT.java   | 44 +++++++++++-----------
 .../core/performance/tests/ScanExecutorPT.java     | 16 ++++----
 .../core/performance/tests/ScanFewFamiliesPT.java  | 12 +++---
 .../testing/core/performance/util/TestData.java    |  6 +--
 .../accumulo/testing/core/randomwalk/Module.java   |  2 +-
 .../testing/core/randomwalk/bulk/BulkPlusOne.java  |  2 +-
 .../testing/core/randomwalk/bulk/Compact.java      |  2 +-
 .../core/randomwalk/bulk/ConsistencyCheck.java     |  6 +--
 .../testing/core/randomwalk/bulk/Merge.java        |  2 +-
 .../core/randomwalk/bulk/SelectiveQueueing.java    |  6 +--
 .../testing/core/randomwalk/bulk/Setup.java        |  2 +-
 .../testing/core/randomwalk/bulk/Split.java        |  2 +-
 .../testing/core/randomwalk/bulk/Verify.java       |  8 ++--
 .../core/randomwalk/concurrent/AddSplits.java      |  6 +--
 .../core/randomwalk/concurrent/BatchScan.java      |  6 +--
 .../core/randomwalk/concurrent/BatchWrite.java     |  6 +--
 .../core/randomwalk/concurrent/BulkImport.java     |  6 +--
 .../concurrent/ChangeAuthorizations.java           |  8 ++--
 .../randomwalk/concurrent/ChangePermissions.java   | 35 ++++++++---------
 .../randomwalk/concurrent/CheckPermission.java     | 11 +++---
 .../core/randomwalk/concurrent/CloneTable.java     |  6 +--
 .../core/randomwalk/concurrent/Compact.java        |  6 +--
 .../testing/core/randomwalk/concurrent/Config.java | 20 +++++-----
 .../randomwalk/concurrent/CreateNamespace.java     |  6 +--
 .../core/randomwalk/concurrent/CreateTable.java    |  6 +--
 .../core/randomwalk/concurrent/CreateUser.java     |  6 +--
 .../randomwalk/concurrent/DeleteNamespace.java     |  6 +--
 .../core/randomwalk/concurrent/DeleteRange.java    |  6 +--
 .../core/randomwalk/concurrent/DeleteTable.java    |  6 +--
 .../core/randomwalk/concurrent/DropUser.java       |  6 +--
 .../core/randomwalk/concurrent/IsolatedScan.java   |  6 +--
 .../core/randomwalk/concurrent/ListSplits.java     |  6 +--
 .../testing/core/randomwalk/concurrent/Merge.java  |  6 +--
 .../core/randomwalk/concurrent/OfflineTable.java   |  8 ++--
 .../randomwalk/concurrent/RenameNamespace.java     |  6 +--
 .../core/randomwalk/concurrent/RenameTable.java    |  6 +--
 .../core/randomwalk/concurrent/Replication.java    |  2 +-
 .../core/randomwalk/concurrent/ScanTable.java      |  6 +--
 .../core/randomwalk/conditional/Compact.java       |  6 +--
 .../testing/core/randomwalk/conditional/Flush.java |  6 +--
 .../testing/core/randomwalk/conditional/Init.java  |  2 +-
 .../testing/core/randomwalk/conditional/Merge.java |  6 +--
 .../testing/core/randomwalk/conditional/Setup.java |  6 +--
 .../testing/core/randomwalk/conditional/Split.java |  6 +--
 .../core/randomwalk/conditional/Transfer.java      |  6 +--
 .../core/randomwalk/conditional/Verify.java        | 10 ++---
 .../core/randomwalk/image/ImageFixture.java        | 22 +++++------
 .../testing/core/randomwalk/image/ScanMeta.java    |  8 ++--
 .../testing/core/randomwalk/image/TableOp.java     |  6 +--
 .../testing/core/randomwalk/image/Verify.java      |  8 ++--
 .../core/randomwalk/multitable/CopyTable.java      |  8 ++--
 .../core/randomwalk/multitable/CreateTable.java    | 12 +++---
 .../core/randomwalk/multitable/DropTable.java      |  2 +-
 .../randomwalk/multitable/MultiTableFixture.java   |  6 +--
 .../core/randomwalk/multitable/OfflineTable.java   |  4 +-
 .../core/randomwalk/security/AlterSystemPerm.java  | 10 ++---
 .../core/randomwalk/security/AlterTablePerm.java   |  2 +-
 .../core/randomwalk/security/CreateTable.java      |  2 +-
 .../core/randomwalk/security/CreateUser.java       |  2 +-
 .../core/randomwalk/security/DropTable.java        |  2 +-
 .../testing/core/randomwalk/security/DropUser.java |  2 +-
 .../core/randomwalk/security/SecurityFixture.java  | 26 ++++++-------
 .../core/randomwalk/security/SecurityHelper.java   | 10 ++---
 .../testing/core/randomwalk/security/Validate.java | 12 +++---
 .../core/randomwalk/sequential/BatchVerify.java    |  6 +--
 .../core/randomwalk/sequential/MapRedVerify.java   |  8 ++--
 .../randomwalk/sequential/SequentialFixture.java   | 14 +++----
 .../testing/core/randomwalk/shard/BulkInsert.java  |  8 ++--
 .../testing/core/randomwalk/shard/CloneIndex.java  |  4 +-
 .../core/randomwalk/shard/CompactFilter.java       |  6 +--
 .../core/randomwalk/shard/DeleteSomeDocs.java      |  4 +-
 .../testing/core/randomwalk/shard/DeleteWord.java  |  4 +-
 .../testing/core/randomwalk/shard/ExportIndex.java | 24 ++++++------
 .../testing/core/randomwalk/shard/Flush.java       |  2 +-
 .../testing/core/randomwalk/shard/Grep.java        |  4 +-
 .../testing/core/randomwalk/shard/Merge.java       |  8 ++--
 .../testing/core/randomwalk/shard/Reindex.java     |  4 +-
 .../testing/core/randomwalk/shard/Search.java      |  4 +-
 .../core/randomwalk/shard/ShardFixture.java        | 32 ++++++++--------
 .../testing/core/randomwalk/shard/Split.java       |  2 +-
 .../testing/core/randomwalk/shard/VerifyIndex.java |  8 ++--
 .../accumulo/testing/core/scalability/Ingest.java  | 20 +++++-----
 .../testing/core/scalability/ScaleTest.java        |  8 ++--
 .../apache/accumulo/testing/core/stress/Scan.java  |  6 +--
 .../core/randomwalk/ReplicationRandomWalkIT.java   |  2 -
 104 files changed, 414 insertions(+), 420 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java b/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
index 5ec94c7..04efb40 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
@@ -10,7 +10,6 @@ import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.ClientInfo;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.hadoop.conf.Configuration;
@@ -114,7 +113,7 @@ public class TestEnv {
   }
 
   /**
-   * Gets an Accumulo connector. The same connector is reused after the first call.
+   * Gets an Accumulo client. The same client is reused after the first call.
    */
   public AccumuloClient getAccumuloClient() throws AccumuloException, AccumuloSecurityException {
     if (client == null) {
@@ -122,8 +121,4 @@ public class TestEnv {
     }
     return client;
   }
-
-  public Connector getAccumuloConnector() throws AccumuloException, AccumuloSecurityException {
-    return Connector.from(getAccumuloClient());
-  }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousBatchWalker.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousBatchWalker.java
index 2917800..af2a8c5 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousBatchWalker.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousBatchWalker.java
@@ -25,8 +25,8 @@ import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -48,15 +48,15 @@ public class ContinuousBatchWalker {
     ContinuousEnv env = new ContinuousEnv(args[0], args[1]);
 
     Authorizations auths = env.getRandomAuthorizations();
-    Connector conn = env.getAccumuloConnector();
-    Scanner scanner = ContinuousUtil.createScanner(conn, env.getAccumuloTableName(), auths);
+    AccumuloClient client = env.getAccumuloClient();
+    Scanner scanner = ContinuousUtil.createScanner(client, env.getAccumuloTableName(), auths);
     int scanBatchSize = Integer.parseInt(env.getTestProperty(TestProps.CI_BW_BATCH_SIZE));
     scanner.setBatchSize(scanBatchSize);
 
     Random r = new Random();
 
     while (true) {
-      BatchScanner bs = conn.createBatchScanner(env.getAccumuloTableName(), auths);
+      BatchScanner bs = client.createBatchScanner(env.getAccumuloTableName(), auths);
 
       Set<Text> batch = getBatch(scanner, env.getRowMin(), env.getRowMax(), scanBatchSize, r);
       List<Range> ranges = new ArrayList<>(batch.size());
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
index 729fc53..499be09 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
@@ -29,8 +29,8 @@ import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
 import com.google.common.base.Preconditions;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.data.Mutation;
@@ -122,13 +122,13 @@ public class ContinuousIngest {
       throw new IllegalArgumentException("bad min and max");
     }
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     String tableName = env.getAccumuloTableName();
-    if (!conn.tableOperations().exists(tableName)) {
+    if (!client.tableOperations().exists(tableName)) {
       throw new TableNotFoundException(null, tableName, "Consult the README and create the table before starting ingest.");
     }
 
-    BatchWriter bw = conn.createBatchWriter(tableName);
+    BatchWriter bw = client.createBatchWriter(tableName);
     bw = Trace.wrapAll(bw, new CountSampler(1024));
 
     Random r = new Random();
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
index abaccc9..dad8d69 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
@@ -130,7 +130,7 @@ public class ContinuousMoru extends Configured implements Tool {
 
     // set up ranges
     try {
-      Set<Range> ranges = env.getAccumuloConnector().tableOperations().splitRangeByTablets(env.getAccumuloTableName(), new Range(), maxMaps);
+      Set<Range> ranges = env.getAccumuloClient().tableOperations().splitRangeByTablets(env.getAccumuloTableName(), new Range(), maxMaps);
       AccumuloInputFormat.setRanges(job, ranges);
       AccumuloInputFormat.setAutoAdjustRanges(job, false);
     } catch (Exception e) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
index c051691..3464678 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
@@ -23,7 +23,7 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -47,9 +47,9 @@ public class ContinuousScanner {
 
     long distance = 1000000000000l;
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     Authorizations auths = env.getRandomAuthorizations();
-    Scanner scanner = ContinuousUtil.createScanner(conn, env.getAccumuloTableName(), auths);
+    Scanner scanner = ContinuousUtil.createScanner(client, env.getAccumuloTableName(), auths);
 
     int numToScan = Integer.parseInt(env.getTestProperty(TestProps.CI_SCANNER_ENTRIES));
     int scannerSleepMs = Integer.parseInt(env.getTestProperty(TestProps.CI_SCANNER_SLEEP_MS));
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousUtil.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousUtil.java
index 5a67a34..050bf24 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousUtil.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousUtil.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.testing.core.continuous;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.security.Authorizations;
@@ -30,8 +30,8 @@ final class ContinuousUtil {
   /**
    * Attempt to create a table scanner, or fail if the table does not exist.
    *
-   * @param connector
-   *          A populated connector object
+   * @param client
+   *          A populated AccumuloClient object
    * @param table
    *          The table name to scan over
    * @param auths
@@ -40,10 +40,10 @@ final class ContinuousUtil {
    * @throws TableNotFoundException
    *           If the table does not exist
    */
-  static Scanner createScanner(Connector connector, String table, Authorizations auths) throws TableNotFoundException {
-    if (!connector.tableOperations().exists(table)) {
+  static Scanner createScanner(AccumuloClient client, String table, Authorizations auths) throws TableNotFoundException {
+    if (!client.tableOperations().exists(table)) {
       throw new TableNotFoundException(null, table, "Consult the README and create the table before starting test processes.");
     }
-    return connector.createScanner(table, auths);
+    return client.createScanner(table, auths);
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
index 6eef2fe..1add7dd 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -158,18 +158,18 @@ public class ContinuousVerify extends Configured implements Tool {
 
     Set<Range> ranges;
     String clone = "";
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     if (scanOffline) {
       Random random = new Random();
       clone = tableName + "_" + String.format("%016x", (random.nextLong() & 0x7fffffffffffffffL));
-      conn.tableOperations().clone(tableName, clone, true, new HashMap<>(), new HashSet<>());
-      ranges = conn.tableOperations().splitRangeByTablets(tableName, new Range(), maxMaps);
-      conn.tableOperations().offline(clone);
+      client.tableOperations().clone(tableName, clone, true, new HashMap<>(), new HashSet<>());
+      ranges = client.tableOperations().splitRangeByTablets(tableName, new Range(), maxMaps);
+      client.tableOperations().offline(clone);
       AccumuloInputFormat.setInputTableName(job, clone);
       AccumuloInputFormat.setOfflineTableScan(job, true);
     } else {
-      ranges = conn.tableOperations().splitRangeByTablets(tableName, new Range(), maxMaps);
+      ranges = client.tableOperations().splitRangeByTablets(tableName, new Range(), maxMaps);
       AccumuloInputFormat.setInputTableName(job, tableName);
     }
 
@@ -193,7 +193,7 @@ public class ContinuousVerify extends Configured implements Tool {
     job.waitForCompletion(true);
 
     if (scanOffline) {
-      conn.tableOperations().delete(clone);
+      client.tableOperations().delete(clone);
     }
     return job.isSuccessful() ? 0 : 1;
   }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousWalk.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousWalk.java
index aa5b899..bb45853 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousWalk.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousWalk.java
@@ -23,7 +23,7 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.zip.CRC32;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -51,7 +51,7 @@ public class ContinuousWalk {
     }
     ContinuousEnv env = new ContinuousEnv(args[0], args[1]);
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random r = new Random();
 
@@ -60,7 +60,7 @@ public class ContinuousWalk {
     int sleepTime = Integer.parseInt(env.getTestProperty(TestProps.CI_WALKER_SLEEP_MS));
 
     while (true) {
-      Scanner scanner = ContinuousUtil.createScanner(conn, env.getAccumuloTableName(), env.getRandomAuthorizations());
+      Scanner scanner = ContinuousUtil.createScanner(client, env.getAccumuloTableName(), env.getRandomAuthorizations());
       String row = findAStartRow(env.getRowMin(), env.getRowMax(), scanner, r);
 
       while (row != null) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
index c2386cb..1ba6de6 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.continuous;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.testing.core.TestProps;
 import org.apache.hadoop.io.Text;
 
@@ -33,9 +33,9 @@ public class CreateTable {
     }
     ContinuousEnv env = new ContinuousEnv(args[0], args[1]);
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     String tableName = env.getAccumuloTableName();
-    if (conn.tableOperations().exists(tableName)) {
+    if (client.tableOperations().exists(tableName)) {
       System.err.println("ERROR: Accumulo table '" + tableName + "' already exists");
       System.exit(-1);
     }
@@ -50,7 +50,7 @@ public class CreateTable {
       System.exit(-1);
     }
 
-    conn.tableOperations().create(tableName);
+    client.tableOperations().create(tableName);
 
     SortedSet<Text> splits = new TreeSet<>();
     int numSplits = numTablets - 1;
@@ -65,7 +65,7 @@ public class CreateTable {
       split += distance;
     }
 
-    conn.tableOperations().addSplits(tableName, splits);
+    client.tableOperations().addSplits(tableName, splits);
     System.out.println("Created Accumulo table '" + tableName + "' with " + numTablets + " tablets");
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
index ccd5a78..8c4c14d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/UndefinedAnalyzer.java
@@ -280,8 +280,8 @@ public class UndefinedAnalyzer {
       undefs.add(new UndefinedNode(undef, ref));
     }
 
-    AccumuloClient conn = opts.getClient();
-    BatchScanner bscanner = conn.createBatchScanner(opts.getTableName(), opts.auths, bsOpts.scanThreads);
+    AccumuloClient client = opts.getClient();
+    BatchScanner bscanner = client.createBatchScanner(opts.getTableName(), opts.auths, bsOpts.scanThreads);
     bscanner.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS);
     List<Range> refs = new ArrayList<>();
 
@@ -306,7 +306,7 @@ public class UndefinedAnalyzer {
     bscanner.close();
 
     IngestInfo ingestInfo = new IngestInfo(opts.logDir);
-    String tableId = conn.tableOperations().tableIdMap().get(opts.getTableName());
+    String tableId = client.tableOperations().tableIdMap().get(opts.getTableName());
     TabletHistory tabletHistory = new TabletHistory(tableId, opts.logDir);
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/ingest/TestIngest.java b/core/src/main/java/org/apache/accumulo/testing/core/ingest/TestIngest.java
index 57a3cf1..88b329f 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/ingest/TestIngest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/ingest/TestIngest.java
@@ -109,14 +109,14 @@ public class TestIngest {
     }
   }
 
-  public static void createTable(AccumuloClient conn, Opts args) throws AccumuloException, AccumuloSecurityException, TableExistsException {
+  public static void createTable(AccumuloClient client, Opts args) throws AccumuloException, AccumuloSecurityException, TableExistsException {
     if (args.createTable) {
       TreeSet<Text> splits = getSplitPoints(args.startRow, args.startRow + args.rows, args.numsplits);
 
-      if (!conn.tableOperations().exists(args.getTableName()))
-        conn.tableOperations().create(args.getTableName());
+      if (!client.tableOperations().exists(args.getTableName()))
+        client.tableOperations().create(args.getTableName());
       try {
-        conn.tableOperations().addSplits(args.getTableName(), splits);
+        client.tableOperations().addSplits(args.getTableName(), splits);
       } catch (TableNotFoundException ex) {
         // unlikely
         throw new RuntimeException(ex);
@@ -200,7 +200,7 @@ public class TestIngest {
     }
   }
 
-  public static void ingest(AccumuloClient connector, FileSystem fs, Opts opts, BatchWriterOpts bwOpts) throws IOException, AccumuloException,
+  public static void ingest(AccumuloClient client, FileSystem fs, Opts opts, BatchWriterOpts bwOpts) throws IOException, AccumuloException,
       AccumuloSecurityException, TableNotFoundException, MutationsRejectedException, TableExistsException {
     long stopTime;
 
@@ -211,7 +211,7 @@ public class TestIngest {
 
     long bytesWritten = 0;
 
-    createTable(connector, opts);
+    createTable(client, opts);
 
     BatchWriter bw = null;
     FileSKVWriter writer = null;
@@ -222,8 +222,8 @@ public class TestIngest {
           .withTableConfiguration(DefaultConfiguration.getInstance()).build();
       writer.startDefaultLocalityGroup();
     } else {
-      bw = connector.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
-      connector.securityOperations().changeUserAuthorizations(opts.getPrincipal(), AUTHS);
+      bw = client.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
+      client.securityOperations().changeUserAuthorizations(opts.getPrincipal(), AUTHS);
     }
     Text labBA = new Text(opts.columnVisibility.getExpression());
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/ingest/VerifyIngest.java b/core/src/main/java/org/apache/accumulo/testing/core/ingest/VerifyIngest.java
index 2fd62b1..fbd0179 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/ingest/VerifyIngest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/ingest/VerifyIngest.java
@@ -77,12 +77,12 @@ public class VerifyIngest {
     }
   }
 
-  public static void verifyIngest(AccumuloClient connector, Opts opts, ScannerOpts scanOpts) throws AccumuloException, AccumuloSecurityException,
+  public static void verifyIngest(AccumuloClient client, Opts opts, ScannerOpts scanOpts) throws AccumuloException, AccumuloSecurityException,
       TableNotFoundException {
     byte[][] bytevals = TestIngest.generateValues(opts.dataSize);
 
     Authorizations labelAuths = new Authorizations("L1", "L2", "G1", "GROUP2");
-    connector.securityOperations().changeUserAuthorizations(opts.getPrincipal(), labelAuths);
+    client.securityOperations().changeUserAuthorizations(opts.getPrincipal(), labelAuths);
 
     int expectedRow = opts.startRow;
     int expectedCol = 0;
@@ -105,7 +105,7 @@ public class VerifyIngest {
         Text colf = new Text(opts.columnFamily);
         Text colq = new Text("col_" + String.format("%07d", expectedCol));
 
-        Scanner scanner = connector.createScanner("test_ingest", labelAuths);
+        Scanner scanner = client.createScanner("test_ingest", labelAuths);
         scanner.setBatchSize(1);
         Key startKey = new Key(rowKey, colf, colq);
         Range range = new Range(startKey, startKey.followingKey(PartialKey.ROW_COLFAM_COLQUAL));
@@ -149,7 +149,7 @@ public class VerifyIngest {
 
         Key startKey = new Key(new Text("row_" + String.format("%010d", expectedRow)));
 
-        Scanner scanner = connector.createScanner(opts.getTableName(), labelAuths);
+        Scanner scanner = client.createScanner(opts.getTableName(), labelAuths);
         scanner.setBatchSize(scanOpts.scanBatchSize);
         scanner.setRange(new Range(startKey, endKey));
         for (int j = 0; j < opts.cols; j++) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
index 7af352e..030eca9 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
@@ -114,17 +114,17 @@ public class CompareTables {
 
   public Map<String,String> computeAllHashes() throws AccumuloException, AccumuloSecurityException, TableExistsException, NoSuchAlgorithmException,
       TableNotFoundException, FileNotFoundException {
-    final AccumuloClient conn = opts.getClient();
+    final AccumuloClient client = opts.getClient();
     final Map<String,String> hashesByTable = new HashMap<>();
 
     for (String table : opts.getTables()) {
       final String outputTableName = table + "_merkle";
 
-      if (conn.tableOperations().exists(outputTableName)) {
+      if (client.tableOperations().exists(outputTableName)) {
         throw new IllegalArgumentException("Expected output table name to not yet exist: " + outputTableName);
       }
 
-      conn.tableOperations().create(outputTableName);
+      client.tableOperations().create(outputTableName);
 
       GenerateHashes genHashes = new GenerateHashes();
       Collection<Range> ranges = genHashes.getRanges(opts.getClient(), table, opts.getSplitsFile());
@@ -137,7 +137,7 @@ public class CompareTables {
       }
 
       ComputeRootHash computeRootHash = new ComputeRootHash();
-      String hash = Hex.encodeHexString(computeRootHash.getHash(conn, outputTableName, opts.getHashName()));
+      String hash = Hex.encodeHexString(computeRootHash.getHash(client, outputTableName, opts.getHashName()));
 
       hashesByTable.put(table, hash);
     }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
index b3d664e..dc727ce 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
@@ -59,24 +59,24 @@ public class ComputeRootHash {
   }
 
   public byte[] getHash(ComputeRootHashOpts opts) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, NoSuchAlgorithmException {
-    AccumuloClient conn = opts.getClient();
+    AccumuloClient client = opts.getClient();
     String table = opts.getTableName();
 
-    return getHash(conn, table, opts.getHashName());
+    return getHash(client, table, opts.getHashName());
   }
 
-  public byte[] getHash(AccumuloClient conn, String table, String hashName) throws TableNotFoundException, NoSuchAlgorithmException {
-    List<MerkleTreeNode> leaves = getLeaves(conn, table);
+  public byte[] getHash(AccumuloClient client, String table, String hashName) throws TableNotFoundException, NoSuchAlgorithmException {
+    List<MerkleTreeNode> leaves = getLeaves(client, table);
 
     MerkleTree tree = new MerkleTree(leaves, hashName);
 
     return tree.getRootNode().getHash();
   }
 
-  protected ArrayList<MerkleTreeNode> getLeaves(AccumuloClient conn, String tableName) throws TableNotFoundException {
+  protected ArrayList<MerkleTreeNode> getLeaves(AccumuloClient client, String tableName) throws TableNotFoundException {
     // TODO make this a bit more resilient to very large merkle trees by
     // lazily reading more data from the table when necessary
-    final Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
+    final Scanner s = client.createScanner(tableName, Authorizations.EMPTY);
     final ArrayList<MerkleTreeNode> leaves = new ArrayList<>();
 
     for (Entry<Key,Value> entry : s) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
index 126ea5f..3162ada 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
@@ -121,11 +121,11 @@ public class GenerateHashes {
     }
   }
 
-  public Collection<Range> getRanges(AccumuloClient conn, String tableName, String splitsFile) throws TableNotFoundException, AccumuloSecurityException,
+  public Collection<Range> getRanges(AccumuloClient client, String tableName, String splitsFile) throws TableNotFoundException, AccumuloSecurityException,
       AccumuloException, FileNotFoundException {
     if (null == splitsFile) {
       log.info("Using table split points");
-      Collection<Text> endRows = conn.tableOperations().listSplits(tableName);
+      Collection<Text> endRows = client.tableOperations().listSplits(tableName);
       return endRowsToRanges(endRows);
     } else {
       log.info("Using provided split points");
@@ -156,16 +156,16 @@ public class GenerateHashes {
     run(opts.getClient(), opts.getTableName(), opts.getOutputTableName(), opts.getHashName(), opts.getNumThreads(), opts.isIteratorPushdown(), ranges);
   }
 
-  public void run(final AccumuloClient conn, final String inputTableName, final String outputTableName, final String digestName, int numThreads,
+  public void run(final AccumuloClient client, final String inputTableName, final String outputTableName, final String digestName, int numThreads,
       final boolean iteratorPushdown, final Collection<Range> ranges) throws TableNotFoundException, AccumuloSecurityException, AccumuloException,
       NoSuchAlgorithmException {
-    if (!conn.tableOperations().exists(outputTableName)) {
+    if (!client.tableOperations().exists(outputTableName)) {
       throw new IllegalArgumentException(outputTableName + " does not exist, please create it");
     }
 
     // Get some parallelism
     ExecutorService svc = Executors.newFixedThreadPool(numThreads);
-    final BatchWriter bw = conn.createBatchWriter(outputTableName, new BatchWriterConfig());
+    final BatchWriter bw = client.createBatchWriter(outputTableName, new BatchWriterConfig());
 
     try {
       for (final Range range : ranges) {
@@ -177,7 +177,7 @@ public class GenerateHashes {
           public void run() {
             Scanner s;
             try {
-              s = conn.createScanner(inputTableName, Authorizations.EMPTY);
+              s = client.createScanner(inputTableName, Authorizations.EMPTY);
             } catch (Exception e) {
               log.error("Could not get scanner for " + inputTableName, e);
               throw new RuntimeException(e);
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ManualComparison.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ManualComparison.java
index 2ff6046..dabac7d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ManualComparison.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ManualComparison.java
@@ -46,9 +46,9 @@ public class ManualComparison {
     ManualComparisonOpts opts = new ManualComparisonOpts();
     opts.parseArgs("ManualComparison", args);
 
-    AccumuloClient conn = opts.getClient();
+    AccumuloClient client = opts.getClient();
 
-    Scanner s1 = conn.createScanner(opts.table1, Authorizations.EMPTY), s2 = conn.createScanner(opts.table2, Authorizations.EMPTY);
+    Scanner s1 = client.createScanner(opts.table1, Authorizations.EMPTY), s2 = client.createScanner(opts.table2, Authorizations.EMPTY);
     Iterator<Entry<Key,Value>> iter1 = s1.iterator(), iter2 = s2.iterator();
     boolean incrementFirst = true, incrementSecond = true;
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
index 1c63575..aa8e27b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
@@ -64,7 +64,7 @@ public class RandomWorkload {
     run(opts.getClient(), opts.getTableName(), cfg, opts.numRecords, opts.rowMax, opts.cfMax, opts.cqMax, opts.deletePercent);
   }
 
-  public void run(final AccumuloClient conn, final String tableName, final BatchWriterConfig cfg, final long numRecords, int rowMax, int cfMax, int cqMax,
+  public void run(final AccumuloClient client, final String tableName, final BatchWriterConfig cfg, final long numRecords, int rowMax, int cfMax, int cqMax,
       int deletePercent) throws Exception {
 
     final Random rowRand = new Random(12345);
@@ -73,11 +73,11 @@ public class RandomWorkload {
     final Random deleteRand = new Random(12348);
     long valueCounter = 0l;
 
-    if (!conn.tableOperations().exists(tableName)) {
-      conn.tableOperations().create(tableName);
+    if (!client.tableOperations().exists(tableName)) {
+      client.tableOperations().create(tableName);
     }
 
-    BatchWriter bw = conn.createBatchWriter(tableName, cfg);
+    BatchWriter bw = client.createBatchWriter(tableName, cfg);
     try {
       final Text row = new Text(), cf = new Text(), cq = new Text();
       final Value value = new Value();
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/performance/Environment.java b/core/src/main/java/org/apache/accumulo/testing/core/performance/Environment.java
index 941fb8c..b5b9806 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/performance/Environment.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/performance/Environment.java
@@ -17,8 +17,8 @@
 
 package org.apache.accumulo.testing.core.performance;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 
 public interface Environment {
-  Connector getConnector();
+  AccumuloClient getClient();
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/performance/impl/PerfTestRunner.java b/core/src/main/java/org/apache/accumulo/testing/core/performance/impl/PerfTestRunner.java
index bbca0f3..03566e4 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/performance/impl/PerfTestRunner.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/performance/impl/PerfTestRunner.java
@@ -27,7 +27,6 @@ import java.time.format.DateTimeFormatter;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.testing.core.performance.Environment;
 import org.apache.accumulo.testing.core.performance.PerformanceTest;
 import org.apache.accumulo.testing.core.performance.Report;
@@ -50,8 +49,8 @@ public class PerfTestRunner {
 
     Report result = perfTest.runTest(new Environment() {
       @Override
-      public Connector getConnector() {
-        return Connector.from(client);
+      public AccumuloClient getClient() {
+        return client;
       }
     });
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/RandomCachedLookupsPT.java b/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/RandomCachedLookupsPT.java
index e3f7b9b..28d34bb 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/RandomCachedLookupsPT.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/RandomCachedLookupsPT.java
@@ -31,9 +31,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.Stream;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -78,17 +78,17 @@ public class RandomCachedLookupsPT implements PerformanceTest {
   public Report runTest(Environment env) throws Exception {
     Builder reportBuilder = Report.builder();
 
-    writeData(reportBuilder, env.getConnector(), NUM_ROWS);
+    writeData(reportBuilder, env.getClient(), NUM_ROWS);
 
-    long warmup = doLookups(env.getConnector(), 32, NUM_LOOKUPS_PER_THREAD);
+    long warmup = doLookups(env.getClient(), 32, NUM_LOOKUPS_PER_THREAD);
 
-    long d1 = doLookups(env.getConnector(), 1, NUM_LOOKUPS_PER_THREAD);
-    long d4 = doLookups(env.getConnector(), 4, NUM_LOOKUPS_PER_THREAD);
-    long d8 = doLookups(env.getConnector(), 8, NUM_LOOKUPS_PER_THREAD);
-    long d16 = doLookups(env.getConnector(), 16, NUM_LOOKUPS_PER_THREAD);
-    long d32 = doLookups(env.getConnector(), 32, NUM_LOOKUPS_PER_THREAD);
-    long d64 = doLookups(env.getConnector(), 64, NUM_LOOKUPS_PER_THREAD);
-    long d128 = doLookups(env.getConnector(), 128, NUM_LOOKUPS_PER_THREAD);
+    long d1 = doLookups(env.getClient(), 1, NUM_LOOKUPS_PER_THREAD);
+    long d4 = doLookups(env.getClient(), 4, NUM_LOOKUPS_PER_THREAD);
+    long d8 = doLookups(env.getClient(), 8, NUM_LOOKUPS_PER_THREAD);
+    long d16 = doLookups(env.getClient(), 16, NUM_LOOKUPS_PER_THREAD);
+    long d32 = doLookups(env.getClient(), 32, NUM_LOOKUPS_PER_THREAD);
+    long d64 = doLookups(env.getClient(), 64, NUM_LOOKUPS_PER_THREAD);
+    long d128 = doLookups(env.getClient(), 128, NUM_LOOKUPS_PER_THREAD);
 
     reportBuilder.id("smalls");
     reportBuilder.description("Runs multiple threads each doing lots of small random scans.  For this test data and index cache are enabled.");
@@ -112,7 +112,7 @@ public class RandomCachedLookupsPT implements PerformanceTest {
     return reportBuilder.build();
   }
 
-  public static void writeData(Builder reportBuilder, Connector conn, int numRows) throws Exception {
+  public static void writeData(Builder reportBuilder, AccumuloClient client, int numRows) throws Exception {
 
     reportBuilder.parameter("rows", numRows, "Number of random rows written.  Each row has 4 columns.");
 
@@ -126,21 +126,21 @@ public class RandomCachedLookupsPT implements PerformanceTest {
 
     long t1 = System.currentTimeMillis();
     try {
-      conn.tableOperations().create("scanpt", ntc);
+      client.tableOperations().create("scanpt", ntc);
     } catch (TableExistsException tee) {
-      conn.tableOperations().delete("scanpt");
-      conn.tableOperations().create("scanpt", ntc);
+      client.tableOperations().delete("scanpt");
+      client.tableOperations().create("scanpt", ntc);
     }
 
     long t2 = System.currentTimeMillis();
 
     SortedSet<Text> partitionKeys = new TreeSet<>(
         Stream.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f").map(Text::new).collect(toList()));
-    conn.tableOperations().addSplits("scanpt", partitionKeys);
+    client.tableOperations().addSplits("scanpt", partitionKeys);
 
     long t3 = System.currentTimeMillis();
 
-    BatchWriter bw = conn.createBatchWriter("scanpt", new BatchWriterConfig());
+    BatchWriter bw = client.createBatchWriter("scanpt", new BatchWriterConfig());
 
     Random rand = new Random();
 
@@ -167,11 +167,11 @@ public class RandomCachedLookupsPT implements PerformanceTest {
 
     long t4 = System.currentTimeMillis();
 
-    conn.tableOperations().compact("scanpt", new CompactionConfig().setFlush(true).setWait(true));
+    client.tableOperations().compact("scanpt", new CompactionConfig().setFlush(true).setWait(true));
 
     long t5 = System.currentTimeMillis();
 
-    try (Scanner scanner = conn.createScanner("scanpt", Authorizations.EMPTY)) {
+    try (Scanner scanner = client.createScanner("scanpt", Authorizations.EMPTY)) {
       // scan entire table to bring it into cache
       Iterables.size(scanner);
     }
@@ -185,7 +185,7 @@ public class RandomCachedLookupsPT implements PerformanceTest {
     reportBuilder.info("fullScan", 4 * numRows, t6 - t5, "Rate to do full table scan in entries/sec");
   }
 
-  private static long doLookups(Connector conn, int numThreads, int numScansPerThread) throws Exception {
+  private static long doLookups(AccumuloClient client, int numThreads, int numScansPerThread) throws Exception {
 
     ExecutorService es = Executors.newFixedThreadPool(numThreads);
 
@@ -194,7 +194,7 @@ public class RandomCachedLookupsPT implements PerformanceTest {
     long t1 = System.currentTimeMillis();
 
     for (int i = 0; i < numThreads; i++) {
-      futures.add(es.submit(() -> doLookups(conn, numScansPerThread)));
+      futures.add(es.submit(() -> doLookups(client, numScansPerThread)));
     }
 
     for (Future<?> future : futures) {
@@ -208,12 +208,12 @@ public class RandomCachedLookupsPT implements PerformanceTest {
     return t2 -t1;
   }
 
-  private static void doLookups(Connector conn, int numScans) {
+  private static void doLookups(AccumuloClient client, int numScans) {
     try {
       Random rand = new Random();
 
       for (int i = 0; i < numScans; i++) {
-        Scanner scanner = conn.createScanner("scanpt", Authorizations.EMPTY);
+        Scanner scanner = client.createScanner("scanpt", Authorizations.EMPTY);
 
         scanner.setRange(new Range(toHex(rand.nextLong())));
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanExecutorPT.java b/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanExecutorPT.java
index f604355..994af06 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanExecutorPT.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanExecutorPT.java
@@ -25,7 +25,7 @@ import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.admin.NewTableConfiguration;
@@ -86,13 +86,13 @@ public class ScanExecutorPT implements PerformanceTest {
     props.put(Property.TABLE_SCAN_DISPATCHER_OPTS.getKey() + "executor", "se1");
     props.put(Property.TABLE_SCAN_DISPATCHER_OPTS.getKey() + "heed_hints", "true");
 
-    env.getConnector().tableOperations().create(tableName,
+    env.getClient().tableOperations().create(tableName,
         new NewTableConfiguration().setProperties(props));
 
     long t1 = System.currentTimeMillis();
-    TestData.generate(env.getConnector(), tableName, NUM_ROWS, NUM_FAMS, NUM_QUALS);
+    TestData.generate(env.getClient(), tableName, NUM_ROWS, NUM_FAMS, NUM_QUALS);
     long t2 = System.currentTimeMillis();
-    env.getConnector().tableOperations().compact(tableName, null, null, true, true);
+    env.getClient().tableOperations().compact(tableName, null, null, true, true);
     long t3 = System.currentTimeMillis();
 
     AtomicBoolean stop = new AtomicBoolean(false);
@@ -134,7 +134,7 @@ public class ScanExecutorPT implements PerformanceTest {
     return builder.build();
   }
 
-  private static long scan(String tableName, Connector c, byte[] row, byte[] fam, Map<String,String> hints) throws TableNotFoundException {
+  private static long scan(String tableName, AccumuloClient c, byte[] row, byte[] fam, Map<String,String> hints) throws TableNotFoundException {
     long t1 = System.currentTimeMillis();
     int count = 0;
     try (Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY)) {
@@ -148,7 +148,7 @@ public class ScanExecutorPT implements PerformanceTest {
     return System.currentTimeMillis() - t1;
   }
 
-  private long scan(String tableName, Connector c, AtomicBoolean stop, Map<String,String> hints) throws TableNotFoundException {
+  private long scan(String tableName, AccumuloClient c, AtomicBoolean stop, Map<String,String> hints) throws TableNotFoundException {
     long count = 0;
     while (!stop.get()) {
       try (Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY)) {
@@ -179,7 +179,7 @@ public class ScanExecutorPT implements PerformanceTest {
         // scans have a 20% chance of getting dedicated thread pool and 80% chance of getting high
         // priority
         Map<String,String> hints = rand.nextInt(10) <= 1 ? execHints : prioHints;
-        executor.submit(() -> scan(tableName, env.getConnector(), row, fam, hints));
+        executor.submit(() -> scan(tableName, env.getClient(), row, fam, hints));
       }
 
       return executor.stream().mapToLong(l -> l).summaryStatistics();
@@ -192,7 +192,7 @@ public class ScanExecutorPT implements PerformanceTest {
     TestExecutor<Long> longScans = new TestExecutor<>(NUM_LONG_SCANS);
 
     for (int i = 0; i < NUM_LONG_SCANS; i++) {
-      longScans.submit(() -> scan(tableName, env.getConnector(), stop, hints));
+      longScans.submit(() -> scan(tableName, env.getClient(), stop, hints));
     }
     return longScans;
   }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanFewFamiliesPT.java b/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanFewFamiliesPT.java
index 3dcf261..b098ba0 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanFewFamiliesPT.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/performance/tests/ScanFewFamiliesPT.java
@@ -22,7 +22,7 @@ import java.util.LongSummaryStatistics;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.security.Authorizations;
@@ -54,12 +54,12 @@ public class ScanFewFamiliesPT implements PerformanceTest {
 
     String tableName = "bigFamily";
 
-    env.getConnector().tableOperations().create(tableName);
+    env.getClient().tableOperations().create(tableName);
 
     long t1 = System.currentTimeMillis();
-    TestData.generate(env.getConnector(), tableName, NUM_ROWS, NUM_FAMS, NUM_QUALS);
+    TestData.generate(env.getClient(), tableName, NUM_ROWS, NUM_FAMS, NUM_QUALS);
     long t2 = System.currentTimeMillis();
-    env.getConnector().tableOperations().compact(tableName, null, null, true, true);
+    env.getClient().tableOperations().compact(tableName, null, null, true, true);
     long t3 = System.currentTimeMillis();
     // warm up run
     runScans(env, tableName, 1);
@@ -88,12 +88,12 @@ public class ScanFewFamiliesPT implements PerformanceTest {
     Random rand = new Random();
     LongSummaryStatistics stats = new LongSummaryStatistics();
     for (int i = 0; i < 50; i++) {
-      stats.accept(scan(tableName, env.getConnector(), rand, numFamilies));
+      stats.accept(scan(tableName, env.getClient(), rand, numFamilies));
     }
     return stats;
   }
 
-  private static long scan(String tableName, Connector c, Random rand, int numFamilies) throws TableNotFoundException {
+  private static long scan(String tableName, AccumuloClient c, Random rand, int numFamilies) throws TableNotFoundException {
 
     Set<Text> families = new HashSet<>(numFamilies);
     while(families.size() < numFamilies) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/performance/util/TestData.java b/core/src/main/java/org/apache/accumulo/testing/core/performance/util/TestData.java
index a626a25..ef74cc3 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/performance/util/TestData.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/performance/util/TestData.java
@@ -17,8 +17,8 @@
 
 package org.apache.accumulo.testing.core.performance.util;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.util.FastFormat;
 
@@ -42,8 +42,8 @@ public class TestData {
     return FastFormat.toZeroPaddedString(v, 9, 16, EMPTY);
   }
 
-  public static void generate(Connector conn, String tableName, int rows, int fams, int quals) throws Exception {
-    try (BatchWriter writer = conn.createBatchWriter(tableName)) {
+  public static void generate(AccumuloClient client, String tableName, int rows, int fams, int quals) throws Exception {
+    try (BatchWriter writer = client.createBatchWriter(tableName)) {
       int v = 0;
       for (int r = 0; r < rows; r++) {
         Mutation m = new Mutation(row(r));
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
index ef26591..7a39459 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
@@ -335,7 +335,7 @@ public class Module extends Node {
           if (test)
             stopTimer(nextNode);
         } catch (Exception e) {
-          log.debug("Connector belongs to user: " + env.getAccumuloConnector().whoami());
+          log.debug("AccumuloClient belongs to user: " + env.getAccumuloClient().whoami());
           log.debug("Exception occured at: " + System.currentTimeMillis());
           log.debug("Properties for node: " + nextNodeId);
           for (Entry<Object,Object> entry : nodeProps.entrySet()) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkPlusOne.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkPlusOne.java
index dba0463..40fbaf1 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkPlusOne.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkPlusOne.java
@@ -93,7 +93,7 @@ public class BulkPlusOne extends BulkImportTest {
       }
       writer.close();
     }
-    env.getAccumuloConnector().tableOperations().importDirectory(Setup.getTableName(), dir.toString(), fail.toString(), true);
+    env.getAccumuloClient().tableOperations().importDirectory(Setup.getTableName(), dir.toString(), fail.toString(), true);
     fs.delete(dir, true);
     FileStatus[] failures = fs.listStatus(fail);
     if (failures != null && failures.length > 0) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Compact.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Compact.java
index bca7547..4f6e4c3 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Compact.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Compact.java
@@ -27,7 +27,7 @@ public class Compact extends SelectiveBulkTest {
     final Text[] points = Merge.getRandomTabletRange(state);
     final String rangeString = Merge.rangeToString(points);
     log.info("Compacting " + rangeString);
-    env.getAccumuloConnector().tableOperations().compact(Setup.getTableName(), points[0], points[1], false, true);
+    env.getAccumuloClient().tableOperations().compact(Setup.getTableName(), points[0], points[1], false, true);
     log.info("Compaction " + rangeString + " finished");
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/ConsistencyCheck.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/ConsistencyCheck.java
index 71ff853..a7e16ce 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/ConsistencyCheck.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/ConsistencyCheck.java
@@ -36,9 +36,9 @@ public class ConsistencyCheck extends SelectiveBulkTest {
     Random rand = (Random) state.get("rand");
     Text row = Merge.getRandomRow(rand);
     log.info("Checking " + row);
-    String user = env.getAccumuloConnector().whoami();
-    Authorizations auths = env.getAccumuloConnector().securityOperations().getUserAuthorizations(user);
-    try (Scanner scanner = new IsolatedScanner(env.getAccumuloConnector().createScanner(Setup.getTableName(), auths))) {
+    String user = env.getAccumuloClient().whoami();
+    Authorizations auths = env.getAccumuloClient().securityOperations().getUserAuthorizations(user);
+    try (Scanner scanner = new IsolatedScanner(env.getAccumuloClient().createScanner(Setup.getTableName(), auths))) {
       scanner.setRange(new Range(row));
       scanner.fetchColumnFamily(BulkPlusOne.CHECK_COLUMN_FAMILY);
       Value v = null;
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Merge.java
index dee6501..e00bdc1 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Merge.java
@@ -29,7 +29,7 @@ public class Merge extends SelectiveBulkTest {
   protected void runLater(State state, RandWalkEnv env) throws Exception {
     Text[] points = getRandomTabletRange(state);
     log.info("merging " + rangeToString(points));
-    env.getAccumuloConnector().tableOperations().merge(Setup.getTableName(), points[0], points[1]);
+    env.getAccumuloClient().tableOperations().merge(Setup.getTableName(), points[0], points[1]);
     log.info("merging " + rangeToString(points) + " complete");
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/SelectiveQueueing.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/SelectiveQueueing.java
index 80882b5..1f7c5e9 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/SelectiveQueueing.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/SelectiveQueueing.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.testing.core.randomwalk.bulk;
 
 import java.util.concurrent.ThreadPoolExecutor;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
 import org.slf4j.Logger;
@@ -33,8 +33,8 @@ public class SelectiveQueueing {
   public static boolean shouldQueueOperation(State state, RandWalkEnv env) throws Exception {
     final ThreadPoolExecutor pool = (ThreadPoolExecutor) state.get("pool");
     long queuedThreads = pool.getTaskCount() - pool.getActiveCount() - pool.getCompletedTaskCount();
-    final Connector conn = env.getAccumuloConnector();
-    int numTservers = conn.instanceOperations().getTabletServers().size();
+    final AccumuloClient client = env.getAccumuloClient();
+    int numTservers = client.instanceOperations().getTabletServers().size();
 
     if (!shouldQueue(queuedThreads, numTservers)) {
       log.info("Not queueing because of " + queuedThreads + " outstanding tasks");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Setup.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Setup.java
index c9ce9de..ed2f699 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Setup.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Setup.java
@@ -45,7 +45,7 @@ public class Setup extends Test {
     tableName = String.format("bulk_%s_%s_%d", hostname, pid, System.currentTimeMillis());
     log.info("Starting bulk test on " + tableName);
 
-    TableOperations tableOps = env.getAccumuloConnector().tableOperations();
+    TableOperations tableOps = env.getAccumuloClient().tableOperations();
     try {
       if (!tableOps.exists(getTableName())) {
         tableOps.create(getTableName());
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Split.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Split.java
index 6a9270d..96d41a9 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Split.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Split.java
@@ -34,7 +34,7 @@ public class Split extends SelectiveBulkTest {
     for (int i = 0; i < count; i++)
       splits.add(new Text(String.format(BulkPlusOne.FMT, (rand.nextLong() & 0x7fffffffffffffffl) % BulkPlusOne.LOTS)));
     log.info("splitting " + splits);
-    env.getAccumuloConnector().tableOperations().addSplits(Setup.getTableName(), splits);
+    env.getAccumuloClient().tableOperations().addSplits(Setup.getTableName(), splits);
     log.info("split for " + splits + " finished");
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Verify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Verify.java
index 998a38d..7f5937d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Verify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/Verify.java
@@ -58,9 +58,9 @@ public class Verify extends Test {
       return;
     }
 
-    String user = env.getAccumuloConnector().whoami();
-    Authorizations auths = env.getAccumuloConnector().securityOperations().getUserAuthorizations(user);
-    Scanner scanner = env.getAccumuloConnector().createScanner(Setup.getTableName(), auths);
+    String user = env.getAccumuloClient().whoami();
+    Authorizations auths = env.getAccumuloClient().securityOperations().getUserAuthorizations(user);
+    Scanner scanner = env.getAccumuloClient().createScanner(Setup.getTableName(), auths);
     scanner.fetchColumnFamily(BulkPlusOne.CHECK_COLUMN_FAMILY);
     for (Entry<Key,Value> entry : scanner) {
       byte[] value = entry.getValue().get();
@@ -100,7 +100,7 @@ public class Verify extends Test {
     }
 
     log.info("Test successful on table " + Setup.getTableName());
-    env.getAccumuloConnector().tableOperations().delete(Setup.getTableName());
+    env.getAccumuloClient().tableOperations().delete(Setup.getTableName());
   }
 
   public static void main(String args[]) throws Exception {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/AddSplits.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/AddSplits.java
index f83f9e9..1e4624a 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/AddSplits.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/AddSplits.java
@@ -22,7 +22,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
 import org.apache.accumulo.core.metadata.MetadataTable;
@@ -35,7 +35,7 @@ public class AddSplits extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -51,7 +51,7 @@ public class AddSplits extends Test {
       splits.add(new Text(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl)));
 
     try {
-      conn.tableOperations().addSplits(tableName, splits);
+      client.tableOperations().addSplits(tableName, splits);
       log.debug("Added " + splits.size() + " splits " + tableName);
     } catch (TableNotFoundException e) {
       log.debug("AddSplits " + tableName + " failed, doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchScan.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchScan.java
index 26b3c27..49251fd 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchScan.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchScan.java
@@ -23,9 +23,9 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.TableDeletedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
@@ -41,7 +41,7 @@ public class BatchScan extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -51,7 +51,7 @@ public class BatchScan extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      BatchScanner bs = conn.createBatchScanner(tableName, Authorizations.EMPTY, 3);
+      BatchScanner bs = client.createBatchScanner(tableName, Authorizations.EMPTY, 3);
       List<Range> ranges = new ArrayList<>();
       for (int i = 0; i < rand.nextInt(2000) + 1; i++)
         ranges.add(new Range(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl)));
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchWrite.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchWrite.java
index 536e4a9..e6e3d0f 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchWrite.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BatchWrite.java
@@ -22,9 +22,9 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableDeletedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -39,7 +39,7 @@ public class BatchWrite extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -49,7 +49,7 @@ public class BatchWrite extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig());
+      BatchWriter bw = client.createBatchWriter(tableName, new BatchWriterConfig());
       try {
         int numRows = rand.nextInt(100000);
         for (int i = 0; i < numRows; i++) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BulkImport.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BulkImport.java
index a927155..916a422 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BulkImport.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/BulkImport.java
@@ -24,8 +24,8 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
@@ -90,7 +90,7 @@ public class BulkImport extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -128,7 +128,7 @@ public class BulkImport extends Test {
         bw.close();
       }
 
-      conn.tableOperations().importDirectory(tableName, bulkDir, bulkDir + "_f", rand.nextBoolean());
+      client.tableOperations().importDirectory(tableName, bulkDir, bulkDir + "_f", rand.nextBoolean());
 
       log.debug("BulkImported to " + tableName);
     } catch (TableNotFoundException e) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangeAuthorizations.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangeAuthorizations.java
index 28747d6..4def533 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangeAuthorizations.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangeAuthorizations.java
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -34,7 +34,7 @@ public class ChangeAuthorizations extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -43,7 +43,7 @@ public class ChangeAuthorizations extends Test {
 
     String userName = userNames.get(rand.nextInt(userNames.size()));
     try {
-      List<byte[]> auths = new ArrayList<>(conn.securityOperations().getUserAuthorizations(userName).getAuthorizations());
+      List<byte[]> auths = new ArrayList<>(client.securityOperations().getUserAuthorizations(userName).getAuthorizations());
 
       if (rand.nextBoolean()) {
         String authorization = String.format("a%d", rand.nextInt(5000));
@@ -54,7 +54,7 @@ public class ChangeAuthorizations extends Test {
           log.debug("removing authorization " + new String(auths.remove(0), UTF_8));
         }
       }
-      conn.securityOperations().changeUserAuthorizations(userName, new Authorizations(auths));
+      client.securityOperations().changeUserAuthorizations(userName, new Authorizations(auths));
     } catch (AccumuloSecurityException ex) {
       log.debug("Unable to change user authorizations: " + ex.getCause());
     }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangePermissions.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangePermissions.java
index 7445e1e..4ef6683 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangePermissions.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ChangePermissions.java
@@ -22,9 +22,9 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -36,7 +36,7 @@ public class ChangePermissions extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -55,21 +55,21 @@ public class ChangePermissions extends Test {
     try {
       int dice = rand.nextInt(3);
       if (dice == 0)
-        changeSystemPermission(conn, rand, userName);
+        changeSystemPermission(client, rand, userName);
       else if (dice == 1)
-        changeTablePermission(conn, rand, userName, tableName);
+        changeTablePermission(client, rand, userName, tableName);
       else if (dice == 2)
-        changeNamespacePermission(conn, rand, userName, namespace);
+        changeNamespacePermission(client, rand, userName, namespace);
     } catch (AccumuloSecurityException | AccumuloException ex) {
       log.debug("Unable to change user permissions: " + ex.getCause());
     }
   }
 
-  private void changeTablePermission(Connector conn, Random rand, String userName, String tableName) throws AccumuloException, AccumuloSecurityException {
+  private void changeTablePermission(AccumuloClient client, Random rand, String userName, String tableName) throws AccumuloException, AccumuloSecurityException {
 
     EnumSet<TablePermission> perms = EnumSet.noneOf(TablePermission.class);
     for (TablePermission p : TablePermission.values()) {
-      if (conn.securityOperations().hasTablePermission(userName, tableName, p))
+      if (client.securityOperations().hasTablePermission(userName, tableName, p))
         perms.add(p);
     }
 
@@ -80,21 +80,21 @@ public class ChangePermissions extends Test {
       List<TablePermission> moreList = new ArrayList<>(more);
       TablePermission choice = moreList.get(rand.nextInt(moreList.size()));
       log.debug("adding permission " + choice);
-      conn.securityOperations().grantTablePermission(userName, tableName, choice);
+      client.securityOperations().grantTablePermission(userName, tableName, choice);
     } else {
       if (perms.size() > 0) {
         List<TablePermission> permList = new ArrayList<>(perms);
         TablePermission choice = permList.get(rand.nextInt(permList.size()));
         log.debug("removing permission " + choice);
-        conn.securityOperations().revokeTablePermission(userName, tableName, choice);
+        client.securityOperations().revokeTablePermission(userName, tableName, choice);
       }
     }
   }
 
-  private void changeSystemPermission(Connector conn, Random rand, String userName) throws AccumuloException, AccumuloSecurityException {
+  private void changeSystemPermission(AccumuloClient client, Random rand, String userName) throws AccumuloException, AccumuloSecurityException {
     EnumSet<SystemPermission> perms = EnumSet.noneOf(SystemPermission.class);
     for (SystemPermission p : SystemPermission.values()) {
-      if (conn.securityOperations().hasSystemPermission(userName, p))
+      if (client.securityOperations().hasSystemPermission(userName, p))
         perms.add(p);
     }
 
@@ -106,22 +106,23 @@ public class ChangePermissions extends Test {
       List<SystemPermission> moreList = new ArrayList<>(more);
       SystemPermission choice = moreList.get(rand.nextInt(moreList.size()));
       log.debug("adding permission " + choice);
-      conn.securityOperations().grantSystemPermission(userName, choice);
+      client.securityOperations().grantSystemPermission(userName, choice);
     } else {
       if (perms.size() > 0) {
         List<SystemPermission> permList = new ArrayList<>(perms);
         SystemPermission choice = permList.get(rand.nextInt(permList.size()));
         log.debug("removing permission " + choice);
-        conn.securityOperations().revokeSystemPermission(userName, choice);
+        client.securityOperations().revokeSystemPermission(userName, choice);
       }
     }
   }
 
-  private void changeNamespacePermission(Connector conn, Random rand, String userName, String namespace) throws AccumuloException, AccumuloSecurityException {
+  private void changeNamespacePermission(AccumuloClient client, Random rand, String userName, String namespace) throws AccumuloException,
+      AccumuloSecurityException {
 
     EnumSet<NamespacePermission> perms = EnumSet.noneOf(NamespacePermission.class);
     for (NamespacePermission p : NamespacePermission.values()) {
-      if (conn.securityOperations().hasNamespacePermission(userName, namespace, p))
+      if (client.securityOperations().hasNamespacePermission(userName, namespace, p))
         perms.add(p);
     }
 
@@ -132,13 +133,13 @@ public class ChangePermissions extends Test {
       List<NamespacePermission> moreList = new ArrayList<>(more);
       NamespacePermission choice = moreList.get(rand.nextInt(moreList.size()));
       log.debug("adding permission " + choice);
-      conn.securityOperations().grantNamespacePermission(userName, namespace, choice);
+      client.securityOperations().grantNamespacePermission(userName, namespace, choice);
     } else {
       if (perms.size() > 0) {
         List<NamespacePermission> permList = new ArrayList<>(perms);
         NamespacePermission choice = permList.get(rand.nextInt(permList.size()));
         log.debug("removing permission " + choice);
-        conn.securityOperations().revokeNamespacePermission(userName, namespace, choice);
+        client.securityOperations().revokeNamespacePermission(userName, namespace, choice);
       }
     }
   }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CheckPermission.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CheckPermission.java
index 12e4306..85555b0 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CheckPermission.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CheckPermission.java
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -33,7 +33,7 @@ public class CheckPermission extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -53,13 +53,14 @@ public class CheckPermission extends Test {
       int dice = rand.nextInt(2);
       if (dice == 0) {
         log.debug("Checking systerm permission " + userName);
-        conn.securityOperations().hasSystemPermission(userName, SystemPermission.values()[rand.nextInt(SystemPermission.values().length)]);
+        client.securityOperations().hasSystemPermission(userName, SystemPermission.values()[rand.nextInt(SystemPermission.values().length)]);
       } else if (dice == 1) {
         log.debug("Checking table permission " + userName + " " + tableName);
-        conn.securityOperations().hasTablePermission(userName, tableName, TablePermission.values()[rand.nextInt(TablePermission.values().length)]);
+        client.securityOperations().hasTablePermission(userName, tableName, TablePermission.values()[rand.nextInt(TablePermission.values().length)]);
       } else if (dice == 2) {
         log.debug("Checking namespace permission " + userName + " " + namespace);
-        conn.securityOperations().hasNamespacePermission(userName, namespace, NamespacePermission.values()[rand.nextInt(NamespacePermission.values().length)]);
+        client.securityOperations()
+            .hasNamespacePermission(userName, namespace, NamespacePermission.values()[rand.nextInt(NamespacePermission.values().length)]);
       }
 
     } catch (AccumuloSecurityException ex) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CloneTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CloneTable.java
index 8c4bd95..0fad1c5 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CloneTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CloneTable.java
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -35,7 +35,7 @@ public class CloneTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -48,7 +48,7 @@ public class CloneTable extends Test {
 
     try {
       log.debug("Cloning table " + srcTableName + " " + newTableName + " " + flush);
-      conn.tableOperations().clone(srcTableName, newTableName, flush, new HashMap<String,String>(), new HashSet<String>());
+      client.tableOperations().clone(srcTableName, newTableName, flush, new HashMap<>(), new HashSet<>());
     } catch (TableExistsException e) {
       log.debug("Clone " + srcTableName + " failed, " + newTableName + " exists");
     } catch (TableNotFoundException e) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Compact.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Compact.java
index 4ecb34d..e4cd953 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Compact.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Compact.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
@@ -32,7 +32,7 @@ public class Compact extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -45,7 +45,7 @@ public class Compact extends Test {
 
     try {
       boolean wait = rand.nextBoolean();
-      conn.tableOperations().compact(tableName, range.get(0), range.get(1), false, wait);
+      client.tableOperations().compact(tableName, range.get(0), range.get(1), false, wait);
       log.debug((wait ? "compacted " : "initiated compaction ") + tableName + " from " + range.get(0) + " to " + range.get(1));
     } catch (TableNotFoundException tne) {
       log.debug("compact " + tableName + " from " + range.get(0) + " to " + range.get(1) + " failed, doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
index b7d65a1..db6937e 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
@@ -115,7 +115,7 @@ public class Config extends Test {
       int choice = Integer.parseInt(lastSetting.toString());
       Property property = settings[choice].property;
       log.debug("Setting " + property.getKey() + " back to " + property.getDefaultValue());
-      env.getAccumuloConnector().instanceOperations().setProperty(property.getKey(), property.getDefaultValue());
+      env.getAccumuloClient().instanceOperations().setProperty(property.getKey(), property.getDefaultValue());
     }
     lastSetting = state.getOkIfAbsent(LAST_TABLE_SETTING);
     if (lastSetting != null) {
@@ -123,10 +123,10 @@ public class Config extends Test {
       String table = parts[0];
       int choice = Integer.parseInt(parts[1]);
       Property property = tableSettings[choice].property;
-      if (env.getAccumuloConnector().tableOperations().exists(table)) {
+      if (env.getAccumuloClient().tableOperations().exists(table)) {
         log.debug("Setting " + property.getKey() + " on " + table + " back to " + property.getDefaultValue());
         try {
-          env.getAccumuloConnector().tableOperations().setProperty(table, property.getKey(), property.getDefaultValue());
+          env.getAccumuloClient().tableOperations().setProperty(table, property.getKey(), property.getDefaultValue());
         } catch (AccumuloException ex) {
           if (ex.getCause() instanceof ThriftTableOperationException) {
             ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
@@ -143,10 +143,10 @@ public class Config extends Test {
       String namespace = parts[0];
       int choice = Integer.parseInt(parts[1]);
       Property property = tableSettings[choice].property;
-      if (env.getAccumuloConnector().namespaceOperations().exists(namespace)) {
+      if (env.getAccumuloClient().namespaceOperations().exists(namespace)) {
         log.debug("Setting " + property.getKey() + " on " + namespace + " back to " + property.getDefaultValue());
         try {
-          env.getAccumuloConnector().namespaceOperations().setProperty(namespace, property.getKey(), property.getDefaultValue());
+          env.getAccumuloClient().namespaceOperations().setProperty(namespace, property.getKey(), property.getDefaultValue());
         } catch (AccumuloException ex) {
           if (ex.getCause() instanceof ThriftTableOperationException) {
             ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
@@ -177,7 +177,7 @@ public class Config extends Test {
     Setting setting = tableSettings[choice];
 
     // pick a random table
-    SortedSet<String> tables = env.getAccumuloConnector().tableOperations().list().tailSet("ctt").headSet("ctu");
+    SortedSet<String> tables = env.getAccumuloClient().tableOperations().list().tailSet("ctt").headSet("ctu");
     if (tables.isEmpty())
       return;
     String table = random.nextSample(tables, 1)[0].toString();
@@ -187,7 +187,7 @@ public class Config extends Test {
     state.set(LAST_TABLE_SETTING, table + "," + choice);
     log.debug("Setting " + setting.property.getKey() + " on table " + table + " to " + newValue);
     try {
-      env.getAccumuloConnector().tableOperations().setProperty(table, setting.property.getKey(), "" + newValue);
+      env.getAccumuloClient().tableOperations().setProperty(table, setting.property.getKey(), "" + newValue);
     } catch (AccumuloException ex) {
       if (ex.getCause() instanceof ThriftTableOperationException) {
         ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
@@ -204,7 +204,7 @@ public class Config extends Test {
     Setting setting = tableSettings[choice];
 
     // pick a random table
-    SortedSet<String> namespaces = env.getAccumuloConnector().namespaceOperations().list().tailSet("nspc").headSet("nspd");
+    SortedSet<String> namespaces = env.getAccumuloClient().namespaceOperations().list().tailSet("nspc").headSet("nspd");
     if (namespaces.isEmpty())
       return;
     String namespace = random.nextSample(namespaces, 1)[0].toString();
@@ -214,7 +214,7 @@ public class Config extends Test {
     state.set(LAST_NAMESPACE_SETTING, namespace + "," + choice);
     log.debug("Setting " + setting.property.getKey() + " on namespace " + namespace + " to " + newValue);
     try {
-      env.getAccumuloConnector().namespaceOperations().setProperty(namespace, setting.property.getKey(), "" + newValue);
+      env.getAccumuloClient().namespaceOperations().setProperty(namespace, setting.property.getKey(), "" + newValue);
     } catch (AccumuloException ex) {
       if (ex.getCause() instanceof ThriftTableOperationException) {
         ThriftTableOperationException ttoe = (ThriftTableOperationException) ex.getCause();
@@ -233,7 +233,7 @@ public class Config extends Test {
     long newValue = random.nextLong(setting.min, setting.max);
     state.set(LAST_SETTING, "" + choice);
     log.debug("Setting " + setting.property.getKey() + " to " + newValue);
-    env.getAccumuloConnector().instanceOperations().setProperty(setting.property.getKey(), "" + newValue);
+    env.getAccumuloClient().instanceOperations().setProperty(setting.property.getKey(), "" + newValue);
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateNamespace.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateNamespace.java
index 6c4ff3e..4329c79 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateNamespace.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateNamespace.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.NamespaceExistsException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -30,7 +30,7 @@ public class CreateNamespace extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -40,7 +40,7 @@ public class CreateNamespace extends Test {
     String namespace = namespaces.get(rand.nextInt(namespaces.size()));
 
     try {
-      conn.namespaceOperations().create(namespace);
+      client.namespaceOperations().create(namespace);
       log.debug("Created namespace " + namespace);
     } catch (NamespaceExistsException e) {
       log.debug("Create namespace " + namespace + " failed, it exists");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateTable.java
index f9ec6ce..1bd5a06 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateTable.java
@@ -20,9 +20,9 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
@@ -33,7 +33,7 @@ public class CreateTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -43,7 +43,7 @@ public class CreateTable extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      conn.tableOperations().create(tableName);
+      client.tableOperations().create(tableName);
       log.debug("Created table " + tableName);
     } catch (TableExistsException e) {
       log.debug("Create " + tableName + " failed, it exists");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateUser.java
index 0db7b2b..d4d120d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateUser.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/CreateUser.java
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -30,7 +30,7 @@ import org.apache.accumulo.testing.core.randomwalk.Test;
 public class CreateUser extends Test {
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -41,7 +41,7 @@ public class CreateUser extends Test {
 
     try {
       log.debug("Creating user " + userName);
-      conn.securityOperations().createLocalUser(userName, new PasswordToken(userName + "pass"));
+      client.securityOperations().createLocalUser(userName, new PasswordToken(userName + "pass"));
     } catch (AccumuloSecurityException ex) {
       log.debug("Create user failed " + ex.getCause());
     }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteNamespace.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteNamespace.java
index e0ce1b2..c7d06b7 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteNamespace.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteNamespace.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.NamespaceNotEmptyException;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
@@ -31,7 +31,7 @@ public class DeleteNamespace extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -41,7 +41,7 @@ public class DeleteNamespace extends Test {
     String namespace = namespaces.get(rand.nextInt(namespaces.size()));
 
     try {
-      conn.namespaceOperations().delete(namespace);
+      client.namespaceOperations().delete(namespace);
       log.debug("Deleted namespace " + namespace);
     } catch (NamespaceNotFoundException e) {
       log.debug("Delete namespace " + namespace + " failed, doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteRange.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteRange.java
index cdbb36e..365face 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteRange.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteRange.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
@@ -34,7 +34,7 @@ public class DeleteRange extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -55,7 +55,7 @@ public class DeleteRange extends Test {
       range.set(1, null);
 
     try {
-      conn.tableOperations().deleteRows(tableName, range.get(0), range.get(1));
+      client.tableOperations().deleteRows(tableName, range.get(0), range.get(1));
       log.debug("deleted rows (" + range.get(0) + " -> " + range.get(1) + "] in " + tableName);
     } catch (TableNotFoundException tne) {
       log.debug("deleted rows " + tableName + " failed, doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java
index d122229..825b00b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -30,7 +30,7 @@ public class DeleteTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -40,7 +40,7 @@ public class DeleteTable extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      conn.tableOperations().delete(tableName);
+      client.tableOperations().delete(tableName);
       log.debug("Deleted table " + tableName);
     } catch (TableNotFoundException e) {
       log.debug("Delete " + tableName + " failed, doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java
index 6f1342f..3070631 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
 import org.apache.accumulo.testing.core.randomwalk.Test;
@@ -29,7 +29,7 @@ import org.apache.accumulo.testing.core.randomwalk.Test;
 public class DropUser extends Test {
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -40,7 +40,7 @@ public class DropUser extends Test {
 
     try {
       log.debug("Dropping user " + userName);
-      conn.securityOperations().dropLocalUser(userName);
+      client.securityOperations().dropLocalUser(userName);
     } catch (AccumuloSecurityException ex) {
       log.debug("Unable to drop " + ex.getCause());
     }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java
index d7ac842..64904b5 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java
@@ -21,7 +21,7 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.RowIterator;
 import org.apache.accumulo.core.client.TableDeletedException;
@@ -39,7 +39,7 @@ public class IsolatedScan extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -49,7 +49,7 @@ public class IsolatedScan extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      RowIterator iter = new RowIterator(new IsolatedScanner(conn.createScanner(tableName, Authorizations.EMPTY)));
+      RowIterator iter = new RowIterator(new IsolatedScanner(client.createScanner(tableName, Authorizations.EMPTY)));
 
       while (iter.hasNext()) {
         PeekingIterator<Entry<Key,Value>> row = new PeekingIterator<>(iter.next());
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java
index 03e0fcd..7d7a4dd 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java
@@ -21,8 +21,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -33,7 +33,7 @@ public class ListSplits extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -43,7 +43,7 @@ public class ListSplits extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      Collection<Text> splits = conn.tableOperations().listSplits(tableName);
+      Collection<Text> splits = client.tableOperations().listSplits(tableName);
       log.debug("Table " + tableName + " had " + splits.size() + " splits");
     } catch (TableNotFoundException e) {
       log.debug("listSplits " + tableName + " failed, doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java
index fa01572..8511ad6 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.TableOfflineException;
 import org.apache.accumulo.core.metadata.MetadataTable;
@@ -34,7 +34,7 @@ public class Merge extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -47,7 +47,7 @@ public class Merge extends Test {
     List<Text> range = ConcurrentFixture.generateRange(rand);
 
     try {
-      conn.tableOperations().merge(tableName, range.get(0), range.get(1));
+      client.tableOperations().merge(tableName, range.get(0), range.get(1));
       log.debug("merged " + tableName + " from " + range.get(0) + " to " + range.get(1));
     } catch (TableOfflineException toe) {
       log.debug("merge " + tableName + " from " + range.get(0) + " to " + range.get(1) + " failed, table is not online");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java
index d568cac..8561e32 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java
@@ -23,7 +23,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -33,7 +33,7 @@ public class OfflineTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -43,10 +43,10 @@ public class OfflineTable extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      conn.tableOperations().offline(tableName, rand.nextBoolean());
+      client.tableOperations().offline(tableName, rand.nextBoolean());
       log.debug("Offlined " + tableName);
       sleepUninterruptibly(rand.nextInt(200), TimeUnit.MILLISECONDS);
-      conn.tableOperations().online(tableName, rand.nextBoolean());
+      client.tableOperations().online(tableName, rand.nextBoolean());
       log.debug("Onlined " + tableName);
     } catch (TableNotFoundException tne) {
       log.debug("offline or online failed " + tableName + ", doesnt exist");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java
index e0946d8..0a4d868 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.NamespaceExistsException;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
@@ -31,7 +31,7 @@ public class RenameNamespace extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -42,7 +42,7 @@ public class RenameNamespace extends Test {
     String newName = namespaces.get(rand.nextInt(namespaces.size()));
 
     try {
-      conn.namespaceOperations().rename(srcName, newName);
+      client.namespaceOperations().rename(srcName, newName);
       log.debug("Renamed namespace " + srcName + " " + newName);
     } catch (NamespaceExistsException e) {
       log.debug("Rename namespace " + srcName + " failed, " + newName + " exists");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
index 1c0ecb6..f0715ea 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -33,7 +33,7 @@ public class RenameTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -56,7 +56,7 @@ public class RenameTable extends Test {
     }
 
     try {
-      conn.tableOperations().rename(srcTableName, newTableName);
+      client.tableOperations().rename(srcTableName, newTableName);
       log.debug("Renamed table " + srcTableName + " " + newTableName);
     } catch (TableExistsException e) {
       log.debug("Rename " + srcTableName + " failed, " + newTableName + " exists");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java
index 4d987d4..0d08e66 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java
@@ -61,7 +61,7 @@ public class Replication extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    final AccumuloClient c = (AccumuloClient) env.getAccumuloConnector();
+    final AccumuloClient c = (AccumuloClient) env.getAccumuloClient();
     final String instName = c.info().getInstanceName();
     final InstanceOperations iOps = c.instanceOperations();
     final TableOperations tOps = c.tableOperations();
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java
index f22d406..80311fb 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java
@@ -22,8 +22,8 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableDeletedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -39,7 +39,7 @@ public class ScanTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     Random rand = (Random) state.get("rand");
 
@@ -49,7 +49,7 @@ public class ScanTable extends Test {
     String tableName = tableNames.get(rand.nextInt(tableNames.size()));
 
     try {
-      Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
+      Scanner scanner = client.createScanner(tableName, Authorizations.EMPTY);
       Iterator<Entry<Key,Value>> iter = scanner.iterator();
       while (iter.hasNext()) {
         iter.next();
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java
index 0754af1..e548d11 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.conditional;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
 import org.apache.accumulo.testing.core.randomwalk.Test;
@@ -33,7 +33,7 @@ public class Compact extends Test {
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String table = state.getString("tableName");
     Random rand = (Random) state.get("rand");
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     Text row1 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))));
     Text row2 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))));
 
@@ -43,6 +43,6 @@ public class Compact extends Test {
     }
 
     log.debug("compacting " + row1 + " " + row2);
-    conn.tableOperations().compact(table, row1, row2, rand.nextBoolean(), rand.nextBoolean());
+    client.tableOperations().compact(table, row1, row2, rand.nextBoolean(), rand.nextBoolean());
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java
index af8b387..e84fd27 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.conditional;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
 import org.apache.accumulo.testing.core.randomwalk.Test;
@@ -33,7 +33,7 @@ public class Flush extends Test {
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String table = state.getString("tableName");
     Random rand = (Random) state.get("rand");
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     Text row1 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))));
     Text row2 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))));
 
@@ -43,6 +43,6 @@ public class Flush extends Test {
     }
 
     log.debug("flushing " + row1 + " " + row2);
-    conn.tableOperations().flush(table, row1, row2, rand.nextBoolean());
+    client.tableOperations().flush(table, row1, row2, rand.nextBoolean());
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java
index 031639a..b300c95 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java
@@ -46,7 +46,7 @@ public class Init extends Test {
     TreeSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < 10; i++)
       splits.add(new Text(Utils.getBank((int) (numBanks * .1 * i))));
-    env.getAccumuloConnector().tableOperations().addSplits((String) state.get("tableName"), splits);
+    env.getAccumuloClient().tableOperations().addSplits((String) state.get("tableName"), splits);
     log.info("Added splits " + splits);
 
     ArrayList<Integer> banks = new ArrayList<>();
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java
index af2bc25..f2478cf 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.conditional;
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
 import org.apache.accumulo.testing.core.randomwalk.Test;
@@ -33,7 +33,7 @@ public class Merge extends Test {
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String table = state.getString("tableName");
     Random rand = (Random) state.get("rand");
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     Text row1 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))));
     Text row2 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))));
 
@@ -43,7 +43,7 @@ public class Merge extends Test {
     }
 
     log.debug("merging " + row1 + " " + row2);
-    conn.tableOperations().merge(table, row1, row2);
+    client.tableOperations().merge(table, row1, row2);
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java
index 6973eb5..629b765 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java
@@ -46,14 +46,14 @@ public class Setup extends Test {
     state.set("tableName", tableName);
 
     try {
-      env.getAccumuloConnector().tableOperations().create(tableName);
+      env.getAccumuloClient().tableOperations().create(tableName);
       log.debug("created table " + tableName);
       boolean blockCache = rand.nextBoolean();
-      env.getAccumuloConnector().tableOperations().setProperty(tableName, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), blockCache + "");
+      env.getAccumuloClient().tableOperations().setProperty(tableName, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), blockCache + "");
       log.debug("set " + Property.TABLE_BLOCKCACHE_ENABLED.getKey() + " " + blockCache);
     } catch (TableExistsException tee) {}
 
-    ConditionalWriter cw = env.getAccumuloConnector().createConditionalWriter(tableName, new ConditionalWriterConfig().setMaxWriteThreads(1));
+    ConditionalWriter cw = env.getAccumuloClient().createConditionalWriter(tableName, new ConditionalWriterConfig().setMaxWriteThreads(1));
     state.set("cw", cw);
 
   }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java
index e8c1732..7dffafc 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java
@@ -21,7 +21,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
 import org.apache.accumulo.testing.core.randomwalk.Test;
@@ -35,11 +35,11 @@ public class Split extends Test {
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String table = state.getString("tableName");
     Random rand = (Random) state.get("rand");
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     String row = Utils.getBank(rand.nextInt((Integer) state.get("numBanks")));
 
     log.debug("adding split " + row);
-    conn.tableOperations().addSplits(table, new TreeSet<>(Arrays.asList(new Text(row))));
+    client.tableOperations().addSplits(table, new TreeSet<>(Arrays.asList(new Text(row))));
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java
index 7fb888d..a13750f 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java
@@ -20,9 +20,9 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.ConditionalWriter;
 import org.apache.accumulo.core.client.ConditionalWriter.Status;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Condition;
@@ -64,7 +64,7 @@ public class Transfer extends Test {
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String table = state.getString("tableName");
     Random rand = (Random) state.get("rand");
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     int numAccts = (Integer) state.get("numAccts");
     // note: non integer exponents are slow
@@ -80,7 +80,7 @@ public class Transfer extends Test {
     }
 
     // TODO document how data should be read when using ConditionalWriter
-    try (Scanner scanner = new IsolatedScanner(conn.createScanner(table, Authorizations.EMPTY))) {
+    try (Scanner scanner = new IsolatedScanner(client.createScanner(table, Authorizations.EMPTY))) {
 
       scanner.setRange(new Range(bank));
       scanner.fetchColumnFamily(new Text(acct1));
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java
index f35646c..23c866c 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.conditional;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.IsolatedScanner;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.Scanner;
@@ -41,16 +41,16 @@ public class Verify extends Test {
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String table = state.getString("tableName");
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     int numAccts = (Integer) state.get("numAccts");
 
     for (int i = 0; i < (Integer) state.get("numBanks"); i++)
-      verifyBank(table, conn, Utils.getBank(i), numAccts);
+      verifyBank(table, client, Utils.getBank(i), numAccts);
 
   }
 
-  private void verifyBank(String table, Connector conn, String row, int numAccts) throws TableNotFoundException, Exception {
+  private void verifyBank(String table, AccumuloClient client, String row, int numAccts) throws TableNotFoundException, Exception {
     log.debug("Verifying bank " + row);
 
     int count = 0;
@@ -59,7 +59,7 @@ public class Verify extends Test {
     int max = Integer.MIN_VALUE;
 
     // TODO do not use IsolatedScanner, just enable isolation on scanner
-    try (Scanner scanner = new IsolatedScanner(conn.createScanner(table, Authorizations.EMPTY))) {
+    try (Scanner scanner = new IsolatedScanner(client.createScanner(table, Authorizations.EMPTY))) {
 
       scanner.setRange(new Range(row));
       IteratorSetting iterConf = new IteratorSetting(100, "cqsl", ColumnSliceFilter.class);
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java
index c70efaa..eedf1ee 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java
@@ -25,7 +25,7 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableExistsException;
@@ -42,7 +42,7 @@ public class ImageFixture extends Fixture {
   @Override
   public void setUp(State state, RandWalkEnv env) throws Exception {
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     SortedSet<Text> splits = new TreeSet<>();
     for (int i = 1; i < 256; i++) {
@@ -59,17 +59,17 @@ public class ImageFixture extends Fixture {
     state.set("indexTableName", indexTableName);
 
     try {
-      conn.tableOperations().create(imageTableName);
-      conn.tableOperations().addSplits(imageTableName, splits);
-      log.debug("Created table " + imageTableName + " (id:" + conn.tableOperations().tableIdMap().get(imageTableName) + ")");
+      client.tableOperations().create(imageTableName);
+      client.tableOperations().addSplits(imageTableName, splits);
+      log.debug("Created table " + imageTableName + " (id:" + client.tableOperations().tableIdMap().get(imageTableName) + ")");
     } catch (TableExistsException e) {
       log.error("Table " + imageTableName + " already exists.");
       throw e;
     }
 
     try {
-      conn.tableOperations().create(indexTableName);
-      log.debug("Created table " + indexTableName + " (id:" + conn.tableOperations().tableIdMap().get(indexTableName) + ")");
+      client.tableOperations().create(indexTableName);
+      log.debug("Created table " + indexTableName + " (id:" + client.tableOperations().tableIdMap().get(indexTableName) + ")");
     } catch (TableExistsException e) {
       log.error("Table " + imageTableName + " already exists.");
       throw e;
@@ -80,7 +80,7 @@ public class ImageFixture extends Fixture {
       // setup locality groups
       Map<String,Set<Text>> groups = getLocalityGroups();
 
-      conn.tableOperations().setLocalityGroups(imageTableName, groups);
+      client.tableOperations().setLocalityGroups(imageTableName, groups);
       log.debug("Configured locality groups for " + imageTableName + " groups = " + groups);
     }
 
@@ -121,10 +121,10 @@ public class ImageFixture extends Fixture {
     // Now we can safely delete the tables
     log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
-    conn.tableOperations().delete(imageTableName);
-    conn.tableOperations().delete(indexTableName);
+    client.tableOperations().delete(imageTableName);
+    client.tableOperations().delete(indexTableName);
 
     log.debug("Final total of writes: " + state.getLong("totalWrites"));
   }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
index 1bc913d..5463d36 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
@@ -25,8 +25,8 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.UUID;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -51,9 +51,9 @@ public class ScanMeta extends Test {
 
     String uuid = UUID.randomUUID().toString();
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
-    Scanner imageScanner = conn.createScanner(imageTableName, new Authorizations());
+    Scanner imageScanner = client.createScanner(imageTableName, new Authorizations());
 
     imageScanner.setRange(new Range(new Text(uuid), null));
     imageScanner.fetchColumn(Write.META_COLUMN_FAMILY, Write.SHA1_COLUMN_QUALIFIER);
@@ -84,7 +84,7 @@ public class ScanMeta extends Test {
     }
 
     // use batch scanner to verify all of these exist in index
-    BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY, 3);
+    BatchScanner indexScanner = client.createBatchScanner(indexTableName, Authorizations.EMPTY, 3);
     ArrayList<Range> ranges = new ArrayList<>();
     for (Text row : hashes.keySet()) {
       ranges.add(new Range(row));
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java
index e7ad6b0..116a79b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java
@@ -22,7 +22,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.admin.TableOperations;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -44,8 +44,8 @@ public class TableOp extends Test {
     }
 
     // check if chosen table exists
-    Connector conn = env.getAccumuloConnector();
-    TableOperations tableOps = conn.tableOperations();
+    AccumuloClient client = env.getAccumuloClient();
+    TableOperations tableOps = client.tableOperations();
     if (tableOps.exists(tableName) == false) {
       log.error("Table " + tableName + " does not exist!");
       return;
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java
index fb20a5b..56f1581 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java
@@ -25,7 +25,7 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.UUID;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -52,10 +52,10 @@ public class Verify extends Test {
     indexTableName = state.getString("indexTableName");
     imageTableName = state.getString("imageTableName");
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
-    Scanner indexScanner = conn.createScanner(indexTableName, new Authorizations());
-    Scanner imageScanner = conn.createScanner(imageTableName, new Authorizations());
+    Scanner indexScanner = client.createScanner(indexTableName, new Authorizations());
+    Scanner imageScanner = client.createScanner(imageTableName, new Authorizations());
 
     String uuid = UUID.randomUUID().toString();
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java
index cbaf0b8..d55a211 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java
@@ -59,21 +59,21 @@ public class CopyTable extends Test {
 
     log.debug("copying " + srcTableName + " to " + dstTableName);
 
-    env.getAccumuloConnector().tableOperations().create(dstTableName);
+    env.getAccumuloClient().tableOperations().create(dstTableName);
 
-    env.getAccumuloConnector().tableOperations().addSplits(dstTableName, splits);
+    env.getAccumuloClient().tableOperations().addSplits(dstTableName, splits);
 
     if (ToolRunner.run(env.getHadoopConfiguration(), new CopyTool(), args) != 0) {
       log.error("Failed to run map/red verify");
       return;
     }
 
-    String tableId = env.getAccumuloConnector().tableOperations().tableIdMap().get(dstTableName);
+    String tableId = env.getAccumuloClient().tableOperations().tableIdMap().get(dstTableName);
     log.debug("copied " + srcTableName + " to " + dstTableName + " (id - " + tableId + " )");
 
     tables.add(dstTableName);
 
-    env.getAccumuloConnector().tableOperations().delete(srcTableName);
+    env.getAccumuloClient().tableOperations().delete(srcTableName);
     log.debug("dropped " + srcTableName);
 
     nextId++;
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java
index 5a8cd73..5d11530 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -40,18 +40,18 @@ public class CreateTable extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     int nextId = ((Integer) state.get("nextId")).intValue();
     String tableName = String.format("%s_%d", state.getString("tableNamePrefix"), nextId);
     try {
-      conn.tableOperations().create(tableName);
+      client.tableOperations().create(tableName);
       // Add some splits to make the server's life easier
-      conn.tableOperations().addSplits(tableName, splits);
-      String tableId = conn.tableOperations().tableIdMap().get(tableName);
+      client.tableOperations().addSplits(tableName, splits);
+      String tableId = client.tableOperations().tableIdMap().get(tableName);
       log.debug("created " + tableName + " (id:" + tableId + ")");
       // Add some splits to make the server's life easier
-      conn.tableOperations().addSplits(tableName, splits);
+      client.tableOperations().addSplits(tableName, splits);
       log.debug("created " + splits.size() + " splits on " + tableName);
       @SuppressWarnings("unchecked")
       List<String> tables = (List<String>) state.get("tableList");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java
index a6069b8..1042ec1 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java
@@ -42,7 +42,7 @@ public class DropTable extends Test {
     String tableName = tables.remove(rand.nextInt(tables.size()));
 
     try {
-      env.getAccumuloConnector().tableOperations().delete(tableName);
+      env.getAccumuloClient().tableOperations().delete(tableName);
       log.debug("Dropped " + tableName);
     } catch (TableNotFoundException e) {
       log.error("Tried to drop table " + tableName + " but could not be found!");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java
index 249acf1..4cfb237 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java
@@ -20,7 +20,7 @@ import java.net.InetAddress;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -57,14 +57,14 @@ public class MultiTableFixture extends Fixture {
       env.resetMultiTableBatchWriter();
     }
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     @SuppressWarnings("unchecked")
     List<String> tables = (List<String>) state.get("tableList");
 
     for (String tableName : tables) {
       try {
-        conn.tableOperations().delete(tableName);
+        client.tableOperations().delete(tableName);
         log.debug("Dropping table " + tableName);
       } catch (TableNotFoundException e) {
         log.warn("Tried to drop table " + tableName + " but could not be found!");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java
index d9e783f..cf0d199 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java
@@ -39,9 +39,9 @@ public class OfflineTable extends Test {
     Random rand = new Random();
     String tableName = tables.get(rand.nextInt(tables.size()));
 
-    env.getAccumuloConnector().tableOperations().offline(tableName, rand.nextBoolean());
+    env.getAccumuloClient().tableOperations().offline(tableName, rand.nextBoolean());
     log.debug("Table " + tableName + " offline ");
-    env.getAccumuloConnector().tableOperations().online(tableName, rand.nextBoolean());
+    env.getAccumuloClient().tableOperations().online(tableName, rand.nextBoolean());
     log.debug("Table " + tableName + " online ");
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java
index dd0cd54..5834ace 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java
@@ -19,9 +19,9 @@ package org.apache.accumulo.testing.core.randomwalk.security;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv;
 import org.apache.accumulo.testing.core.randomwalk.State;
@@ -31,7 +31,7 @@ public class AlterSystemPerm extends Test {
 
   @Override
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
     WalkingSecurity ws = new WalkingSecurity(state, env);
 
     String action = props.getProperty("task", "toggle");
@@ -51,7 +51,7 @@ public class AlterSystemPerm extends Test {
 
     // toggle
     if (!"take".equals(action) && !"give".equals(action)) {
-      if (hasPerm != conn.securityOperations().hasSystemPermission(targetUser, sysPerm))
+      if (hasPerm != client.securityOperations().hasSystemPermission(targetUser, sysPerm))
         throw new AccumuloException("Test framework and accumulo are out of sync!");
       if (hasPerm)
         action = "take";
@@ -61,7 +61,7 @@ public class AlterSystemPerm extends Test {
 
     if ("take".equals(action)) {
       try {
-        conn.securityOperations().revokeSystemPermission(targetUser, sysPerm);
+        client.securityOperations().revokeSystemPermission(targetUser, sysPerm);
       } catch (AccumuloSecurityException ae) {
         switch (ae.getSecurityErrorCode()) {
           case GRANT_INVALID:
@@ -79,7 +79,7 @@ public class AlterSystemPerm extends Test {
       ws.revokeSystemPermission(targetUser, sysPerm);
     } else if ("give".equals(action)) {
       try {
-        conn.securityOperations().grantSystemPermission(targetUser, sysPerm);
+        client.securityOperations().grantSystemPermission(targetUser, sysPerm);
       } catch (AccumuloSecurityException ae) {
         switch (ae.getSecurityErrorCode()) {
           case GRANT_INVALID:
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
index 553c766..55127b4 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
@@ -96,7 +96,7 @@ public class AlterTablePerm extends Test {
     if (!"take".equals(action) && !"give".equals(action)) {
       try {
         boolean res;
-        if (hasPerm != (res = env.getAccumuloConnector().securityOperations().hasTablePermission(target, tableName, tabPerm)))
+        if (hasPerm != (res = env.getAccumuloClient().securityOperations().hasTablePermission(target, tableName, tabPerm)))
           throw new AccumuloException("Test framework and accumulo are out of sync for user " + client.whoami() + " for perm " + tabPerm.name()
               + " with local vs. accumulo being " + hasPerm + " " + res);
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java
index e4e8190..b783ca2 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java
@@ -49,7 +49,7 @@ public class CreateTable extends Test {
         else {
           // create table anyway for sake of state
           try {
-            env.getAccumuloConnector().tableOperations().create(tableName);
+            env.getAccumuloClient().tableOperations().create(tableName);
             WalkingSecurity.get(state, env).initTable(tableName);
           } catch (TableExistsException tee) {
             if (exists)
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java
index f23f87c..48d91de 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java
@@ -49,7 +49,7 @@ public class CreateUser extends Test {
           else {
             // create user anyway for sake of state
             if (!exists) {
-              env.getAccumuloConnector().securityOperations().createLocalUser(tableUserName, tabUserPass);
+              env.getAccumuloClient().securityOperations().createLocalUser(tableUserName, tabUserPass);
               WalkingSecurity.get(state, env).createUser(tableUserName, tabUserPass);
               Thread.sleep(1000);
             }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
index ddfee12..2b584f2 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
@@ -71,7 +71,7 @@ public class DropTable extends Test {
           throw new AccumuloException("Got a security exception when I should have had permission.", ae);
         else {
           // Drop anyway for sake of state
-          env.getAccumuloConnector().tableOperations().delete(tableName);
+          env.getAccumuloClient().tableOperations().delete(tableName);
           WalkingSecurity.get(state, env).cleanTablePermissions(tableName);
           return;
         }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java
index d5cf910..5fd8d37 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java
@@ -47,7 +47,7 @@ public class DropUser extends Test {
             throw new AccumuloException("Got a security exception when I should have had permission.", ae);
           else {
             if (exists) {
-              env.getAccumuloConnector().securityOperations().dropLocalUser(tableUserName);
+              env.getAccumuloClient().securityOperations().dropLocalUser(tableUserName);
               WalkingSecurity.get(state, env).dropUser(tableUserName);
             }
             return;
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java
index 8782fdb..af5d564 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.security;
 import java.net.InetAddress;
 import java.util.Set;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.accumulo.core.security.Authorizations;
@@ -39,7 +39,7 @@ public class SecurityFixture extends Fixture {
       throw new IllegalStateException("Security module currently cannot support Kerberos/SASL instances");
     }
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     String hostname = InetAddress.getLocalHost().getHostName().replaceAll("[-.]", "_");
 
@@ -48,16 +48,16 @@ public class SecurityFixture extends Fixture {
     secTableName = String.format("security_%s", hostname);
     secNamespaceName = String.format("securityNs_%s", hostname);
 
-    if (conn.tableOperations().exists(secTableName))
-      conn.tableOperations().delete(secTableName);
-    Set<String> users = conn.securityOperations().listLocalUsers();
+    if (client.tableOperations().exists(secTableName))
+      client.tableOperations().delete(secTableName);
+    Set<String> users = client.securityOperations().listLocalUsers();
     if (users.contains(tableUserName))
-      conn.securityOperations().dropLocalUser(tableUserName);
+      client.securityOperations().dropLocalUser(tableUserName);
     if (users.contains(systemUserName))
-      conn.securityOperations().dropLocalUser(systemUserName);
+      client.securityOperations().dropLocalUser(systemUserName);
 
     PasswordToken sysUserPass = new PasswordToken("sysUser");
-    conn.securityOperations().createLocalUser(systemUserName, sysUserPass);
+    client.securityOperations().createLocalUser(systemUserName, sysUserPass);
 
     WalkingSecurity.get(state, env).setTableName(secTableName);
     WalkingSecurity.get(state, env).setNamespaceName(secNamespaceName);
@@ -85,31 +85,31 @@ public class SecurityFixture extends Fixture {
   public void tearDown(State state, RandWalkEnv env) throws Exception {
     log.debug("One last validate");
     Validate.validate(state, env, log);
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     if (WalkingSecurity.get(state, env).getTableExists()) {
       String secTableName = WalkingSecurity.get(state, env).getTableName();
       log.debug("Dropping tables: " + secTableName);
 
-      conn.tableOperations().delete(secTableName);
+      client.tableOperations().delete(secTableName);
     }
 
     if (WalkingSecurity.get(state, env).getNamespaceExists()) {
       String secNamespaceName = WalkingSecurity.get(state, env).getNamespaceName();
       log.debug("Dropping namespace: " + secNamespaceName);
 
-      conn.namespaceOperations().delete(secNamespaceName);
+      client.namespaceOperations().delete(secNamespaceName);
     }
 
     if (WalkingSecurity.get(state, env).userExists(WalkingSecurity.get(state, env).getTabUserName())) {
       String tableUserName = WalkingSecurity.get(state, env).getTabUserName();
       log.debug("Dropping user: " + tableUserName);
 
-      conn.securityOperations().dropLocalUser(tableUserName);
+      client.securityOperations().dropLocalUser(tableUserName);
     }
     String systemUserName = WalkingSecurity.get(state, env).getSysUserName();
     log.debug("Dropping user: " + systemUserName);
-    conn.securityOperations().dropLocalUser(systemUserName);
+    client.securityOperations().dropLocalUser(systemUserName);
     WalkingSecurity.clearInstance();
 
     // Allow user drops to propagate, in case a new security test starts
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityHelper.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityHelper.java
index 70b59e5..59cb434 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityHelper.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityHelper.java
@@ -20,7 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.util.Map;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -116,12 +116,12 @@ public class SecurityHelper {
     state.set(tableExists, Boolean.toString(exists));
   }
 
-  public static Connector getSystemConnector(State state) {
-    return (Connector) state.get(masterConn);
+  public static AccumuloClient getSystemClient(State state) {
+    return (AccumuloClient) state.get(masterConn);
   }
 
-  public static void setSystemConnector(State state, Connector conn) {
-    state.set(masterConn, conn);
+  public static void setSystemClient(State state, AccumuloClient client) {
+    state.set(masterConn, client);
   }
 
   public static boolean getTabPerm(State state, String userName, TablePermission tp) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Validate.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Validate.java
index 2cc0f4f..3d7312f 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Validate.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Validate.java
@@ -18,9 +18,9 @@ package org.apache.accumulo.testing.core.randomwalk.security;
 
 import java.util.Properties;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -37,15 +37,15 @@ public class Validate extends Test {
   }
 
   public static void validate(State state, RandWalkEnv env, Logger log) throws Exception {
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     boolean tableExists = WalkingSecurity.get(state, env).getTableExists();
-    boolean cloudTableExists = conn.tableOperations().list().contains(WalkingSecurity.get(state, env).getTableName());
+    boolean cloudTableExists = client.tableOperations().list().contains(WalkingSecurity.get(state, env).getTableName());
     if (tableExists != cloudTableExists)
       throw new AccumuloException("Table existance out of sync");
 
     boolean tableUserExists = WalkingSecurity.get(state, env).userExists(WalkingSecurity.get(state, env).getTabUserName());
-    boolean cloudTableUserExists = conn.securityOperations().listLocalUsers().contains(WalkingSecurity.get(state, env).getTabUserName());
+    boolean cloudTableUserExists = client.securityOperations().listLocalUsers().contains(WalkingSecurity.get(state, env).getTabUserName());
     if (tableUserExists != cloudTableUserExists)
       throw new AccumuloException("Table User existance out of sync");
 
@@ -60,7 +60,7 @@ public class Validate extends Test {
         boolean hasSp = WalkingSecurity.get(state, env).hasSystemPermission(user, sp);
         boolean accuHasSp;
         try {
-          accuHasSp = conn.securityOperations().hasSystemPermission(user, sp);
+          accuHasSp = client.securityOperations().hasSystemPermission(user, sp);
           log.debug("Just checked to see if user " + user + " has system perm " + sp.name() + " with answer " + accuHasSp);
         } catch (AccumuloSecurityException ae) {
           if (ae.getSecurityErrorCode().equals(SecurityErrorCode.USER_DOESNT_EXIST)) {
@@ -79,7 +79,7 @@ public class Validate extends Test {
         boolean hasTp = WalkingSecurity.get(state, env).hasTablePermission(user, WalkingSecurity.get(state, env).getTableName(), tp);
         boolean accuHasTp;
         try {
-          accuHasTp = conn.securityOperations().hasTablePermission(user, WalkingSecurity.get(state, env).getTableName(), tp);
+          accuHasTp = client.securityOperations().hasTablePermission(user, WalkingSecurity.get(state, env).getTableName(), tp);
           log.debug("Just checked to see if user " + user + " has table perm " + tp.name() + " with answer " + accuHasTp);
         } catch (AccumuloSecurityException ae) {
           if (ae.getSecurityErrorCode().equals(SecurityErrorCode.USER_DOESNT_EXIST)) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/BatchVerify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/BatchVerify.java
index fc1f202..5cece6e 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/BatchVerify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/BatchVerify.java
@@ -24,8 +24,8 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
@@ -50,8 +50,8 @@ public class BatchVerify extends Test {
       numVerify = numWrites / 4;
     }
 
-    Connector conn = env.getAccumuloConnector();
-    BatchScanner scanner = conn.createBatchScanner(state.getString("seqTableName"), new Authorizations(), 2);
+    AccumuloClient client = env.getAccumuloClient();
+    BatchScanner scanner = client.createBatchScanner(state.getString("seqTableName"), new Authorizations(), 2);
 
     try {
       int count = 0;
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerify.java
index 9b080ea..1b40a7b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerify.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.sequential;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -45,7 +45,7 @@ public class MapRedVerify extends Test {
       return;
     }
 
-    Scanner outputScanner = env.getAccumuloConnector().createScanner(args[5], Authorizations.EMPTY);
+    Scanner outputScanner = env.getAccumuloClient().createScanner(args[5], Authorizations.EMPTY);
     outputScanner.setRange(new Range());
 
     int count = 0;
@@ -64,7 +64,7 @@ public class MapRedVerify extends Test {
     }
 
     log.debug("Dropping table: " + args[5]);
-    Connector conn = env.getAccumuloConnector();
-    conn.tableOperations().delete(args[5]);
+    AccumuloClient client = env.getAccumuloClient();
+    client.tableOperations().delete(args[5]);
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/SequentialFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/SequentialFixture.java
index 3fe34a0..a7b4993 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/SequentialFixture.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/SequentialFixture.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.testing.core.randomwalk.sequential;
 
 import java.net.InetAddress;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableExistsException;
@@ -33,7 +33,7 @@ public class SequentialFixture extends Fixture {
   @Override
   public void setUp(State state, RandWalkEnv env) throws Exception {
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     String hostname = InetAddress.getLocalHost().getHostName().replaceAll("[-.]", "_");
 
@@ -41,13 +41,13 @@ public class SequentialFixture extends Fixture {
     state.set("seqTableName", seqTableName);
 
     try {
-      conn.tableOperations().create(seqTableName);
-      log.debug("Created table " + seqTableName + " (id:" + conn.tableOperations().tableIdMap().get(seqTableName) + ")");
+      client.tableOperations().create(seqTableName);
+      log.debug("Created table " + seqTableName + " (id:" + client.tableOperations().tableIdMap().get(seqTableName) + ")");
     } catch (TableExistsException e) {
       log.warn("Table " + seqTableName + " already exists!");
       throw e;
     }
-    conn.tableOperations().setProperty(seqTableName, "table.scan.max.memory", "1K");
+    client.tableOperations().setProperty(seqTableName, "table.scan.max.memory", "1K");
 
     state.set("numWrites", Long.valueOf(0));
     state.set("totalWrites", Long.valueOf(0));
@@ -70,8 +70,8 @@ public class SequentialFixture extends Fixture {
 
     log.debug("Dropping tables: " + seqTableName);
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
-    conn.tableOperations().delete(seqTableName);
+    client.tableOperations().delete(seqTableName);
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/BulkInsert.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/BulkInsert.java
index 108dda1..a194f11 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/BulkInsert.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/BulkInsert.java
@@ -29,8 +29,8 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.data.ColumnUpdate;
 import org.apache.accumulo.core.data.Key;
@@ -144,7 +144,7 @@ public class BulkInsert extends Test {
       Path failPath = new Path(failDir);
       fs.delete(failPath, true);
       fs.mkdirs(failPath);
-      env.getAccumuloConnector().tableOperations().importDirectory(tableName, bulkDir, failDir, true);
+      env.getAccumuloClient().tableOperations().importDirectory(tableName, bulkDir, failDir, true);
 
       FileStatus[] failures = fs.listStatus(failPath);
       if (failures != null && failures.length > 0) {
@@ -167,9 +167,9 @@ public class BulkInsert extends Test {
 
     PrintStream out = new PrintStream(new BufferedOutputStream(fs.create(new Path(workDir + "/splits.txt"))), false, UTF_8.name());
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
-    Collection<Text> splits = conn.tableOperations().listSplits(tableName, maxSplits);
+    Collection<Text> splits = client.tableOperations().listSplits(tableName, maxSplits);
     for (Text split : splits)
       out.println(Base64.getEncoder().encodeToString(split.copyBytes()));
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CloneIndex.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CloneIndex.java
index fb01d34..985fa23 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CloneIndex.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CloneIndex.java
@@ -33,9 +33,9 @@ public class CloneIndex extends Test {
     String tmpIndexTableName = indexTableName + "_tmp";
 
     long t1 = System.currentTimeMillis();
-    env.getAccumuloConnector().tableOperations().flush(indexTableName, null, null, true);
+    env.getAccumuloClient().tableOperations().flush(indexTableName, null, null, true);
     long t2 = System.currentTimeMillis();
-    env.getAccumuloConnector().tableOperations().clone(indexTableName, tmpIndexTableName, false, new HashMap<String,String>(), new HashSet<String>());
+    env.getAccumuloClient().tableOperations().clone(indexTableName, tmpIndexTableName, false, new HashMap<String,String>(), new HashSet<String>());
     long t3 = System.currentTimeMillis();
 
     log.debug("Cloned " + tmpIndexTableName + " from " + indexTableName + " flush: " + (t2 - t1) + "ms clone: " + (t3 - t2) + "ms");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CompactFilter.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CompactFilter.java
index 4fe6641..5ab060e 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CompactFilter.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/CompactFilter.java
@@ -57,7 +57,7 @@ public class CompactFilter extends Test {
     documentFilters.add(is);
 
     long t1 = System.currentTimeMillis();
-    env.getAccumuloConnector().tableOperations().compact(docTableName, null, null, documentFilters, true, true);
+    env.getAccumuloClient().tableOperations().compact(docTableName, null, null, documentFilters, true, true);
     long t2 = System.currentTimeMillis();
     long t3 = t2 - t1;
 
@@ -69,12 +69,12 @@ public class CompactFilter extends Test {
     indexFilters.add(is);
 
     t1 = System.currentTimeMillis();
-    env.getAccumuloConnector().tableOperations().compact(indexTableName, null, null, indexFilters, true, true);
+    env.getAccumuloClient().tableOperations().compact(indexTableName, null, null, indexFilters, true, true);
     t2 = System.currentTimeMillis();
 
     log.debug("Filtered documents using compaction iterators " + regex + " " + (t3) + " " + (t2 - t1));
 
-    BatchScanner bscanner = env.getAccumuloConnector().createBatchScanner(docTableName, new Authorizations(), 10);
+    BatchScanner bscanner = env.getAccumuloClient().createBatchScanner(docTableName, new Authorizations(), 10);
 
     List<Range> ranges = new ArrayList<>();
     for (int i = 0; i < 16; i++) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
index 170674d..e4ad81e 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
@@ -52,7 +52,7 @@ public class DeleteSomeDocs extends Test {
 
     String pattern = patterns.get(rand.nextInt(patterns.size()));
     BatchWriterConfig bwc = new BatchWriterConfig();
-    BatchDeleter ibd = env.getAccumuloConnector().createBatchDeleter(indexTableName, Authorizations.EMPTY, 8, bwc);
+    BatchDeleter ibd = env.getAccumuloClient().createBatchDeleter(indexTableName, Authorizations.EMPTY, 8, bwc);
     ibd.setRanges(Collections.singletonList(new Range()));
 
     IteratorSetting iterSettings = new IteratorSetting(100, RegExFilter.class);
@@ -64,7 +64,7 @@ public class DeleteSomeDocs extends Test {
 
     ibd.close();
 
-    BatchDeleter dbd = env.getAccumuloConnector().createBatchDeleter(dataTableName, Authorizations.EMPTY, 8, bwc);
+    BatchDeleter dbd = env.getAccumuloClient().createBatchDeleter(dataTableName, Authorizations.EMPTY, 8, bwc);
     dbd.setRanges(Collections.singletonList(new Range()));
 
     iterSettings = new IteratorSetting(100, RegExFilter.class);
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteWord.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteWord.java
index b380dde..0dc828e 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteWord.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteWord.java
@@ -51,7 +51,7 @@ public class DeleteWord extends Test {
     String wordToDelete = Insert.generateRandomWord(rand);
 
     // use index to find all documents containing word
-    Scanner scanner = env.getAccumuloConnector().createScanner(indexTableName, Authorizations.EMPTY);
+    Scanner scanner = env.getAccumuloClient().createScanner(indexTableName, Authorizations.EMPTY);
     scanner.fetchColumnFamily(new Text(wordToDelete));
 
     ArrayList<Range> documentsToDelete = new ArrayList<>();
@@ -61,7 +61,7 @@ public class DeleteWord extends Test {
 
     if (documentsToDelete.size() > 0) {
       // use a batch scanner to fetch all documents
-      BatchScanner bscanner = env.getAccumuloConnector().createBatchScanner(docTableName, Authorizations.EMPTY, 8);
+      BatchScanner bscanner = env.getAccumuloClient().createBatchScanner(docTableName, Authorizations.EMPTY, 8);
       bscanner.setRanges(documentsToDelete);
 
       BatchWriter ibw = env.getMultiTableBatchWriter().getBatchWriter(indexTableName);
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
index 2764026..dc2186f 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
@@ -55,16 +55,16 @@ public class ExportIndex extends Test {
 
     // disable spits, so that splits can be compared later w/o worrying one
     // table splitting and the other not
-    env.getAccumuloConnector().tableOperations().setProperty(indexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "20G");
+    env.getAccumuloClient().tableOperations().setProperty(indexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "20G");
 
     long t1 = System.currentTimeMillis();
 
-    env.getAccumuloConnector().tableOperations().flush(indexTableName, null, null, true);
-    env.getAccumuloConnector().tableOperations().offline(indexTableName);
+    env.getAccumuloClient().tableOperations().flush(indexTableName, null, null, true);
+    env.getAccumuloClient().tableOperations().offline(indexTableName);
 
     long t2 = System.currentTimeMillis();
 
-    env.getAccumuloConnector().tableOperations().exportTable(indexTableName, exportDir);
+    env.getAccumuloClient().tableOperations().exportTable(indexTableName, exportDir);
 
     long t3 = System.currentTimeMillis();
 
@@ -81,34 +81,34 @@ public class ExportIndex extends Test {
 
     long t4 = System.currentTimeMillis();
 
-    env.getAccumuloConnector().tableOperations().online(indexTableName);
-    env.getAccumuloConnector().tableOperations().importTable(tmpIndexTableName, copyDir);
+    env.getAccumuloClient().tableOperations().online(indexTableName);
+    env.getAccumuloClient().tableOperations().importTable(tmpIndexTableName, copyDir);
 
     long t5 = System.currentTimeMillis();
 
     fs.delete(new Path(exportDir), true);
     fs.delete(new Path(copyDir), true);
 
-    HashSet<Text> splits1 = new HashSet<>(env.getAccumuloConnector().tableOperations().listSplits(indexTableName));
-    HashSet<Text> splits2 = new HashSet<>(env.getAccumuloConnector().tableOperations().listSplits(tmpIndexTableName));
+    HashSet<Text> splits1 = new HashSet<>(env.getAccumuloClient().tableOperations().listSplits(indexTableName));
+    HashSet<Text> splits2 = new HashSet<>(env.getAccumuloClient().tableOperations().listSplits(tmpIndexTableName));
 
     if (!splits1.equals(splits2))
       throw new Exception("Splits not equals " + indexTableName + " " + tmpIndexTableName);
 
     HashMap<String,String> props1 = new HashMap<>();
-    for (Entry<String,String> entry : env.getAccumuloConnector().tableOperations().getProperties(indexTableName))
+    for (Entry<String,String> entry : env.getAccumuloClient().tableOperations().getProperties(indexTableName))
       props1.put(entry.getKey(), entry.getValue());
 
     HashMap<String,String> props2 = new HashMap<>();
-    for (Entry<String,String> entry : env.getAccumuloConnector().tableOperations().getProperties(tmpIndexTableName))
+    for (Entry<String,String> entry : env.getAccumuloClient().tableOperations().getProperties(tmpIndexTableName))
       props2.put(entry.getKey(), entry.getValue());
 
     if (!props1.equals(props2))
       throw new Exception("Props not equals " + indexTableName + " " + tmpIndexTableName);
 
     // unset the split threshold
-    env.getAccumuloConnector().tableOperations().removeProperty(indexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey());
-    env.getAccumuloConnector().tableOperations().removeProperty(tmpIndexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey());
+    env.getAccumuloClient().tableOperations().removeProperty(indexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey());
+    env.getAccumuloClient().tableOperations().removeProperty(tmpIndexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey());
 
     log.debug("Imported " + tmpIndexTableName + " from " + indexTableName + " flush: " + (t2 - t1) + "ms export: " + (t3 - t2) + "ms copy:" + (t4 - t3)
         + "ms import:" + (t5 - t4) + "ms");
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Flush.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Flush.java
index f8d5183..13141a8 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Flush.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Flush.java
@@ -38,7 +38,7 @@ public class Flush extends Test {
     else
       table = dataTableName;
 
-    env.getAccumuloConnector().tableOperations().flush(table, null, null, true);
+    env.getAccumuloClient().tableOperations().flush(table, null, null, true);
     log.debug("Flushed " + table);
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Grep.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Grep.java
index b8a79e5..2dd5c9c 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Grep.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Grep.java
@@ -53,7 +53,7 @@ public class Grep extends Test {
       words[i] = new Text(Insert.generateRandomWord(rand));
     }
 
-    BatchScanner bs = env.getAccumuloConnector().createBatchScanner(indexTableName, Authorizations.EMPTY, 16);
+    BatchScanner bs = env.getAccumuloClient().createBatchScanner(indexTableName, Authorizations.EMPTY, 16);
     IteratorSetting ii = new IteratorSetting(20, "ii", IntersectingIterator.class.getName());
     IntersectingIterator.setColumnFamilies(ii, words);
     bs.addScanIterator(ii);
@@ -67,7 +67,7 @@ public class Grep extends Test {
 
     bs.close();
 
-    bs = env.getAccumuloConnector().createBatchScanner(dataTableName, Authorizations.EMPTY, 16);
+    bs = env.getAccumuloClient().createBatchScanner(dataTableName, Authorizations.EMPTY, 16);
 
     for (int i = 0; i < words.length; i++) {
       IteratorSetting more = new IteratorSetting(20 + i, "ii" + i, RegExFilter.class);
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
index ecd54ec..673b651 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
@@ -33,13 +33,13 @@ public class Merge extends Test {
   public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
     String indexTableName = (String) state.get("indexTableName");
 
-    Collection<Text> splits = env.getAccumuloConnector().tableOperations().listSplits(indexTableName);
+    Collection<Text> splits = env.getAccumuloClient().tableOperations().listSplits(indexTableName);
     SortedSet<Text> splitSet = new TreeSet<>(splits);
     log.debug("merging " + indexTableName);
-    env.getAccumuloConnector().tableOperations().merge(indexTableName, null, null);
+    env.getAccumuloClient().tableOperations().merge(indexTableName, null, null);
     org.apache.accumulo.core.util.Merge merge = new org.apache.accumulo.core.util.Merge();
-    merge.mergomatic((AccumuloClient) env.getAccumuloConnector(), indexTableName, null, null, 256 * 1024 * 1024, true);
-    splits = env.getAccumuloConnector().tableOperations().listSplits(indexTableName);
+    merge.mergomatic((AccumuloClient) env.getAccumuloClient(), indexTableName, null, null, 256 * 1024 * 1024, true);
+    splits = env.getAccumuloClient().tableOperations().listSplits(indexTableName);
     if (splits.size() > splitSet.size()) {
       // throw an excpetion so that test will die an no further changes to
       // table will occur...
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Reindex.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Reindex.java
index 95fa6b8..f5b6b02 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Reindex.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Reindex.java
@@ -43,8 +43,8 @@ public class Reindex extends Test {
 
     ShardFixture.createIndexTable(this.log, state, env, "_tmp", rand);
 
-    Scanner scanner = env.getAccumuloConnector().createScanner(docTableName, Authorizations.EMPTY);
-    BatchWriter tbw = env.getAccumuloConnector().createBatchWriter(tmpIndexTableName, new BatchWriterConfig());
+    Scanner scanner = env.getAccumuloClient().createScanner(docTableName, Authorizations.EMPTY);
+    BatchWriter tbw = env.getAccumuloClient().createBatchWriter(tmpIndexTableName, new BatchWriterConfig());
 
     int count = 0;
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Search.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Search.java
index 440469f..a572c38 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Search.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Search.java
@@ -69,7 +69,7 @@ public class Search extends Test {
 
     log.debug("Looking up terms " + searchTerms + " expect to find " + docID);
 
-    BatchScanner bs = env.getAccumuloConnector().createBatchScanner(indexTableName, Authorizations.EMPTY, 10);
+    BatchScanner bs = env.getAccumuloClient().createBatchScanner(indexTableName, Authorizations.EMPTY, 10);
     IteratorSetting ii = new IteratorSetting(20, "ii", IntersectingIterator.class);
     IntersectingIterator.setColumnFamilies(ii, columns);
     bs.addScanIterator(ii);
@@ -91,7 +91,7 @@ public class Search extends Test {
   }
 
   static Entry<Key,Value> findRandomDocument(State state, RandWalkEnv env, String dataTableName, Random rand) throws Exception {
-    Scanner scanner = env.getAccumuloConnector().createScanner(dataTableName, Authorizations.EMPTY);
+    Scanner scanner = env.getAccumuloClient().createScanner(dataTableName, Authorizations.EMPTY);
     scanner.setBatchSize(1);
     scanner.setRange(new Range(Integer.toString(rand.nextInt(0xfffffff), 16), null));
 
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ShardFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ShardFixture.java
index 2d83326..86c8571 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ShardFixture.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ShardFixture.java
@@ -21,7 +21,7 @@ import java.util.Random;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.conf.Property;
@@ -50,23 +50,23 @@ public class ShardFixture extends Fixture {
   }
 
   static void createIndexTable(Logger log, State state, RandWalkEnv env, String suffix, Random rand) throws Exception {
-    Connector conn = env.getAccumuloConnector();
-    String name = (String) state.get("indexTableName") + suffix;
+    AccumuloClient client = env.getAccumuloClient();
+    String name = state.get("indexTableName") + suffix;
     int numPartitions = (Integer) state.get("numPartitions");
     boolean enableCache = (Boolean) state.get("cacheIndex");
-    conn.tableOperations().create(name);
+    client.tableOperations().create(name);
 
-    String tableId = conn.tableOperations().tableIdMap().get(name);
+    String tableId = client.tableOperations().tableIdMap().get(name);
     log.info("Created index table " + name + "(id:" + tableId + ")");
 
     SortedSet<Text> splits = genSplits(numPartitions, rand.nextInt(numPartitions) + 1, "%06x");
-    conn.tableOperations().addSplits(name, splits);
+    client.tableOperations().addSplits(name, splits);
 
     log.info("Added " + splits.size() + " splits to " + name);
 
     if (enableCache) {
-      conn.tableOperations().setProperty(name, Property.TABLE_INDEXCACHE_ENABLED.getKey(), "true");
-      conn.tableOperations().setProperty(name, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), "true");
+      client.tableOperations().setProperty(name, Property.TABLE_INDEXCACHE_ENABLED.getKey(), "true");
+      client.tableOperations().setProperty(name, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), "true");
 
       log.info("Enabled caching for table " + name);
     }
@@ -88,23 +88,23 @@ public class ShardFixture extends Fixture {
     state.set("rand", rand);
     state.set("nextDocID", Long.valueOf(0));
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     createIndexTable(this.log, state, env, "", rand);
 
     String docTableName = (String) state.get("docTableName");
-    conn.tableOperations().create(docTableName);
+    client.tableOperations().create(docTableName);
 
-    String tableId = conn.tableOperations().tableIdMap().get(docTableName);
+    String tableId = client.tableOperations().tableIdMap().get(docTableName);
     log.info("Created doc table " + docTableName + " (id:" + tableId + ")");
 
     SortedSet<Text> splits = genSplits(0xff, rand.nextInt(32) + 1, "%02x");
-    conn.tableOperations().addSplits(docTableName, splits);
+    client.tableOperations().addSplits(docTableName, splits);
 
     log.info("Added " + splits.size() + " splits to " + docTableName);
 
     if (rand.nextDouble() < .5) {
-      conn.tableOperations().setProperty((String) state.get("docTableName"), Property.TABLE_BLOOM_ENABLED.getKey(), "true");
+      client.tableOperations().setProperty((String) state.get("docTableName"), Property.TABLE_BLOOM_ENABLED.getKey(), "true");
       log.info("Enabled bloom filters for table " + (String) state.get("docTableName"));
     }
   }
@@ -124,12 +124,12 @@ public class ShardFixture extends Fixture {
       env.resetMultiTableBatchWriter();
     }
 
-    Connector conn = env.getAccumuloConnector();
+    AccumuloClient client = env.getAccumuloClient();
 
     log.info("Deleting index and doc tables");
 
-    conn.tableOperations().delete((String) state.get("indexTableName"));
-    conn.tableOperations().delete((String) state.get("docTableName"));
+    client.tableOperations().delete((String) state.get("indexTableName"));
+    client.tableOperations().delete((String) state.get("docTableName"));
 
     log.debug("Exiting shard test");
   }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Split.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Split.java
index d150e99..76a6fa5 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Split.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Split.java
@@ -35,7 +35,7 @@ public class Split extends Test {
 
     SortedSet<Text> splitSet = ShardFixture.genSplits(numPartitions, rand.nextInt(numPartitions) + 1, "%06x");
     log.debug("adding splits " + indexTableName);
-    env.getAccumuloConnector().tableOperations().addSplits(indexTableName, splitSet);
+    env.getAccumuloClient().tableOperations().addSplits(indexTableName, splitSet);
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/VerifyIndex.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/VerifyIndex.java
index cd1a1cd..3db9574 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/VerifyIndex.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/VerifyIndex.java
@@ -38,8 +38,8 @@ public class VerifyIndex extends Test {
     String tmpIndexTableName = indexTableName + "_tmp";
 
     // scan new and old index and verify identical
-    Scanner indexScanner1 = env.getAccumuloConnector().createScanner(tmpIndexTableName, Authorizations.EMPTY);
-    Scanner indexScanner2 = env.getAccumuloConnector().createScanner(indexTableName, Authorizations.EMPTY);
+    Scanner indexScanner1 = env.getAccumuloClient().createScanner(tmpIndexTableName, Authorizations.EMPTY);
+    Scanner indexScanner2 = env.getAccumuloClient().createScanner(indexTableName, Authorizations.EMPTY);
 
     Iterator<Entry<Key,Value>> iter = indexScanner2.iterator();
 
@@ -64,8 +64,8 @@ public class VerifyIndex extends Test {
 
     log.debug("Verified " + count + " index entries ");
 
-    env.getAccumuloConnector().tableOperations().delete(indexTableName);
-    env.getAccumuloConnector().tableOperations().rename(tmpIndexTableName, indexTableName);
+    env.getAccumuloClient().tableOperations().delete(indexTableName);
+    env.getAccumuloClient().tableOperations().rename(tmpIndexTableName, indexTableName);
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/scalability/Ingest.java b/core/src/main/java/org/apache/accumulo/testing/core/scalability/Ingest.java
index 2f4667c..cd597ad 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/scalability/Ingest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/scalability/Ingest.java
@@ -40,14 +40,14 @@ public class Ingest extends ScaleTest {
   @Override
   public void setup() {
 
-    AccumuloClient conn = getClient();
+    AccumuloClient client = getClient();
     String tableName = getTestProperty("TABLE");
 
     // delete existing table
-    if (conn.tableOperations().exists(tableName)) {
+    if (client.tableOperations().exists(tableName)) {
       System.out.println("Deleting existing table: " + tableName);
       try {
-        conn.tableOperations().delete(tableName);
+        client.tableOperations().delete(tableName);
       } catch (Exception e) {
         log.error("Failed to delete table '" + tableName + "'.", e);
       }
@@ -55,9 +55,9 @@ public class Ingest extends ScaleTest {
 
     // create table
     try {
-      conn.tableOperations().create(tableName);
-      conn.tableOperations().addSplits(tableName, calculateSplits());
-      conn.tableOperations().setProperty(tableName, "table.split.threshold", "256M");
+      client.tableOperations().create(tableName);
+      client.tableOperations().addSplits(tableName, calculateSplits());
+      client.tableOperations().setProperty(tableName, "table.split.threshold", "256M");
     } catch (Exception e) {
       log.error("Failed to create table '" + tableName + "'.", e);
     }
@@ -67,7 +67,7 @@ public class Ingest extends ScaleTest {
   @Override
   public void client() {
 
-    AccumuloClient conn = getClient();
+    AccumuloClient client = getClient();
     String tableName = getTestProperty("TABLE");
 
     // get batch writer configuration
@@ -78,7 +78,7 @@ public class Ingest extends ScaleTest {
     // create batch writer
     BatchWriter bw = null;
     try {
-      bw = conn.createBatchWriter(tableName, new BatchWriterConfig().setMaxMemory(maxMemory).setMaxLatency(maxLatency, TimeUnit.MILLISECONDS)
+      bw = client.createBatchWriter(tableName, new BatchWriterConfig().setMaxMemory(maxMemory).setMaxLatency(maxLatency, TimeUnit.MILLISECONDS)
           .setMaxWriteThreads(maxWriteThreads));
     } catch (TableNotFoundException e) {
       log.error("Table '" + tableName + "' not found.", e);
@@ -130,11 +130,11 @@ public class Ingest extends ScaleTest {
   @Override
   public void teardown() {
 
-    AccumuloClient conn = getClient();
+    AccumuloClient client = getClient();
     String tableName = getTestProperty("TABLE");
 
     try {
-      conn.tableOperations().delete(tableName);
+      client.tableOperations().delete(tableName);
     } catch (Exception e) {
       log.error("Failed to delete table '" + tableName + "'", e);
     }
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/scalability/ScaleTest.java b/core/src/main/java/org/apache/accumulo/testing/core/scalability/ScaleTest.java
index 52e034d..7042f0f 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/scalability/ScaleTest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/scalability/ScaleTest.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.io.Text;
 
 public abstract class ScaleTest {
 
-  private AccumuloClient conn;
+  private AccumuloClient client;
   private Properties scaleProps;
   private Properties testProps;
   private int numTabletServers;
@@ -40,14 +40,14 @@ public abstract class ScaleTest {
     this.testProps = testProps;
     this.numTabletServers = numTabletServers;
 
-    // get properties to create connector
+    // get properties to create client
     String instanceName = this.scaleProps.getProperty("INSTANCE_NAME");
     String zookeepers = this.scaleProps.getProperty("ZOOKEEPERS");
     String user = this.scaleProps.getProperty("USER");
     String password = this.scaleProps.getProperty("PASSWORD");
     System.out.println(password);
 
-    conn = Accumulo.newClient().forInstance(instanceName, zookeepers).usingToken(user, new PasswordToken(password)).build();
+    client = Accumulo.newClient().forInstance(instanceName, zookeepers).usingToken(user, new PasswordToken(password)).build();
   }
 
   protected void startTimer() {
@@ -78,7 +78,7 @@ public abstract class ScaleTest {
   }
 
   public AccumuloClient getClient() {
-    return conn;
+    return client;
   }
 
   public String getTestProperty(String key) {
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/stress/Scan.java b/core/src/main/java/org/apache/accumulo/testing/core/stress/Scan.java
index 708658e..04443ef 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/stress/Scan.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/stress/Scan.java
@@ -38,8 +38,8 @@ public class Scan {
     ScanOpts opts = new ScanOpts();
     opts.parseArgs(Scan.class.getName(), args);
 
-    AccumuloClient connector = opts.getClient();
-    Scanner scanner = connector.createScanner(opts.getTableName(), new Authorizations());
+    AccumuloClient client = opts.getClient();
+    Scanner scanner = client.createScanner(opts.getTableName(), new Authorizations());
 
     if (opts.isolate) {
       scanner.enableIsolation();
@@ -50,7 +50,7 @@ public class Scan {
     LoopControl scanning_condition = opts.continuous ? new ContinuousLoopControl() : new IterativeLoopControl(opts.scan_iterations);
 
     while (scanning_condition.keepScanning()) {
-      Range range = pickRange(connector.tableOperations(), opts.getTableName(), tablet_index_generator);
+      Range range = pickRange(client.tableOperations(), opts.getTableName(), tablet_index_generator);
       scanner.setRange(range);
       if (opts.batch_size > 0) {
         scanner.setBatchSize(opts.batch_size);
diff --git a/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java b/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
index a8da367..a2a5124 100644
--- a/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
+++ b/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/ReplicationRandomWalkIT.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.testing.core.randomwalk;
 import static org.apache.accumulo.core.conf.Property.TSERV_NATIVEMAP_ENABLED;
 import static org.apache.accumulo.core.conf.Property.TSERV_WALOG_MAX_SIZE;
 
-import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.test.functional.ConfigurableMacBase;
 import org.apache.accumulo.testing.core.randomwalk.concurrent.Replication;
@@ -44,7 +43,6 @@ public class ReplicationRandomWalkIT extends ConfigurableMacBase {
     EasyMock.expect(env.getAccumuloUserName()).andReturn("root").anyTimes();
     EasyMock.expect(env.getAccumuloPassword()).andReturn(ROOT_PASSWORD).anyTimes();
     EasyMock.expect(env.getAccumuloClient()).andReturn(this.getClient()).anyTimes();
-    EasyMock.expect(env.getAccumuloConnector()).andReturn(Connector.from(this.getClient())).anyTimes();
     EasyMock.replay(env);
 
     r.visit(null, env, null);


Mime
View raw message