accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Fixes #520 - Rename ConnectionInfo to ClientInfo (#521)
Date Wed, 06 Jun 2018 23:29:59 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 8c95e2f  Fixes #520 - Rename ConnectionInfo to ClientInfo (#521)
8c95e2f is described below

commit 8c95e2fd31b387f8566f9c2c315210af2bd70d6e
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Jun 6 19:29:56 2018 -0400

    Fixes #520 - Rename ConnectionInfo to ClientInfo (#521)
---
 .../core/client/mapred/AbstractInputFormat.java    | 28 ++++++------
 .../core/client/mapred/AccumuloInputFormat.java    |  4 +-
 .../mapred/AccumuloMultiTableInputFormat.java      |  4 +-
 .../core/client/mapred/AccumuloOutputFormat.java   | 16 +++----
 .../core/client/mapred/AccumuloRowInputFormat.java |  4 +-
 .../core/client/mapreduce/AbstractInputFormat.java | 24 +++++------
 .../core/client/mapreduce/AccumuloInputFormat.java |  4 +-
 .../mapreduce/AccumuloMultiTableInputFormat.java   |  4 +-
 .../client/mapreduce/AccumuloOutputFormat.java     | 14 +++---
 .../client/mapreduce/AccumuloRowInputFormat.java   |  4 +-
 .../mapreduce/lib/impl/ConfiguratorBase.java       | 30 ++++++-------
 .../mapreduce/lib/impl/InputConfigurator.java      |  6 +--
 .../lib/impl/MapReduceClientOnDefaultTable.java    |  8 ++--
 .../mapreduce/lib/impl/MapReduceClientOpts.java    |  4 +-
 .../mapreduce/lib/impl/ConfiguratorBaseTest.java   | 16 +++----
 .../org/apache/accumulo/core/cli/ClientOpts.java   | 14 +++---
 .../{ConnectionInfo.java => ClientInfo.java}       |  4 +-
 .../org/apache/accumulo/core/client/Connector.java | 28 ++++++------
 .../accumulo/core/client/impl/ClientContext.java   | 13 +++---
 ...tionInfoFactory.java => ClientInfoFactory.java} | 18 ++++----
 ...ConnectionInfoImpl.java => ClientInfoImpl.java} |  6 +--
 .../accumulo/core/client/impl/ConnectorImpl.java   | 19 ++++----
 .../accumulo/core/client/mock/MockConnector.java   |  4 +-
 .../apache/accumulo/cluster/AccumuloCluster.java   |  6 +--
 .../standalone/StandaloneAccumuloCluster.java      |  8 ++--
 .../accumulo/minicluster/MiniAccumuloCluster.java  |  8 ++--
 .../minicluster/impl/MiniAccumuloClusterImpl.java  |  6 +--
 .../main/java/org/apache/accumulo/shell/Shell.java |  4 +-
 .../accumulo/harness/AccumuloClusterHarness.java   | 10 ++---
 .../StandaloneAccumuloClusterConfiguration.java    | 10 ++---
 .../apache/accumulo/test/ConditionalWriterIT.java  |  2 +-
 .../accumulo/test/DetectDeadTabletServersIT.java   |  2 +-
 .../test/MasterRepairsDualAssignmentIT.java        |  2 +-
 .../accumulo/test/MetaConstraintRetryIT.java       |  2 +-
 .../accumulo/test/MultiTableBatchWriterIT.java     |  2 +-
 .../org/apache/accumulo/test/ShellServerIT.java    |  7 ++-
 .../test/TracerRecoversAfterOfflineTableIT.java    |  2 +-
 .../apache/accumulo/test/TransportCachingIT.java   |  2 +-
 .../functional/BalanceAfterCommsFailureIT.java     |  2 +-
 .../BalanceInPresenceOfOfflineTableIT.java         |  6 +--
 .../apache/accumulo/test/functional/BulkIT.java    | 14 +++---
 .../test/functional/BulkSplitOptimizationIT.java   |  2 +-
 .../test/functional/ChaoticBalancerIT.java         |  4 +-
 .../accumulo/test/functional/CompactionIT.java     |  2 +-
 .../test/functional/ConfigurableMacBase.java       |  4 +-
 .../accumulo/test/functional/ConnectorIT.java      |  6 +--
 .../apache/accumulo/test/functional/DeleteIT.java  |  4 +-
 .../test/functional/DynamicThreadPoolsIT.java      |  4 +-
 .../accumulo/test/functional/FateStarvationIT.java |  2 +-
 .../test/functional/GarbageCollectorIT.java        |  4 +-
 .../test/functional/HalfDeadTServerIT.java         |  2 +-
 .../test/functional/MasterAssignmentIT.java        |  2 +-
 .../accumulo/test/functional/MasterFailoverIT.java |  4 +-
 .../apache/accumulo/test/functional/MaxOpenIT.java |  2 +-
 .../test/functional/MetadataMaxFilesIT.java        |  2 +-
 .../accumulo/test/functional/ReadWriteIT.java      | 50 +++++++++++-----------
 .../test/functional/RecoveryWithEmptyRFileIT.java  |  4 +-
 .../apache/accumulo/test/functional/RenameIT.java  |  4 +-
 .../apache/accumulo/test/functional/RestartIT.java | 22 +++++-----
 .../accumulo/test/functional/RestartStressIT.java  |  2 +-
 .../test/functional/SimpleBalancerFairnessIT.java  |  4 +-
 .../apache/accumulo/test/functional/SplitIT.java   |  4 +-
 .../org/apache/accumulo/test/functional/SslIT.java |  2 +-
 .../apache/accumulo/test/functional/TableIT.java   |  4 +-
 .../accumulo/test/functional/WriteAheadLogIT.java  |  4 +-
 .../accumulo/test/functional/WriteLotsIT.java      |  4 +-
 .../test/mapred/AccumuloFileOutputFormatIT.java    |  2 +-
 .../test/mapred/AccumuloInputFormatIT.java         |  4 +-
 .../mapred/AccumuloMultiTableInputFormatIT.java    |  2 +-
 .../test/mapred/AccumuloOutputFormatIT.java        | 10 ++---
 .../test/mapred/AccumuloRowInputFormatIT.java      |  2 +-
 .../apache/accumulo/test/mapred/TokenFileIT.java   |  4 +-
 .../test/mapreduce/AccumuloFileOutputFormatIT.java |  2 +-
 .../test/mapreduce/AccumuloInputFormatIT.java      |  6 +--
 .../mapreduce/AccumuloMultiTableInputFormatIT.java |  2 +-
 .../test/mapreduce/AccumuloOutputFormatIT.java     |  4 +-
 .../test/mapreduce/AccumuloRowInputFormatIT.java   |  2 +-
 .../accumulo/test/mapreduce/TokenFileIT.java       |  4 +-
 .../accumulo/test/master/SuspendedTabletsIT.java   |  2 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java     |  2 +-
 .../accumulo/test/proxy/SimpleProxyBase.java       |  2 +-
 ...GarbageCollectorCommunicatesWithTServersIT.java |  2 +-
 .../replication/ReplicationOperationsImplIT.java   |  2 +-
 83 files changed, 285 insertions(+), 288 deletions(-)

diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index a5a10b3..8485df7 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -34,8 +34,8 @@ import java.util.concurrent.TimeUnit;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.ClientSideIteratorScanner;
-import org.apache.accumulo.core.client.ConnectionInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IsolatedScanner;
@@ -125,9 +125,9 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
    *          Connection information for Accumulo
    * @since 2.0.0
    */
-  public static void setConnectionInfo(JobConf job, ConnectionInfo info) {
-    ConnectionInfo inputInfo = InputConfigurator.updateToken(job.getCredentials(), info);
-    InputConfigurator.setConnectionInfo(CLASS, job, inputInfo);
+  public static void setClientInfo(JobConf job, ClientInfo info) {
+    ClientInfo inputInfo = InputConfigurator.updateToken(job.getCredentials(), info);
+    InputConfigurator.setClientInfo(CLASS, job, inputInfo);
   }
 
   /**
@@ -157,15 +157,15 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
   }
 
   /**
-   * Retrieves {@link ConnectionInfo} from the configuration
+   * Retrieves {@link ClientInfo} from the configuration
    *
    * @param job
    *          Hadoop job instance configuration
-   * @return {@link ConnectionInfo} object
+   * @return {@link ClientInfo} object
    * @since 2.0.0
    */
-  protected static ConnectionInfo getConnectionInfo(JobConf job) {
-    return InputConfigurator.getConnectionInfo(CLASS, job);
+  protected static ClientInfo getClientInfo(JobConf job) {
+    return InputConfigurator.getClientInfo(CLASS, job);
   }
 
   /**
@@ -187,7 +187,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
    * @param token
    *          the user's password
    * @since 1.5.0
-   * @deprecated since 2.0.0, use {@link #setConnectionInfo(JobConf, ConnectionInfo)} instead
+   * @deprecated since 2.0.0, use {@link #setClientInfo(JobConf, ClientInfo)} instead
    */
   @Deprecated
   public static void setConnectorInfo(JobConf job, String principal, AuthenticationToken token)
@@ -234,7 +234,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
    * @param tokenFile
    *          the path to the token file
    * @since 1.6.0
-   * @deprecated since 2.0.0, use {@link #setConnectionInfo(JobConf, ConnectionInfo)} instead
+   * @deprecated since 2.0.0, use {@link #setClientInfo(JobConf, ClientInfo)} instead
    */
   @Deprecated
   public static void setConnectorInfo(JobConf job, String principal, String tokenFile)
@@ -292,7 +292,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
    * @param clientConfig
    *          client configuration containing connection options
    * @since 1.6.0
-   * @deprecated since 2.0.0; Use {@link #setConnectionInfo(JobConf, ConnectionInfo)} instead.
+   * @deprecated since 2.0.0; Use {@link #setClientInfo(JobConf, ClientInfo)} instead.
    */
   @Deprecated
   public static void setZooKeeperInstance(JobConf job,
@@ -373,7 +373,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
    *          The job
    * @return The client configuration for the job
    * @since 1.7.0
-   * @deprecated since 2.0.0, replaced by {{@link #getConnectionInfo(JobConf)}}
+   * @deprecated since 2.0.0, replaced by {{@link #getClientInfo(JobConf)}}
    */
   @Deprecated
   protected static org.apache.accumulo.core.client.ClientConfiguration getClientConfiguration(
@@ -554,7 +554,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
             scanner = new OfflineScanner(instance, new Credentials(principal, token),
                 Table.ID.of(baseSplit.getTableId()), authorizations);
           } else {
-            Properties props = getConnectionInfo(job).getProperties();
+            Properties props = getClientInfo(job).getProperties();
             ClientContext context = new ClientContext(instance, new Credentials(principal, token),
                 props);
             scanner = new ScannerImpl(context, Table.ID.of(baseSplit.getTableId()), authorizations);
@@ -708,7 +708,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
           // tablets... so clear it
           tl.invalidateCache();
 
-          ClientContext context = new ClientContext(getConnectionInfo(job));
+          ClientContext context = new ClientContext(getClientInfo(job));
           while (!tl.binRanges(context, ranges, binnedRanges).isEmpty()) {
             String tableIdStr = tableId.canonicalID();
             if (!Tables.exists(instance, tableId))
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
index 3bb86ca..638924d 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.core.client.mapred;
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
@@ -38,7 +38,7 @@ import org.apache.log4j.Level;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloInputFormat#setConnectionInfo(JobConf, ConnectionInfo)}
+ * <li>{@link AccumuloInputFormat#setClientInfo(JobConf, ClientInfo)}
  * <li>{@link AccumuloInputFormat#setInputTableName(JobConf, String)}</li>
  * <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf, Authorizations)}
  * </ul>
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
index 12b4dbb..d4bceed 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloMultiTableInputFormat.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.core.client.mapred;
 import java.io.IOException;
 import java.util.Map;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.mapred.InputFormatBase.RecordReaderBase;
 import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
 import org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator;
@@ -39,7 +39,7 @@ import org.apache.hadoop.mapred.Reporter;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloInputFormat#setConnectionInfo(JobConf, ConnectionInfo)}
+ * <li>{@link AccumuloInputFormat#setClientInfo(JobConf, ClientInfo)}
  * <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf, org.apache.accumulo.core.security.Authorizations)}
  * <li>{@link AccumuloMultiTableInputFormat#setInputTableConfigs(org.apache.hadoop.mapred.JobConf, java.util.Map)}
  * </ul>
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
index cc0e0db..8105857 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -69,7 +69,7 @@ import org.apache.log4j.Logger;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloOutputFormat#setConnectionInfo(JobConf, ConnectionInfo)}
+ * <li>{@link AccumuloOutputFormat#setClientInfo(JobConf, ClientInfo)}
  * </ul>
  *
  * Other static methods are optional.
@@ -88,9 +88,9 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
    *          Accumulo connection information
    * @since 2.0.0
    */
-  public static void setConnectionInfo(JobConf job, ConnectionInfo info) {
-    ConnectionInfo outInfo = OutputConfigurator.updateToken(job.getCredentials(), info);
-    OutputConfigurator.setConnectionInfo(CLASS, job, outInfo);
+  public static void setClientInfo(JobConf job, ClientInfo info) {
+    ClientInfo outInfo = OutputConfigurator.updateToken(job.getCredentials(), info);
+    OutputConfigurator.setClientInfo(CLASS, job, outInfo);
   }
 
   /**
@@ -139,7 +139,7 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
    * @param token
    *          the user's password
    * @since 1.5.0
-   * @deprecated since 2.0.0, use {@link #setConnectionInfo(JobConf, ConnectionInfo)} instead.
+   * @deprecated since 2.0.0, use {@link #setClientInfo(JobConf, ClientInfo)} instead.
    */
   @Deprecated
   public static void setConnectorInfo(JobConf job, String principal, AuthenticationToken token)
@@ -187,7 +187,7 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
    * @param tokenFile
    *          the path to the password file
    * @since 1.6.0
-   * @deprecated since 2.0.0, use {@link #setConnectionInfo(JobConf, ConnectionInfo)} instead
+   * @deprecated since 2.0.0, use {@link #setClientInfo(JobConf, ClientInfo)} instead
    */
   @Deprecated
   public static void setConnectorInfo(JobConf job, String principal, String tokenFile)
@@ -246,7 +246,7 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
    * @param clientConfig
    *          client configuration for specifying connection timeouts, SSL connection options, etc.
    * @since 1.6.0
-   * @deprecated since 2.0.0; Use {@link #setConnectionInfo(JobConf, ConnectionInfo)} instead.
+   * @deprecated since 2.0.0; Use {@link #setClientInfo(JobConf, ClientInfo)} instead.
    */
   @Deprecated
   public static void setZooKeeperInstance(JobConf job,
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
index 8a55206..1bfc1d6 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.core.client.mapred;
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.RowIterator;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -41,7 +41,7 @@ import org.apache.hadoop.mapred.Reporter;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectionInfo(JobConf, ConnectionInfo)}
+ * <li>{@link AccumuloRowInputFormat#setClientInfo(JobConf, ClientInfo)}
  * <li>{@link AccumuloRowInputFormat#setInputTableName(JobConf, String)}
  * <li>{@link AccumuloRowInputFormat#setScanAuthorizations(JobConf, Authorizations)}
  * </ul>
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index 1ac418c..508f4ae 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -34,8 +34,8 @@ import java.util.concurrent.TimeUnit;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.ClientSideIteratorScanner;
-import org.apache.accumulo.core.client.ConnectionInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IsolatedScanner;
@@ -127,9 +127,9 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
    *          Connection information for Accumulo
    * @since 2.0.0
    */
-  public static void setConnectionInfo(Job job, ConnectionInfo info) {
-    ConnectionInfo inputInfo = InputConfigurator.updateToken(job.getCredentials(), info);
-    InputConfigurator.setConnectionInfo(CLASS, job.getConfiguration(), inputInfo);
+  public static void setClientInfo(Job job, ClientInfo info) {
+    ClientInfo inputInfo = InputConfigurator.updateToken(job.getCredentials(), info);
+    InputConfigurator.setClientInfo(CLASS, job.getConfiguration(), inputInfo);
   }
 
   /**
@@ -159,15 +159,15 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
   }
 
   /**
-   * Gets the {@link ConnectionInfo} from the configuration
+   * Gets the {@link ClientInfo} from the configuration
    *
    * @param context
    *          Hadoop job context
-   * @return ConnectionInfo
+   * @return ClientInfo
    * @since 2.0.0
    */
-  protected static ConnectionInfo getConnectionInfo(JobContext context) {
-    return InputConfigurator.getConnectionInfo(CLASS, context.getConfiguration());
+  protected static ClientInfo getClientInfo(JobContext context) {
+    return InputConfigurator.getClientInfo(CLASS, context.getConfiguration());
   }
 
   /**
@@ -189,7 +189,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
    * @param token
    *          the user's password
    * @since 1.5.0
-   * @deprecated since 2.0.0; use {@link #setConnectionInfo(Job, ConnectionInfo)} instead.
+   * @deprecated since 2.0.0; use {@link #setClientInfo(Job, ClientInfo)} instead.
    */
   @Deprecated
   public static void setConnectorInfo(Job job, String principal, AuthenticationToken token)
@@ -294,7 +294,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
    * @param clientConfig
    *          client configuration containing connection options
    * @since 1.6.0
-   * @deprecated since 2.0.0; Use {@link #setConnectionInfo(Job, ConnectionInfo)} instead.
+   * @deprecated since 2.0.0; Use {@link #setClientInfo(Job, ClientInfo)} instead.
    */
   @Deprecated
   public static void setZooKeeperInstance(Job job,
@@ -557,7 +557,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
             scanner = new OfflineScanner(instance, new Credentials(principal, token),
                 Table.ID.of(split.getTableId()), authorizations);
           } else {
-            Properties props = getConnectionInfo(attempt).getProperties();
+            Properties props = getClientInfo(attempt).getProperties();
             ClientContext context = new ClientContext(instance, new Credentials(principal, token),
                 props);
             // Not using public API to create scanner so that we can use table ID
@@ -732,7 +732,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
           // tablets... so clear it
           tl.invalidateCache();
 
-          ClientContext clientContext = new ClientContext(getConnectionInfo(context));
+          ClientContext clientContext = new ClientContext(getClientInfo(context));
           while (!tl.binRanges(clientContext, ranges, binnedRanges).isEmpty()) {
             String tableIdStr = tableId.canonicalID();
             if (!Tables.exists(instance, tableId))
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
index efc6221..1ad29f3 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.core.client.mapreduce;
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
@@ -38,7 +38,7 @@ import org.apache.log4j.Level;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloInputFormat#setConnectionInfo(Job, ConnectionInfo)}
+ * <li>{@link AccumuloInputFormat#setClientInfo(Job, ClientInfo)}
  * <li>{@link AccumuloInputFormat#setInputTableName(Job, String)}
  * <li>{@link AccumuloInputFormat#setScanAuthorizations(Job, Authorizations)}
  * </ul>
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
index 8c94a78..ced7cbb 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator;
 import org.apache.accumulo.core.data.Key;
@@ -42,7 +42,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloMultiTableInputFormat#setConnectionInfo(Job, ConnectionInfo)}
+ * <li>{@link AccumuloMultiTableInputFormat#setClientInfo(Job, ClientInfo)}
  * <li>{@link AccumuloMultiTableInputFormat#setScanAuthorizations(Job, Authorizations)}
  * <li>{@link AccumuloMultiTableInputFormat#setInputTableConfigs(Job, Map)}
  * </ul>
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
index 8a49382..c4ff7b5 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -70,7 +70,7 @@ import org.apache.log4j.Logger;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloOutputFormat#setConnectionInfo(Job, ConnectionInfo)}
+ * <li>{@link AccumuloOutputFormat#setClientInfo(Job, ClientInfo)}
  * </ul>
  *
  * Other static methods are optional.
@@ -89,8 +89,8 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
    *          Accumulo connection information
    * @since 2.0.0
    */
-  public static void setConnectionInfo(Job job, ConnectionInfo info) {
-    OutputConfigurator.setConnectionInfo(CLASS, job.getConfiguration(), info);
+  public static void setClientInfo(Job job, ClientInfo info) {
+    OutputConfigurator.setClientInfo(CLASS, job.getConfiguration(), info);
   }
 
   /**
@@ -139,7 +139,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
    * @param token
    *          the user's password
    * @since 1.5.0
-   * @deprecated since 2.0.0, replaced by {@link #setConnectionInfo(Job, ConnectionInfo)}
+   * @deprecated since 2.0.0, replaced by {@link #setClientInfo(Job, ClientInfo)}
    */
   @Deprecated
   public static void setConnectorInfo(Job job, String principal, AuthenticationToken token)
@@ -187,7 +187,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
    * @param tokenFile
    *          the path to the token file
    * @since 1.6.0
-   * @deprecated since 2.0.0, replaced by {@link #setConnectionInfo(Job, ConnectionInfo)}
+   * @deprecated since 2.0.0, replaced by {@link #setClientInfo(Job, ClientInfo)}
    */
   @Deprecated
   public static void setConnectorInfo(Job job, String principal, String tokenFile)
@@ -247,7 +247,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
    * @param clientConfig
    *          client configuration for specifying connection timeouts, SSL connection options, etc.
    * @since 1.6.0
-   * @deprecated since 2.0.0; Use {@link #setConnectionInfo(Job, ConnectionInfo)} instead.
+   * @deprecated since 2.0.0; Use {@link #setClientInfo(Job, ClientInfo)} instead.
    */
   @Deprecated
   public static void setZooKeeperInstance(Job job,
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
index 38dece6..9d034ef 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.core.client.mapreduce;
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.RowIterator;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -41,7 +41,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
  * The user must specify the following via static configurator methods:
  *
  * <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectionInfo(Job, ConnectionInfo)}
+ * <li>{@link AccumuloRowInputFormat#setClientInfo(Job, ClientInfo)}
  * <li>{@link AccumuloRowInputFormat#setInputTableName(Job, String)}
  * <li>{@link AccumuloRowInputFormat#setScanAuthorizations(Job, Authorizations)}
  * </ul>
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
index d2abc56..1ffa291 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
@@ -32,14 +32,14 @@ import java.util.Scanner;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
 import org.apache.accumulo.core.client.impl.AuthenticationTokenIdentifier;
 import org.apache.accumulo.core.client.impl.ClientConfConverter;
-import org.apache.accumulo.core.client.impl.ConnectionInfoImpl;
+import org.apache.accumulo.core.client.impl.ClientInfoImpl;
 import org.apache.accumulo.core.client.impl.DelegationTokenImpl;
 import org.apache.accumulo.core.client.mapreduce.impl.DelegationTokenStub;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
@@ -114,17 +114,17 @@ public class ConfiguratorBase {
         + StringUtils.camelize(e.name().toLowerCase());
   }
 
-  public static ConnectionInfo updateToken(org.apache.hadoop.security.Credentials credentials,
-      ConnectionInfo info) {
-    ConnectionInfo result = info;
+  public static ClientInfo updateToken(org.apache.hadoop.security.Credentials credentials,
+      ClientInfo info) {
+    ClientInfo result = info;
     if (info.getAuthenticationToken() instanceof KerberosToken) {
       log.info("Received KerberosToken, attempting to fetch DelegationToken");
       try {
-        Connector conn = Connector.builder().usingConnectionInfo(info).build();
+        Connector conn = Connector.builder().usingClientInfo(info).build();
         AuthenticationToken token = conn.securityOperations()
             .getDelegationToken(new DelegationTokenConfig());
-        result = Connector.builder().usingConnectionInfo(info)
-            .usingToken(info.getPrincipal(), token).info();
+        result = Connector.builder().usingClientInfo(info).usingToken(info.getPrincipal(), token)
+            .info();
       } catch (Exception e) {
         log.warn("Failed to automatically obtain DelegationToken, "
             + "Mappers/Reducers will likely fail to communicate with Accumulo", e);
@@ -146,15 +146,15 @@ public class ConfiguratorBase {
     return result;
   }
 
-  public static void setConnectionInfo(Class<?> implementingClass, Configuration conf,
-      ConnectionInfo info) {
+  public static void setClientInfo(Class<?> implementingClass, Configuration conf,
+      ClientInfo info) {
     setClientProperties(implementingClass, conf, info.getProperties());
     conf.setBoolean(enumToConfKey(implementingClass, ConnectorInfo.IS_CONFIGURED), true);
   }
 
-  public static ConnectionInfo getConnectionInfo(Class<?> implementingClass, Configuration conf) {
+  public static ClientInfo getClientInfo(Class<?> implementingClass, Configuration conf) {
     Properties props = getClientProperties(implementingClass, conf);
-    return new ConnectionInfoImpl(props);
+    return new ClientInfoImpl(props);
   }
 
   public static void setClientPropertiesFile(Class<?> implementingClass, Configuration conf,
@@ -376,8 +376,7 @@ public class ConfiguratorBase {
    */
   public static Connector getConnector(Class<?> implementingClass, Configuration conf) {
     try {
-      return Connector.builder().usingConnectionInfo(getConnectionInfo(implementingClass, conf))
-          .build();
+      return Connector.builder().usingClientInfo(getClientInfo(implementingClass, conf)).build();
     } catch (AccumuloException | AccumuloSecurityException e) {
       throw new IllegalStateException(e);
     }
@@ -397,8 +396,7 @@ public class ConfiguratorBase {
   @SuppressWarnings("deprecation")
   public static org.apache.accumulo.core.client.ClientConfiguration getClientConfiguration(
       Class<?> implementingClass, Configuration conf) {
-    return ClientConfConverter
-        .toClientConf(getConnectionInfo(implementingClass, conf).getProperties());
+    return ClientConfConverter.toClientConf(getClientInfo(implementingClass, conf).getProperties());
   }
 
   /**
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 586da93..1d7967a 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -39,8 +39,8 @@ import java.util.StringTokenizer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.ClientSideIteratorScanner;
-import org.apache.accumulo.core.client.ConnectionInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IsolatedScanner;
@@ -721,7 +721,7 @@ public class InputConfigurator extends ConfiguratorBase {
    */
   public static TabletLocator getTabletLocator(Class<?> implementingClass, Configuration conf,
       Table.ID tableId) {
-    ConnectionInfo info = getConnectionInfo(implementingClass, conf);
+    ClientInfo info = getClientInfo(implementingClass, conf);
     ClientContext context = new ClientContext(info);
     return TabletLocator.getLocator(context, tableId);
   }
@@ -762,7 +762,7 @@ public class InputConfigurator extends ConfiguratorBase {
 
       String principal = getPrincipal(implementingClass, conf);
       if (principal == null) {
-        principal = getConnectionInfo(implementingClass, conf).getPrincipal();
+        principal = getClientInfo(implementingClass, conf).getPrincipal();
       }
 
       for (Map.Entry<String,InputTableConfig> tableConfig : inputTableConfigs.entrySet()) {
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOnDefaultTable.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOnDefaultTable.java
index 78fff68..e184dc6 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOnDefaultTable.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOnDefaultTable.java
@@ -17,7 +17,7 @@
 package org.apache.accumulo.core.client.mapreduce.lib.impl;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.hadoop.mapreduce.Job;
@@ -40,11 +40,11 @@ public class MapReduceClientOnDefaultTable extends MapReduceClientOpts {
   public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
     super.setAccumuloConfigs(job);
     final String tableName = getTableName();
-    final ConnectionInfo info = getConnectionInfo();
-    AccumuloInputFormat.setConnectionInfo(job, info);
+    final ClientInfo info = getClientInfo();
+    AccumuloInputFormat.setClientInfo(job, info);
     AccumuloInputFormat.setInputTableName(job, tableName);
     AccumuloInputFormat.setScanAuthorizations(job, auths);
-    AccumuloOutputFormat.setConnectionInfo(job, info);
+    AccumuloOutputFormat.setClientInfo(job, info);
     AccumuloOutputFormat.setCreateTables(job, true);
     AccumuloOutputFormat.setDefaultTableName(job, tableName);
   }
diff --git a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOpts.java b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOpts.java
index f879247..b0de76e 100644
--- a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOpts.java
+++ b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/MapReduceClientOpts.java
@@ -37,8 +37,8 @@ public class MapReduceClientOpts extends ClientOpts {
   private static final Logger log = LoggerFactory.getLogger(MapReduceClientOpts.class);
 
   public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
-    AccumuloInputFormat.setConnectionInfo(job, this.getConnectionInfo());
-    AccumuloOutputFormat.setConnectionInfo(job, this.getConnectionInfo());
+    AccumuloInputFormat.setClientInfo(job, this.getClientInfo());
+    AccumuloOutputFormat.setClientInfo(job, this.getClientInfo());
   }
 
   @Override
diff --git a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBaseTest.java b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBaseTest.java
index 5e9f502..eb36075 100644
--- a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBaseTest.java
+++ b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBaseTest.java
@@ -25,7 +25,7 @@ import java.util.Properties;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+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.client.security.tokens.PasswordToken;
@@ -74,16 +74,16 @@ public class ConfiguratorBaseTest {
     assertTrue(ConfiguratorBase.isConnectorInfoSet(this.getClass(), conf));
     assertEquals("testUser", ConfiguratorBase.getPrincipal(this.getClass(), conf));
     assertEquals("testPass", new String(((PasswordToken) ConfiguratorBase
-        .getConnectionInfo(this.getClass(), conf).getAuthenticationToken()).getPassword()));
+        .getClientInfo(this.getClass(), conf).getAuthenticationToken()).getPassword()));
   }
 
   @Test
-  public void testSetConnectionInfo() {
+  public void testSetClientInfo() {
     Configuration conf = new Configuration();
-    ConnectionInfo info = Connector.builder().forInstance("myinstance", "myzookeepers")
+    ClientInfo info = Connector.builder().forInstance("myinstance", "myzookeepers")
         .usingPassword("user", "pass").info();
-    ConfiguratorBase.setConnectionInfo(this.getClass(), conf, info);
-    ConnectionInfo info2 = ConfiguratorBase.getConnectionInfo(this.getClass(), conf);
+    ConfiguratorBase.setClientInfo(this.getClass(), conf, info);
+    ClientInfo info2 = ConfiguratorBase.getClientInfo(this.getClass(), conf);
     Assert.assertEquals("myinstance", info2.getInstanceName());
     Assert.assertEquals("myzookeepers", info2.getZooKeepers());
     Assert.assertEquals("user", info2.getPrincipal());
@@ -104,7 +104,7 @@ public class ConfiguratorBaseTest {
     assertEquals("testInstanceName", clientConf
         .get(org.apache.accumulo.core.client.ClientConfiguration.ClientProperty.INSTANCE_NAME));
 
-    Properties props = ConfiguratorBase.getConnectionInfo(this.getClass(), conf).getProperties();
+    Properties props = ConfiguratorBase.getClientInfo(this.getClass(), conf).getProperties();
     assertEquals("testInstanceName", props.getProperty(ClientProperty.INSTANCE_NAME.getKey()));
     assertEquals("testZooKeepers", props.getProperty(ClientProperty.INSTANCE_ZOOKEEPERS.getKey()));
     assertEquals("true", props.getProperty(ClientProperty.SSL_ENABLED.getKey()));
@@ -131,7 +131,7 @@ public class ConfiguratorBaseTest {
   }
 
   @Test
-  public void testSetVisibiltyCacheSize() {
+  public void testSetVisibilityCacheSize() {
     Configuration conf = new Configuration();
     assertEquals(Constants.DEFAULT_VISIBILITY_CACHE_SIZE,
         ConfiguratorBase.getVisibilityCacheSize(conf));
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index f583504..a867f6d 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -27,7 +27,7 @@ import java.util.Properties;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
@@ -103,7 +103,7 @@ public class ClientOpts extends Help {
   private Password securePassword = null;
 
   public AuthenticationToken getToken() {
-    return getConnectionInfo().getAuthenticationToken();
+    return getClientInfo().getAuthenticationToken();
   }
 
   @Parameter(names = {"-z", "--keepers"},
@@ -158,7 +158,7 @@ public class ClientOpts extends Help {
     startTracing(programName);
   }
 
-  private ConnectionInfo cachedInfo = null;
+  private ClientInfo cachedInfo = null;
   private Connector cachedConnector = null;
   protected Instance cachedInstance = null;
   private Properties cachedProps = null;
@@ -175,18 +175,18 @@ public class ClientOpts extends Help {
   }
 
   public String getPrincipal() {
-    return getConnectionInfo().getPrincipal();
+    return getClientInfo().getPrincipal();
   }
 
   public void setPrincipal(String principal) {
     this.principal = principal;
   }
 
-  public void setConnectionInfo(ConnectionInfo info) {
+  public void setClientInfo(ClientInfo info) {
     this.cachedInfo = info;
   }
 
-  public ConnectionInfo getConnectionInfo() {
+  public ClientInfo getClientInfo() {
     if (cachedInfo == null) {
       cachedInfo = Connector.builder().usingProperties(getClientProperties()).info();
     }
@@ -195,7 +195,7 @@ public class ClientOpts extends Help {
 
   public Connector getConnector() throws AccumuloException, AccumuloSecurityException {
     if (cachedConnector == null) {
-      cachedConnector = Connector.builder().usingConnectionInfo(getConnectionInfo()).build();
+      cachedConnector = Connector.builder().usingClientInfo(getClientInfo()).build();
     }
     return cachedConnector;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ConnectionInfo.java b/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
similarity index 92%
rename from core/src/main/java/org/apache/accumulo/core/client/ConnectionInfo.java
rename to core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
index 5815c50..8c829e2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ConnectionInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientInfo.java
@@ -21,11 +21,11 @@ import java.util.Properties;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 
 /**
- * Accumulo client connection information. Can be built using {@link Connector#builder()}
+ * Accumulo client information. Can be built using {@link Connector#builder()}
  *
  * @since 2.0.0
  */
-public interface ConnectionInfo {
+public interface ClientInfo {
 
   /**
    * @return Accumulo instance name
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Connector.java b/core/src/main/java/org/apache/accumulo/core/client/Connector.java
index b046930..2c4e166 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Connector.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Connector.java
@@ -314,24 +314,24 @@ public abstract class Connector {
   public abstract ReplicationOperations replicationOperations();
 
   /**
-   * @return {@link ConnectionInfo} which contains information about Connection to Accumulo
+   * @return {@link ClientInfo} which contains information about client connection to Accumulo
    * @since 2.0.0
    */
-  public abstract ConnectionInfo info();
+  public abstract ClientInfo info();
 
   /**
-   * Builds ConnectionInfo after all options have been specified
+   * Builds ClientInfo after all options have been specified
    *
    * @since 2.0.0
    */
-  public interface ConnInfoFactory {
+  public interface ClientInfoFactory {
 
     /**
-     * Builds ConnectionInfo after all options have been specified
+     * Builds ClientInfo after all options have been specified
      *
-     * @return ConnectionInfo
+     * @return ClientInfo
      */
-    ConnectionInfo info();
+    ClientInfo info();
   }
 
   /**
@@ -339,7 +339,7 @@ public abstract class Connector {
    *
    * @since 2.0.0
    */
-  public interface ConnectorFactory extends ConnInfoFactory {
+  public interface ConnectorFactory extends ClientInfoFactory {
 
     /**
      * Builds Connector after all options have been specified
@@ -388,16 +388,16 @@ public abstract class Connector {
     ConnectorFactory usingProperties(Properties properties);
   }
 
-  public interface ConnectionInfoOptions extends PropertyOptions {
+  public interface ClientInfoOptions extends PropertyOptions {
 
     /**
-     * Build using connection information
+     * Build using Accumulo client information
      *
-     * @param connectionInfo
-     *          ConnectionInfo object
+     * @param clientInfo
+     *          ClientInfo object
      * @return this builder
      */
-    FromOptions usingConnectionInfo(ConnectionInfo connectionInfo);
+    FromOptions usingClientInfo(ClientInfo clientInfo);
   }
 
   /**
@@ -577,7 +577,7 @@ public abstract class Connector {
    * @return this builder
    * @since 2.0.0
    */
-  public static ConnectionInfoOptions builder() {
+  public static ClientInfoOptions builder() {
     return new ConnectorImpl.ConnectorBuilderImpl();
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java
index 0e959af..7076220 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientContext.java
@@ -26,7 +26,7 @@ import java.util.function.Supplier;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
@@ -69,10 +69,9 @@ public class ClientContext {
     return () -> Suppliers.memoizeWithExpiration(() -> s.get(), 100, TimeUnit.MILLISECONDS).get();
   }
 
-  public ClientContext(ConnectionInfo connectionInfo) {
-    this(ConnectionInfoFactory.getInstance(connectionInfo),
-        ConnectionInfoFactory.getCredentials(connectionInfo), connectionInfo.getProperties(),
-        ConnectionInfoFactory.getBatchWriterConfig(connectionInfo));
+  public ClientContext(ClientInfo clientInfo) {
+    this(ClientInfoFactory.getInstance(clientInfo), ClientInfoFactory.getCredentials(clientInfo),
+        clientInfo.getProperties(), ClientInfoFactory.getBatchWriterConfig(clientInfo));
   }
 
   public ClientContext(Instance instance, Credentials credentials, Properties clientProps) {
@@ -126,8 +125,8 @@ public class ClientContext {
     return inst;
   }
 
-  public ConnectionInfo getConnectionInfo() {
-    return new ConnectionInfoImpl(clientProps);
+  public ClientInfo getClientInfo() {
+    return new ClientInfoImpl(clientProps);
   }
 
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectionInfoFactory.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
similarity index 82%
rename from core/src/main/java/org/apache/accumulo/core/client/impl/ConnectionInfoFactory.java
rename to core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
index 0bbde61..eb2cfd4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectionInfoFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoFactory.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Durability;
 import org.apache.accumulo.core.client.Instance;
@@ -29,32 +29,32 @@ import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.conf.ClientProperty;
 
 /**
- * Creates internal objects using {@link ConnectionInfo}
+ * Creates internal objects using {@link ClientInfo}
  */
-public class ConnectionInfoFactory {
+public class ClientInfoFactory {
 
-  public static String getString(ConnectionInfo info, ClientProperty property) {
+  public static String getString(ClientInfo info, ClientProperty property) {
     return property.getValue(info.getProperties());
   }
 
-  public static Long getLong(ConnectionInfo info, ClientProperty property) {
+  public static Long getLong(ClientInfo info, ClientProperty property) {
     return property.getLong(info.getProperties());
   }
 
-  public static Connector getConnector(ConnectionInfo info)
+  public static Connector getConnector(ClientInfo info)
       throws AccumuloSecurityException, AccumuloException {
     return new ConnectorImpl(new ClientContext(info));
   }
 
-  public static Instance getInstance(ConnectionInfo info) {
+  public static Instance getInstance(ClientInfo info) {
     return new ZooKeeperInstance(ClientConfConverter.toClientConf(info.getProperties()));
   }
 
-  public static Credentials getCredentials(ConnectionInfo info) {
+  public static Credentials getCredentials(ClientInfo info) {
     return new Credentials(info.getPrincipal(), info.getAuthenticationToken());
   }
 
-  public static BatchWriterConfig getBatchWriterConfig(ConnectionInfo info) {
+  public static BatchWriterConfig getBatchWriterConfig(ClientInfo info) {
     BatchWriterConfig batchWriterConfig = new BatchWriterConfig();
     Long maxMemory = getLong(info, ClientProperty.BATCH_WRITER_MAX_MEMORY_BYTES);
     if (maxMemory != null) {
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectionInfoImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoImpl.java
similarity index 92%
rename from core/src/main/java/org/apache/accumulo/core/client/impl/ConnectionInfoImpl.java
rename to core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoImpl.java
index 2df5df3..752f09f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectionInfoImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ClientInfoImpl.java
@@ -18,15 +18,15 @@ package org.apache.accumulo.core.client.impl;
 
 import java.util.Properties;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.conf.ClientProperty;
 
-public class ConnectionInfoImpl implements ConnectionInfo {
+public class ClientInfoImpl implements ClientInfo {
 
   private Properties properties;
 
-  public ConnectionInfoImpl(Properties properties) {
+  public ClientInfoImpl(Properties properties) {
     this.properties = properties;
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
index 38e73c8..96954b1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
@@ -30,9 +30,9 @@ import org.apache.accumulo.core.client.BatchDeleter;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.ConditionalWriter;
 import org.apache.accumulo.core.client.ConditionalWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -235,24 +235,25 @@ public class ConnectorImpl extends Connector {
   }
 
   @Override
-  public ConnectionInfo info() {
-    return this.context.getConnectionInfo();
+  public ClientInfo info() {
+    return this.context.getClientInfo();
   }
 
   public static class ConnectorBuilderImpl
-      implements InstanceArgs, PropertyOptions, ConnectionInfoOptions, AuthenticationArgs,
+      implements InstanceArgs, PropertyOptions, ClientInfoOptions, AuthenticationArgs,
       ConnectionOptions, SslOptions, SaslOptions, ConnectorFactory, FromOptions {
 
     private Properties properties = new Properties();
 
     @Override
     public Connector build() throws AccumuloException, AccumuloSecurityException {
-      return ConnectionInfoFactory.getConnector(new ConnectionInfoImpl(properties));
+      return org.apache.accumulo.core.client.impl.ClientInfoFactory
+          .getConnector(new ClientInfoImpl(properties));
     }
 
     @Override
-    public ConnectionInfo info() {
-      return new ConnectionInfoImpl(properties);
+    public ClientInfo info() {
+      return new ClientInfoImpl(properties);
     }
 
     @Override
@@ -379,8 +380,8 @@ public class ConnectorImpl extends Connector {
     }
 
     @Override
-    public FromOptions usingConnectionInfo(ConnectionInfo connectionInfo) {
-      this.properties = connectionInfo.getProperties();
+    public FromOptions usingClientInfo(ClientInfo clientInfo) {
+      this.properties = clientInfo.getProperties();
       return this;
     }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
index c00318a..7966ae7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
@@ -23,9 +23,9 @@ import org.apache.accumulo.core.client.BatchDeleter;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.ConditionalWriter;
 import org.apache.accumulo.core.client.ConditionalWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -189,7 +189,7 @@ public class MockConnector extends Connector {
   }
 
   @Override
-  public ConnectionInfo info() {
+  public ClientInfo info() {
     throw new UnsupportedOperationException();
   }
 }
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
index 4a99a74..41545f3 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+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.AccumuloConfiguration;
@@ -55,7 +55,7 @@ public interface AccumuloCluster {
   /**
    * Get the client configuration for the cluster
    *
-   * @deprecated since 2.0.0, replaced by {{@link #getConnectionInfo()}}
+   * @deprecated since 2.0.0, replaced by {{@link #getClientInfo()}}
    */
   @Deprecated
   org.apache.accumulo.core.client.ClientConfiguration getClientConfig();
@@ -63,7 +63,7 @@ public interface AccumuloCluster {
   /**
    * @return Connection Info for cluster
    */
-  ConnectionInfo getConnectionInfo();
+  ClientInfo getClientInfo();
 
   /**
    * Get server side config derived from accumulo-site.xml
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
index 67b9088..c82ab3b 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.cluster.AccumuloCluster;
 import org.apache.accumulo.cluster.ClusterUser;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.impl.ClientConfConverter;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
@@ -56,14 +56,14 @@ public class StandaloneAccumuloCluster implements AccumuloCluster {
       .unmodifiableList(Arrays.asList(ServerType.MASTER, ServerType.TABLET_SERVER,
           ServerType.TRACER, ServerType.GARBAGE_COLLECTOR, ServerType.MONITOR));
 
-  private ConnectionInfo info;
+  private ClientInfo info;
   private String accumuloHome, clientAccumuloConfDir, serverAccumuloConfDir, hadoopConfDir;
   private Path tmp;
   private List<ClusterUser> users;
   private String clientCmdPrefix;
   private String serverCmdPrefix;
 
-  public StandaloneAccumuloCluster(ConnectionInfo info, Path tmp, List<ClusterUser> users) {
+  public StandaloneAccumuloCluster(ClientInfo info, Path tmp, List<ClusterUser> users) {
     this.info = info;
     this.tmp = tmp;
     this.users = users;
@@ -139,7 +139,7 @@ public class StandaloneAccumuloCluster implements AccumuloCluster {
   }
 
   @Override
-  public ConnectionInfo getConnectionInfo() {
+  public ClientInfo getClientInfo() {
     return info;
   }
 
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index ba8879c..60448a0 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -22,7 +22,7 @@ import java.util.Set;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.util.Pair;
@@ -122,7 +122,7 @@ public class MiniAccumuloCluster {
 
   /**
    * @since 1.6.0
-   * @deprecated since 2.0.0, replaced by {{@link #getConnectionInfo()}}
+   * @deprecated since 2.0.0, replaced by {{@link #getClientInfo()}}
    */
   @Deprecated
   public org.apache.accumulo.core.client.ClientConfiguration getClientConfig() {
@@ -133,7 +133,7 @@ public class MiniAccumuloCluster {
    * @return Connection info for cluster
    * @since 2.0.0
    */
-  public ConnectionInfo getConnectionInfo() {
-    return impl.getConnectionInfo();
+  public ClientInfo getClientInfo() {
+    return impl.getClientInfo();
   }
 }
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 2180fac..5e1cab9 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -56,7 +56,7 @@ import org.apache.accumulo.cluster.AccumuloCluster;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
@@ -783,7 +783,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   }
 
   @Override
-  public ConnectionInfo getConnectionInfo() {
+  public ClientInfo getClientInfo() {
     return Connector.builder().forInstance(getInstanceName(), getZooKeepers())
         .usingPassword(config.getRootUserName(), config.getRootPassword()).info();
   }
@@ -834,7 +834,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
         Instance instance = new ZooKeeperInstance(getClientConfig());
         ClientContext context = new ClientContext(instance,
             new Credentials("root", new PasswordToken("unchecked")),
-            getConnectionInfo().getProperties());
+            getClientInfo().getProperties());
         client = MasterClient.getConnectionWithRetry(context);
         return client.getMasterStats(Tracer.traceInfo(), context.rpcCreds());
       } catch (ThriftSecurityException exception) {
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 4b544ff..1f21ad8 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -317,8 +317,8 @@ public class Shell extends ShellOptions implements KeywordExecutable {
 
     Properties props = options.getClientProperties();
     String password = options.getPassword();
-    if (password == null && props.containsKey(ClientProperty.AUTH_TOKEN.getKey()) &&
-        user.equals(ClientProperty.AUTH_PRINCIPAL.getValue(props))) {
+    if (password == null && props.containsKey(ClientProperty.AUTH_TOKEN.getKey())
+        && user.equals(ClientProperty.AUTH_PRINCIPAL.getValue(props))) {
       token = ClientProperty.getAuthenticationToken(props);
     }
     if (token == null) {
diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
index 42c1d4c..2723578 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.cluster.ClusterControl;
 import org.apache.accumulo.cluster.ClusterUser;
 import org.apache.accumulo.cluster.ClusterUsers;
 import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.admin.SecurityOperations;
 import org.apache.accumulo.core.client.admin.TableOperations;
@@ -134,7 +134,7 @@ public abstract class AccumuloClusterHarness extends AccumuloITBase
           (StandaloneAccumuloClusterConfiguration) clusterConf;
         // @formatter:on
         StandaloneAccumuloCluster standaloneCluster = new StandaloneAccumuloCluster(
-            cluster.getConnectionInfo(), conf.getTmpDirectory(), conf.getUsers());
+            cluster.getClientInfo(), conf.getTmpDirectory(), conf.getUsers());
         // If these are provided in the configuration, pass them into the cluster
         standaloneCluster.setAccumuloHome(conf.getAccumuloHome());
         standaloneCluster.setClientAccumuloConfDir(conf.getClientAccumuloConfDir());
@@ -265,14 +265,14 @@ public abstract class AccumuloClusterHarness extends AccumuloITBase
     return clusterConf.getAdminPrincipal();
   }
 
-  public static ConnectionInfo getConnectionInfo() {
+  public static ClientInfo getClientInfo() {
     checkState(initialized);
-    return getCluster().getConnectionInfo();
+    return getCluster().getClientInfo();
   }
 
   public static boolean saslEnabled() {
     if (initialized) {
-      return getConnectionInfo().saslEnabled();
+      return getClientInfo().saslEnabled();
     }
     return false;
   }
diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
index b42d536..06ed9a4 100644
--- a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
+++ b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.cluster.ClusterUser;
-import org.apache.accumulo.core.client.ConnectionInfo;
+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.client.security.tokens.KerberosToken;
@@ -89,7 +89,7 @@ public class StandaloneAccumuloClusterConfiguration extends AccumuloClusterPrope
 
   private Map<String,String> conf;
   private String serverUser;
-  private ConnectionInfo connectionInfo;
+  private ClientInfo clientInfo;
   private List<ClusterUser> clusterUsers;
   private File clientPropsFile;
 
@@ -101,7 +101,7 @@ public class StandaloneAccumuloClusterConfiguration extends AccumuloClusterPrope
 
     this.conf = getConfiguration(type);
     this.clientPropsFile = clientPropsFile;
-    connectionInfo = Connector.builder().forInstance(getInstanceName(), getZooKeepers())
+    clientInfo = Connector.builder().forInstance(getInstanceName(), getZooKeepers())
         .usingToken(getAdminPrincipal(), getAdminToken()).info();
 
     // The user Accumulo is running as
@@ -143,8 +143,8 @@ public class StandaloneAccumuloClusterConfiguration extends AccumuloClusterPrope
     return principal;
   }
 
-  public ConnectionInfo getConnectionInfo() {
-    return connectionInfo;
+  public ClientInfo getClientInfo() {
+    return clientInfo;
   }
 
   public String getPassword() {
diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index eafe496..aef3ce3 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1522,7 +1522,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
     String tableName = getUniqueNames(1)[0];
     conn.tableOperations().create(tableName);
 
-    DistributedTrace.enable("localhost", "testTrace", mac.getConnectionInfo().getProperties());
+    DistributedTrace.enable("localhost", "testTrace", mac.getClientInfo().getProperties());
     sleepUninterruptibly(1, TimeUnit.SECONDS);
     Span root = Trace.on("traceTest");
     try (ConditionalWriter cw = conn.createConditionalWriter(tableName,
diff --git a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
index 0ce7d25..e1c103d 100644
--- a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
@@ -83,7 +83,7 @@ public class DetectDeadTabletServersIT extends ConfigurableMacBase {
   }
 
   private MasterMonitorInfo getStats(Connector c) throws Exception {
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     Client client = null;
     while (true) {
       try {
diff --git a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index ac35538..c49848b 100644
--- a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -70,7 +70,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase {
   public void test() throws Exception {
     // make some tablets, spread 'em around
     Connector c = getConnector();
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     String table = this.getUniqueNames(1)[0];
     c.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE);
     c.securityOperations().grantTablePermission("root", RootTable.NAME, TablePermission.WRITE);
diff --git a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
index f085b57..9d52a56 100644
--- a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
@@ -43,7 +43,7 @@ public class MetaConstraintRetryIT extends AccumuloClusterHarness {
     getConnector().securityOperations().grantTablePermission(getAdminPrincipal(),
         MetadataTable.NAME, TablePermission.WRITE);
 
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     Writer w = new Writer(context, MetadataTable.ID);
     KeyExtent extent = new KeyExtent(Table.ID.of("5"), null, null);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
index 3d022b7..1a59281 100644
--- a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
@@ -62,7 +62,7 @@ public class MultiTableBatchWriterIT extends AccumuloClusterHarness {
   }
 
   public MultiTableBatchWriter getMultiTableBatchWriter() {
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     return new MultiTableBatchWriterImpl(context, new BatchWriterConfig());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index 410799b..73bee7d 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -44,7 +44,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.Scanner;
@@ -161,8 +161,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
 
     TestShell(String user, String rootPass, String instanceName, String zookeepers, File configFile)
         throws IOException {
-      ConnectionInfo info = Connector.builder().usingProperties(configFile.getAbsolutePath())
-          .info();
+      ClientInfo info = Connector.builder().usingProperties(configFile.getAbsolutePath()).info();
       // start the shell
       output = new TestOutputStream();
       input = new StringInputStream();
@@ -352,7 +351,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
     ts.exec("exporttable -t " + table + " " + exportUri, true);
     DistCp cp = newDistCp(new Configuration(false));
     String import_ = "file://" + new File(rootPath, "ShellServerIT.import");
-    if (getCluster().getConnectionInfo().saslEnabled()) {
+    if (getCluster().getClientInfo().saslEnabled()) {
       // DistCp bugs out trying to get a fs delegation token to perform the cp. Just copy it
       // ourselves by hand.
       FileSystem fs = getCluster().getFileSystem();
diff --git a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
index c9035ca..8f24560 100644
--- a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
@@ -73,7 +73,7 @@ public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacBase {
 
     log.info("Start a distributed trace span");
 
-    DistributedTrace.enable("localhost", "testTrace", getConnectionInfo().getProperties());
+    DistributedTrace.enable("localhost", "testTrace", getClientInfo().getProperties());
     Span root = Trace.on("traceTest");
     BatchWriter bw = conn.createBatchWriter(tableName, null);
     Mutation m = new Mutation("m");
diff --git a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
index e8dee5e..4628f41 100644
--- a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
@@ -53,7 +53,7 @@ public class TransportCachingIT extends AccumuloClusterHarness {
   public void testCachedTransport() {
     Connector conn = getConnector();
     Instance instance = conn.getInstance();
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     long rpcTimeout = ConfigurationTypeHelper
         .getTimeInMillis(Property.GENERAL_RPC_TIMEOUT.getDefaultValue());
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index 6f6a4bc..29935cf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -101,7 +101,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase {
   }
 
   private void checkBalance(Connector c) throws Exception {
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
 
     MasterMonitorInfo stats = null;
     int unassignedTablets = 1;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index 9c21971..8db550f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -127,8 +127,8 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
 
     TestIngest.Opts opts = new TestIngest.Opts();
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    opts.setConnectionInfo(getConnectionInfo());
-    vopts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
+    vopts.setClientInfo(getClientInfo());
     vopts.rows = opts.rows = 200000;
     opts.setTableName(TEST_TABLE);
     TestIngest.ingest(connector, opts, new BatchWriterOpts());
@@ -153,7 +153,7 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
       Instance instance = getConnector().getInstance();
       while (true) {
         try {
-          client = MasterClient.getConnectionWithRetry(new ClientContext(getConnectionInfo()));
+          client = MasterClient.getConnectionWithRetry(new ClientContext(getClientInfo()));
           stats = client.getMasterStats(Tracer.traceInfo(), creds.toThrift(instance));
           break;
         } catch (ThriftSecurityException exception) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index 2df258a..a642198 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -22,7 +22,7 @@ import org.apache.accumulo.core.cli.BatchWriterOpts;
 import org.apache.accumulo.core.cli.ScannerOpts;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.CachedConfiguration;
@@ -65,20 +65,20 @@ public class BulkIT extends AccumuloClusterHarness {
 
   @Test
   public void test() throws Exception {
-    runTest(getConnector(), getConnectionInfo(), getCluster().getFileSystem(),
+    runTest(getConnector(), getClientInfo(), getCluster().getFileSystem(),
         getCluster().getTemporaryPath(), getUniqueNames(1)[0], this.getClass().getName(),
         testName.getMethodName(), false);
   }
 
   @Test
   public void testOld() throws Exception {
-    runTest(getConnector(), getConnectionInfo(), getCluster().getFileSystem(),
+    runTest(getConnector(), getClientInfo(), getCluster().getFileSystem(),
         getCluster().getTemporaryPath(), getUniqueNames(1)[0], this.getClass().getName(),
         testName.getMethodName(), true);
   }
 
-  static void runTest(Connector c, ConnectionInfo info, FileSystem fs, Path basePath,
-      String tableName, String filePrefix, String dirSuffix, boolean useOld) throws Exception {
+  static void runTest(Connector c, ClientInfo info, FileSystem fs, Path basePath, String tableName,
+      String filePrefix, String dirSuffix, boolean useOld) throws Exception {
     c.tableOperations().create(tableName);
 
     Path base = new Path(basePath, "testBulkFail_" + dirSuffix);
@@ -95,7 +95,7 @@ public class BulkIT extends AccumuloClusterHarness {
     opts.rows = N;
     opts.cols = 1;
     opts.setTableName(tableName);
-    opts.setConnectionInfo(info);
+    opts.setClientInfo(info);
     opts.conf = new Configuration(false);
     opts.fs = fs;
     String fileFormat = filePrefix + "rf%02d";
@@ -114,7 +114,7 @@ public class BulkIT extends AccumuloClusterHarness {
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     vopts.setTableName(tableName);
     vopts.random = 56;
-    vopts.setConnectionInfo(info);
+    vopts.setClientInfo(info);
     for (int i = 0; i < COUNT; i++) {
       vopts.startRow = i * N;
       vopts.rows = N;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index 4a4da74..f2852fa 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -119,7 +119,7 @@ public class BulkSplitOptimizationIT extends AccumuloClusterHarness {
     opts.setTableName(tableName);
 
     AuthenticationToken adminToken = getAdminToken();
-    opts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
     VerifyIngest.verifyIngest(c, opts, new ScannerOpts());
 
     // ensure each tablet does not have all map files, should be ~2.5 files per tablet
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 795a0fd..706205e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -68,8 +68,8 @@ public class ChaoticBalancerIT extends AccumuloClusterHarness {
     vopts.rows = opts.rows = 20000;
     opts.setTableName(tableName);
     vopts.setTableName(tableName);
-    opts.setConnectionInfo(getConnectionInfo());
-    vopts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
+    vopts.setClientInfo(getClientInfo());
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     c.tableOperations().flush(tableName, null, null, true);
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 8815838..fa9dc2f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -135,7 +135,7 @@ public class CompactionIT extends AccumuloClusterHarness {
               opts.dataSize = 50;
               opts.cols = 1;
               opts.setTableName(tableName);
-              opts.setConnectionInfo(getConnectionInfo());
+              opts.setClientInfo(getClientInfo());
               VerifyIngest.verifyIngest(c, opts, new ScannerOpts());
             } catch (Exception ex) {
               log.warn("Got exception verifying data", ex);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
index 4258635..089ecb0 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.ClientProperty;
@@ -190,7 +190,7 @@ public class ConfigurableMacBase extends AccumuloITBase {
     return getCluster().getConnector("root", new PasswordToken(ROOT_PASSWORD));
   }
 
-  protected ConnectionInfo getConnectionInfo() {
+  protected ClientInfo getClientInfo() {
     return Connector.builder()
         .forInstance(getCluster().getInstanceName(), getCluster().getZooKeepers())
         .usingPassword("root", ROOT_PASSWORD).info();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConnectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConnectorIT.java
index bcbbcc6..3ab36f6 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConnectorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConnectorIT.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.test.functional;
 
 import java.util.Properties;
 
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.ClientProperty;
@@ -44,7 +44,7 @@ public class ConnectorIT extends AccumuloClusterHarness {
     Assert.assertEquals(zookeepers, conn.getInstance().getZooKeepers());
     Assert.assertEquals(user, conn.whoami());
 
-    ConnectionInfo info = Connector.builder().forInstance(instanceName, zookeepers)
+    ClientInfo info = Connector.builder().forInstance(instanceName, zookeepers)
         .usingPassword(user, password).info();
     Assert.assertEquals(instanceName, info.getInstanceName());
     Assert.assertEquals(zookeepers, info.getZooKeepers());
@@ -66,7 +66,7 @@ public class ConnectorIT extends AccumuloClusterHarness {
     final String password2 = "testpassword2";
     c.securityOperations().createLocalUser(user2, new PasswordToken(password2));
 
-    Connector conn2 = Connector.builder().usingConnectionInfo(conn.info())
+    Connector conn2 = Connector.builder().usingClientInfo(conn.info())
         .usingToken(user2, new PasswordToken(password2)).build();
     Assert.assertEquals(instanceName, conn2.getInstance().getInstanceName());
     Assert.assertEquals(zookeepers, conn2.getInstance().getZooKeepers());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
index 9e91f87..806d8b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
@@ -68,8 +68,8 @@ public class DeleteIT extends AccumuloClusterHarness {
     vopts.random = opts.random = 56;
 
     assertTrue("Expected one of password or keytab", null != password || null != keytab);
-    opts.setConnectionInfo(getConnectionInfo());
-    vopts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
+    vopts.setClientInfo(getClientInfo());
 
     BatchWriterOpts BWOPTS = new BatchWriterOpts();
     TestIngest.ingest(c, opts, BWOPTS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
index 56a412c..18dc576 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
@@ -87,7 +87,7 @@ public class DynamicThreadPoolsIT extends AccumuloClusterHarness {
     opts.rows = 500 * 1000;
     opts.createTable = true;
     opts.setTableName(firstTable);
-    opts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     c.tableOperations().flush(firstTable, null, null, true);
     for (int i = 1; i < tables.length; i++)
@@ -102,7 +102,7 @@ public class DynamicThreadPoolsIT extends AccumuloClusterHarness {
       MasterMonitorInfo stats = null;
       while (true) {
         try {
-          client = MasterClient.getConnectionWithRetry(new ClientContext(getConnectionInfo()));
+          client = MasterClient.getConnectionWithRetry(new ClientContext(getClientInfo()));
           stats = client.getMasterStats(Tracer.traceInfo(), creds.toThrift(c.getInstance()));
           break;
         } catch (ThriftNotActiveServiceException e) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
index f851e18..f2f09a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java
@@ -52,7 +52,7 @@ public class FateStarvationIT extends AccumuloClusterHarness {
     opts.rows = 100000;
     opts.cols = 1;
     opts.setTableName(tableName);
-    opts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
     TestIngest.ingest(c, opts, new BatchWriterOpts());
 
     c.tableOperations().flush(tableName, null, null, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index f95eb6c..f3ad5d2 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -120,8 +120,8 @@ public class GarbageCollectorIT extends ConfigurableMacBase {
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     vopts.rows = opts.rows = 10000;
     vopts.cols = opts.cols = 1;
-    opts.setConnectionInfo(getConnectionInfo());
-    vopts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
+    vopts.setClientInfo(getClientInfo());
     TestIngest.ingest(c, cluster.getFileSystem(), opts, new BatchWriterOpts());
     c.tableOperations().compact("test_ingest", null, null, true, true);
     int before = countFiles();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index dd8175c..435d2ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -169,7 +169,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase {
         assertEquals(0, ingest.waitFor());
         VerifyIngest.Opts vopts = new VerifyIngest.Opts();
         vopts.rows = rows;
-        vopts.setConnectionInfo(getConnectionInfo());
+        vopts.setClientInfo(getClientInfo());
         VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
       } else {
         sleepUninterruptibly(5, TimeUnit.SECONDS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
index b9f757d..5676ed7 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
@@ -90,7 +90,7 @@ public class MasterAssignmentIT extends AccumuloClusterHarness {
 
   private TabletLocationState getTabletLocationState(Connector c, String tableId)
       throws FileNotFoundException, ConfigurationException {
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     try (MetaDataTableScanner s = new MetaDataTableScanner(context,
         new Range(KeyExtent.getMetadataEntry(Table.ID.of(tableId), null)))) {
       return s.next();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
index bc43349..28bc628 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
@@ -52,7 +52,7 @@ public class MasterFailoverIT extends AccumuloClusterHarness {
     c.tableOperations().create(names[0]);
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.setTableName(names[0]);
-    opts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
     TestIngest.ingest(c, opts, new BatchWriterOpts());
 
     ClusterControl control = cluster.getClusterControl();
@@ -63,7 +63,7 @@ public class MasterFailoverIT extends AccumuloClusterHarness {
     c.tableOperations().rename(names[0], names[1]);
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     vopts.setTableName(names[1]);
-    vopts.setConnectionInfo(getConnectionInfo());
+    vopts.setClientInfo(getClientInfo());
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
index 51ab5c4..95dd90b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java
@@ -105,7 +105,7 @@ public class MaxOpenIT extends AccumuloClusterHarness {
       opts.cols = 1;
       opts.random = i;
       opts.setTableName(tableName);
-      opts.setConnectionInfo(getConnectionInfo());
+      opts.setClientInfo(getClientInfo());
       TestIngest.ingest(c, opts, new BatchWriterOpts());
 
       c.tableOperations().flush(tableName, null, null, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
index 8f61eeb..6fc08b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
@@ -89,7 +89,7 @@ public class MetadataMaxFilesIT extends ConfigurableMacBase {
       MasterMonitorInfo stats = null;
       Client client = null;
       try {
-        ClientContext context = new ClientContext(getConnectionInfo());
+        ClientContext context = new ClientContext(getClientInfo());
         client = MasterClient.getConnectionWithRetry(context);
         log.info("Fetching stats");
         stats = client.getMasterStats(Tracer.traceInfo(), context.rpcCreds());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index a5d7ee4..e6d1c04 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -63,7 +63,7 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -136,8 +136,8 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     cluster.getClusterControl().startAllServers(ServerType.MONITOR);
     Connector connector = getConnector();
     String tableName = getUniqueNames(1)[0];
-    ingest(connector, getConnectionInfo(), ROWS, COLS, 50, 0, tableName);
-    verify(connector, getConnectionInfo(), ROWS, COLS, 50, 0, tableName);
+    ingest(connector, getClientInfo(), ROWS, COLS, 50, 0, tableName);
+    verify(connector, getClientInfo(), ROWS, COLS, 50, 0, tableName);
     String monitorLocation = null;
     while (null == monitorLocation) {
       monitorLocation = MonitorUtil.getLocation(getConnector().getInstance());
@@ -200,12 +200,12 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     cluster.start();
   }
 
-  public static void ingest(Connector connector, ConnectionInfo info, int rows, int cols, int width,
+  public static void ingest(Connector connector, ClientInfo info, int rows, int cols, int width,
       int offset, String tableName) throws Exception {
     ingest(connector, info, rows, cols, width, offset, COLF, tableName);
   }
 
-  public static void ingest(Connector connector, ConnectionInfo info, int rows, int cols, int width,
+  public static void ingest(Connector connector, ClientInfo info, int rows, int cols, int width,
       int offset, String colf, String tableName) throws Exception {
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.rows = rows;
@@ -215,18 +215,18 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     opts.columnFamily = colf;
     opts.createTable = true;
     opts.setTableName(tableName);
-    opts.setConnectionInfo(info);
+    opts.setClientInfo(info);
 
     TestIngest.ingest(connector, opts, new BatchWriterOpts());
   }
 
-  public static void verify(Connector connector, ConnectionInfo info, int rows, int cols, int width,
+  public static void verify(Connector connector, ClientInfo info, int rows, int cols, int width,
       int offset, String tableName) throws Exception {
     verify(connector, info, rows, cols, width, offset, COLF, tableName);
   }
 
-  private static void verify(Connector connector, ConnectionInfo info, int rows, int cols,
-      int width, int offset, String colf, String tableName) throws Exception {
+  private static void verify(Connector connector, ClientInfo info, int rows, int cols, int width,
+      int offset, String colf, String tableName) throws Exception {
     ScannerOpts scannerOpts = new ScannerOpts();
     VerifyIngest.Opts opts = new VerifyIngest.Opts();
     opts.rows = rows;
@@ -235,7 +235,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     opts.startRow = offset;
     opts.columnFamily = colf;
     opts.setTableName(tableName);
-    opts.setConnectionInfo(info);
+    opts.setClientInfo(info);
 
     VerifyIngest.verifyIngest(connector, opts, scannerOpts);
   }
@@ -320,8 +320,8 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     // write a few large values
     Connector connector = getConnector();
     String table = getUniqueNames(1)[0];
-    ingest(connector, getConnectionInfo(), 2, 1, 500000, 0, table);
-    verify(connector, getConnectionInfo(), 2, 1, 500000, 0, table);
+    ingest(connector, getClientInfo(), 2, 1, 500000, 0, table);
+    verify(connector, getClientInfo(), 2, 1, 500000, 0, table);
   }
 
   @Test
@@ -335,7 +335,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
   static void interleaveTest(final Connector connector, final String tableName) throws Exception {
     final AtomicBoolean fail = new AtomicBoolean(false);
     final int CHUNKSIZE = ROWS / 10;
-    ingest(connector, getConnectionInfo(), CHUNKSIZE, 1, 50, 0, tableName);
+    ingest(connector, getClientInfo(), CHUNKSIZE, 1, 50, 0, tableName);
     int i;
     for (i = 0; i < ROWS; i += CHUNKSIZE) {
       final int start = i;
@@ -343,18 +343,18 @@ public class ReadWriteIT extends AccumuloClusterHarness {
         @Override
         public void run() {
           try {
-            verify(connector, getConnectionInfo(), CHUNKSIZE, 1, 50, start, tableName);
+            verify(connector, getClientInfo(), CHUNKSIZE, 1, 50, start, tableName);
           } catch (Exception ex) {
             fail.set(true);
           }
         }
       };
       verify.start();
-      ingest(connector, getConnectionInfo(), CHUNKSIZE, 1, 50, i + CHUNKSIZE, tableName);
+      ingest(connector, getClientInfo(), CHUNKSIZE, 1, 50, i + CHUNKSIZE, tableName);
       verify.join();
       assertFalse(fail.get());
     }
-    verify(connector, getConnectionInfo(), CHUNKSIZE, 1, 50, i, tableName);
+    verify(connector, getClientInfo(), CHUNKSIZE, 1, 50, i, tableName);
   }
 
   public static Text t(String s) {
@@ -375,7 +375,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     connector.tableOperations().create(tableName);
     connector.tableOperations().setProperty(tableName, "table.group.g1", "colf");
     connector.tableOperations().setProperty(tableName, "table.groups.enabled", "g1");
-    ingest(connector, getConnectionInfo(), 2000, 1, 50, 0, tableName);
+    ingest(connector, getClientInfo(), 2000, 1, 50, 0, tableName);
     connector.tableOperations().compact(tableName, null, null, true, true);
     BatchWriter bw = connector.createBatchWriter(tableName, new BatchWriterConfig());
     bw.addMutation(m("zzzzzzzzzzz", "colf2", "cq", "value"));
@@ -430,8 +430,8 @@ public class ReadWriteIT extends AccumuloClusterHarness {
 
   private void verifyLocalityGroupsInRFile(final Connector connector, final String tableName)
       throws Exception, AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    ingest(connector, getConnectionInfo(), 2000, 1, 50, 0, tableName);
-    verify(connector, getConnectionInfo(), 2000, 1, 50, 0, tableName);
+    ingest(connector, getClientInfo(), 2000, 1, 50, 0, tableName);
+    verify(connector, getClientInfo(), 2000, 1, 50, 0, tableName);
     connector.tableOperations().flush(tableName, null, null, true);
     try (BatchScanner bscanner = connector.createBatchScanner(MetadataTable.NAME,
         Authorizations.EMPTY, 1)) {
@@ -480,9 +480,9 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     int i = 0;
     for (String cfg : config) {
       to.setLocalityGroups(table, getGroups(cfg));
-      ingest(connector, getConnectionInfo(), ROWS * (i + 1), 1, 50, ROWS * i, table);
+      ingest(connector, getClientInfo(), ROWS * (i + 1), 1, 50, ROWS * i, table);
       to.flush(table, null, null, true);
-      verify(connector, getConnectionInfo(), 0, 1, 50, ROWS * (i + 1), table);
+      verify(connector, getClientInfo(), 0, 1, 50, ROWS * (i + 1), table);
       i++;
     }
     to.delete(table);
@@ -490,12 +490,12 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     config = new String[] {"lg1:colf", null, "lg1:colf,xyz", "lg1:colf;lg2:colf",};
     i = 1;
     for (String cfg : config) {
-      ingest(connector, getConnectionInfo(), ROWS * i, 1, 50, 0, table);
-      ingest(connector, getConnectionInfo(), ROWS * i, 1, 50, 0, "xyz", table);
+      ingest(connector, getClientInfo(), ROWS * i, 1, 50, 0, table);
+      ingest(connector, getClientInfo(), ROWS * i, 1, 50, 0, "xyz", table);
       to.setLocalityGroups(table, getGroups(cfg));
       to.flush(table, null, null, true);
-      verify(connector, getConnectionInfo(), ROWS * i, 1, 50, 0, table);
-      verify(connector, getConnectionInfo(), ROWS * i, 1, 50, 0, "xyz", table);
+      verify(connector, getClientInfo(), ROWS * i, 1, 50, 0, table);
+      verify(connector, getClientInfo(), ROWS * i, 1, 50, 0, "xyz", table);
       i++;
     }
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java
index 946619e..a9fdd6b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java
@@ -71,8 +71,8 @@ public class RecoveryWithEmptyRFileIT extends ConfigurableMacBase {
         + " underlying rfile with an empty one and verify we can scan.");
     Connector connector = getConnector();
     String tableName = getUniqueNames(1)[0];
-    ReadWriteIT.ingest(connector, getConnectionInfo(), ROWS, COLS, 50, 0, tableName);
-    ReadWriteIT.verify(connector, getConnectionInfo(), ROWS, COLS, 50, 0, tableName);
+    ReadWriteIT.ingest(connector, getClientInfo(), ROWS, COLS, 50, 0, tableName);
+    ReadWriteIT.verify(connector, getClientInfo(), ROWS, COLS, 50, 0, tableName);
 
     connector.tableOperations().flush(tableName, null, null, true);
     connector.tableOperations().offline(tableName, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java
index 654e6f8..56df73a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java
@@ -41,14 +41,14 @@ public class RenameIT extends AccumuloClusterHarness {
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.createTable = true;
     opts.setTableName(name1);
-    opts.setConnectionInfo(cluster.getConnectionInfo());
+    opts.setClientInfo(cluster.getClientInfo());
 
     Connector c = getConnector();
     TestIngest.ingest(c, opts, bwOpts);
     c.tableOperations().rename(name1, name2);
     TestIngest.ingest(c, opts, bwOpts);
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    vopts.setConnectionInfo(cluster.getConnectionInfo());
+    vopts.setClientInfo(cluster.getClientInfo());
     vopts.setTableName(name2);
     VerifyIngest.verifyIngest(c, vopts, scanOpts);
     c.tableOperations().delete(name1);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
index a6ead9b..4733556 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -126,7 +126,7 @@ public class RestartIT extends AccumuloClusterHarness {
     } else {
       throw new RuntimeException("Unknown token");
     }
-    OPTS.setConnectionInfo(getConnectionInfo());
+    OPTS.setClientInfo(getClientInfo());
 
     Future<Integer> ret = svc.submit(() -> {
       try {
@@ -150,8 +150,8 @@ public class RestartIT extends AccumuloClusterHarness {
     c.tableOperations().create(tableName);
     OPTS.setTableName(tableName);
     VOPTS.setTableName(tableName);
-    OPTS.setConnectionInfo(getConnectionInfo());
-    VOPTS.setConnectionInfo(getConnectionInfo());
+    OPTS.setClientInfo(getClientInfo());
+    VOPTS.setClientInfo(getClientInfo());
     TestIngest.ingest(c, OPTS, BWOPTS);
     ClusterControl control = getCluster().getClusterControl();
 
@@ -217,8 +217,8 @@ public class RestartIT extends AccumuloClusterHarness {
     } else {
       throw new RuntimeException("Unknown token");
     }
-    OPTS.setConnectionInfo(getConnectionInfo());
-    VOPTS.setConnectionInfo(getConnectionInfo());
+    OPTS.setClientInfo(getClientInfo());
+    VOPTS.setClientInfo(getClientInfo());
 
     Future<Integer> ret = svc.submit(() -> {
       try {
@@ -256,8 +256,8 @@ public class RestartIT extends AccumuloClusterHarness {
     c.tableOperations().create(tableName);
     OPTS.setTableName(tableName);
     VOPTS.setTableName(tableName);
-    OPTS.setConnectionInfo(getConnectionInfo());
-    VOPTS.setConnectionInfo(getConnectionInfo());
+    OPTS.setClientInfo(getClientInfo());
+    VOPTS.setClientInfo(getClientInfo());
     TestIngest.ingest(c, OPTS, BWOPTS);
     VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
     cluster.getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
@@ -286,7 +286,7 @@ public class RestartIT extends AccumuloClusterHarness {
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
     OPTS.setTableName(tableName);
-    OPTS.setConnectionInfo(getConnectionInfo());
+    OPTS.setClientInfo(getClientInfo());
     TestIngest.ingest(c, OPTS, BWOPTS);
     try {
       getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
@@ -301,8 +301,8 @@ public class RestartIT extends AccumuloClusterHarness {
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];
     VOPTS.setTableName(tableName);
-    OPTS.setConnectionInfo(getConnectionInfo());
-    VOPTS.setConnectionInfo(getConnectionInfo());
+    OPTS.setClientInfo(getClientInfo());
+    VOPTS.setClientInfo(getClientInfo());
     c.tableOperations().create(tableName);
     c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
     String splitThreshold = null;
@@ -318,7 +318,7 @@ public class RestartIT extends AccumuloClusterHarness {
           "20K");
       TestIngest.Opts opts = new TestIngest.Opts();
       opts.setTableName(tableName);
-      opts.setConnectionInfo(getConnectionInfo());
+      opts.setClientInfo(getClientInfo());
       TestIngest.ingest(c, opts, BWOPTS);
       c.tableOperations().flush(tableName, null, null, false);
       VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
index e36f5e2..7f3e4dd 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
@@ -135,7 +135,7 @@ public class RestartStressIT extends AccumuloClusterHarness {
     }
     assertEquals(0, retCode.get().intValue());
     VOPTS.setTableName(tableName);
-    VOPTS.setConnectionInfo(getConnectionInfo());
+    VOPTS.setClientInfo(getClientInfo());
     VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index 728603c..9666004 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -73,12 +73,12 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase {
     List<String> tservers = c.instanceOperations().getTabletServers();
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.rows = 50000;
-    opts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     c.tableOperations().flush("test_ingest", null, null, false);
     sleepUninterruptibly(45, TimeUnit.SECONDS);
     Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD));
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
 
     MasterMonitorInfo stats = null;
     int unassignedTablets = 1;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
index 661cfab..b05386a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
@@ -131,12 +131,12 @@ public class SplitIT extends AccumuloClusterHarness {
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     opts.rows = 100000;
     opts.setTableName(table);
-    opts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
 
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     vopts.rows = opts.rows;
     vopts.setTableName(table);
-    vopts.setConnectionInfo(getConnectionInfo());
+    vopts.setClientInfo(getClientInfo());
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
     while (c.tableOperations().listSplits(table).size() < 10) {
       sleepUninterruptibly(15, TimeUnit.SECONDS);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
index f29c6da..d79b65c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
@@ -60,7 +60,7 @@ public class SslIT extends ConfigurableMacBase {
 
   @Test
   public void bulk() throws Exception {
-    BulkIT.runTest(getConnector(), getConnectionInfo(), cluster.getFileSystem(),
+    BulkIT.runTest(getConnector(), getClientInfo(), cluster.getFileSystem(),
         new Path(getCluster().getConfig().getDir().getAbsolutePath(), "tmp"), getUniqueNames(1)[0],
         this.getClass().getName(), testName.getMethodName(), true);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
index 14021f5..f97b614 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
@@ -70,8 +70,8 @@ public class TableIT extends AccumuloClusterHarness {
 
     TestIngest.Opts opts = new TestIngest.Opts();
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    opts.setConnectionInfo(getConnectionInfo());
-    vopts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
+    vopts.setClientInfo(getClientInfo());
     opts.setTableName(tableName);
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     to.flush(tableName, null, null, true);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
index 7df99f3..0ac0e23 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java
@@ -56,8 +56,8 @@ public class WriteAheadLogIT extends AccumuloClusterHarness {
     TestIngest.Opts opts = new TestIngest.Opts();
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     opts.setTableName(tableName);
-    opts.setConnectionInfo(getConnectionInfo());
-    vopts.setConnectionInfo(getConnectionInfo());
+    opts.setClientInfo(getClientInfo());
+    vopts.setClientInfo(getClientInfo());
 
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     vopts.setTableName(tableName);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index bf86907..7186a5f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -55,7 +55,7 @@ public class WriteLotsIT extends AccumuloClusterHarness {
             opts.startRow = index * 10000;
             opts.rows = 10000;
             opts.setTableName(tableName);
-            opts.setConnectionInfo(getConnectionInfo());
+            opts.setClientInfo(getClientInfo());
             BatchWriterOpts bwOpts = new BatchWriterOpts();
             bwOpts.batchMemory = 1024L * 1024;
             bwOpts.batchThreads = 2;
@@ -75,7 +75,7 @@ public class WriteLotsIT extends AccumuloClusterHarness {
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     vopts.rows = 10000 * THREADS;
     vopts.setTableName(tableName);
-    vopts.setConnectionInfo(getConnectionInfo());
+    vopts.setClientInfo(getClientInfo());
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
index 2db6fc3..b85af1a 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloFileOutputFormatIT.java
@@ -150,7 +150,7 @@ public class AccumuloFileOutputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormat(AccumuloInputFormat.class);
 
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
       AccumuloInputFormat.setInputTableName(job, table);
       AccumuloFileOutputFormat.setOutputPath(job, new Path(args[1]));
       AccumuloFileOutputFormat.setSampler(job, SAMPLER_CONFIG);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index d451cb4..d6cb2ca 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -124,7 +124,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormat(AccumuloInputFormat.class);
 
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
       AccumuloInputFormat.setInputTableName(job, table);
       AccumuloInputFormat.setBatchScan(job, batchScan);
       if (sample) {
@@ -219,7 +219,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     Connector connector = getConnector();
     connector.tableOperations().create(table);
 
-    AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+    AccumuloInputFormat.setClientInfo(job, getClientInfo());
     AccumuloInputFormat.setInputTableName(job, table);
     AccumuloInputFormat.setScanAuthorizations(job, auths);
     AccumuloInputFormat.setScanIsolation(job, isolated);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
index be5ad80..d802026 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
@@ -104,7 +104,7 @@ public class AccumuloMultiTableInputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormat(AccumuloInputFormat.class);
 
-      AccumuloMultiTableInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloMultiTableInputFormat.setClientInfo(job, getClientInfo());
 
       InputTableConfig tableConfig1 = new InputTableConfig();
       InputTableConfig tableConfig2 = new InputTableConfig();
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
index e941f7f..3cfd846 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.ConnectionInfo;
+import org.apache.accumulo.core.client.ClientInfo;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.Scanner;
@@ -82,7 +82,7 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase {
     // set the max memory so that we ensure we don't flush on the write.
     batchConfig.setMaxMemory(Long.MAX_VALUE);
     AccumuloOutputFormat outputFormat = new AccumuloOutputFormat();
-    AccumuloOutputFormat.setConnectionInfo(job, getConnectionInfo());
+    AccumuloOutputFormat.setClientInfo(job, getClientInfo());
     AccumuloOutputFormat.setBatchWriterOptions(job, batchConfig);
     RecordWriter<Text,Mutation> writer = outputFormat.getRecordWriter(null, job, "Test", null);
 
@@ -167,10 +167,10 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase {
 
       job.setInputFormat(AccumuloInputFormat.class);
 
-      ConnectionInfo info = Connector.builder().forInstance(instanceName, zooKeepers)
+      ClientInfo info = Connector.builder().forInstance(instanceName, zooKeepers)
           .usingPassword(user, pass).info();
 
-      AccumuloInputFormat.setConnectionInfo(job, info);
+      AccumuloInputFormat.setClientInfo(job, info);
       AccumuloInputFormat.setInputTableName(job, table1);
 
       job.setMapperClass(TestMapper.class);
@@ -180,7 +180,7 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase {
       job.setOutputKeyClass(Text.class);
       job.setOutputValueClass(Mutation.class);
 
-      AccumuloOutputFormat.setConnectionInfo(job, info);
+      AccumuloOutputFormat.setClientInfo(job, info);
       AccumuloOutputFormat.setCreateTables(job, false);
       AccumuloOutputFormat.setDefaultTableName(job, table2);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
index 9d889d7..e183c4a 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloRowInputFormatIT.java
@@ -159,7 +159,7 @@ public class AccumuloRowInputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormat(AccumuloRowInputFormat.class);
 
-      AccumuloRowInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloRowInputFormat.setClientInfo(job, getClientInfo());
       AccumuloRowInputFormat.setInputTableName(job, table);
 
       job.setMapperClass(TestMapper.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
index f07f503..873312a 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
@@ -111,7 +111,7 @@ public class TokenFileIT extends AccumuloClusterHarness {
       job.setInputFormat(AccumuloInputFormat.class);
 
       AccumuloInputFormat.setInputTableName(job, table1);
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
 
       job.setMapperClass(TestMapper.class);
       job.setMapOutputKeyClass(Key.class);
@@ -162,7 +162,7 @@ public class TokenFileIT extends AccumuloClusterHarness {
 
     File tf = folder.newFile("client.properties");
     PrintStream out = new PrintStream(tf);
-    Properties props = getConnectionInfo().getProperties();
+    Properties props = getClientInfo().getProperties();
     for (Object keyObj : props.keySet()) {
       String key = (String) keyObj;
       out.println(key + " = " + props.getProperty(key));
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
index 16a0857..2253573 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloFileOutputFormatIT.java
@@ -163,7 +163,7 @@ public class AccumuloFileOutputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormatClass(AccumuloInputFormat.class);
 
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
       AccumuloInputFormat.setInputTableName(job, table);
       AccumuloFileOutputFormat.setOutputPath(job, new Path(args[1]));
       AccumuloFileOutputFormat.setSampler(job, SAMPLER_CONFIG);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
index 15df6d8..f91a346 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
@@ -102,7 +102,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
     Job job = Job.getInstance();
     AccumuloInputFormat.setInputTableName(job, table);
-    AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+    AccumuloInputFormat.setClientInfo(job, getClientInfo());
 
     // split table
     TreeSet<Text> splitsToAdd = new TreeSet<>();
@@ -282,7 +282,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormatClass(inputFormatClass);
 
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
       AccumuloInputFormat.setInputTableName(job, table);
       AccumuloInputFormat.setBatchScan(job, batchScan);
       if (sample) {
@@ -400,7 +400,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
     Connector connector = getConnector();
     connector.tableOperations().create(table);
 
-    AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+    AccumuloInputFormat.setClientInfo(job, getClientInfo());
     AccumuloInputFormat.setInputTableName(job, table);
     AccumuloInputFormat.setScanAuthorizations(job, auths);
     AccumuloInputFormat.setScanIsolation(job, isolated);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
index ba92da9..e23ef72 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
@@ -97,7 +97,7 @@ public class AccumuloMultiTableInputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormatClass(AccumuloMultiTableInputFormat.class);
 
-      AccumuloMultiTableInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloMultiTableInputFormat.setClientInfo(job, getClientInfo());
 
       InputTableConfig tableConfig1 = new InputTableConfig();
       InputTableConfig tableConfig2 = new InputTableConfig();
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
index 04696e0..5b09a34 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
@@ -93,7 +93,7 @@ public class AccumuloOutputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormatClass(AccumuloInputFormat.class);
 
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
       AccumuloInputFormat.setInputTableName(job, table1);
 
       job.setMapperClass(TestMapper.class);
@@ -103,7 +103,7 @@ public class AccumuloOutputFormatIT extends AccumuloClusterHarness {
       job.setOutputKeyClass(Text.class);
       job.setOutputValueClass(Mutation.class);
 
-      AccumuloOutputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloOutputFormat.setClientInfo(job, getClientInfo());
       AccumuloOutputFormat.setCreateTables(job, false);
       AccumuloOutputFormat.setDefaultTableName(job, table2);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
index d579264..588a9b7 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloRowInputFormatIT.java
@@ -154,7 +154,7 @@ public class AccumuloRowInputFormatIT extends AccumuloClusterHarness {
 
       job.setInputFormatClass(AccumuloRowInputFormat.class);
 
-      AccumuloRowInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloRowInputFormat.setClientInfo(job, getClientInfo());
       AccumuloInputFormat.setInputTableName(job, table);
 
       job.setMapperClass(TestMapper.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
index 37fa021..5acc3ac 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
@@ -101,7 +101,7 @@ public class TokenFileIT extends AccumuloClusterHarness {
       job.setInputFormatClass(AccumuloInputFormat.class);
 
       AccumuloInputFormat.setInputTableName(job, table1);
-      AccumuloInputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloInputFormat.setClientInfo(job, getClientInfo());
 
       job.setMapperClass(TestMapper.class);
       job.setMapOutputKeyClass(Key.class);
@@ -110,7 +110,7 @@ public class TokenFileIT extends AccumuloClusterHarness {
       job.setOutputKeyClass(Text.class);
       job.setOutputValueClass(Mutation.class);
 
-      AccumuloOutputFormat.setConnectionInfo(job, getConnectionInfo());
+      AccumuloOutputFormat.setClientInfo(job, getClientInfo());
       AccumuloOutputFormat.setCreateTables(job, false);
       AccumuloOutputFormat.setDefaultTableName(job, table2);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
index c3d561e..a5d1f74 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java
@@ -159,7 +159,7 @@ public class SuspendedTabletsIT extends ConfigurableMacBase {
    *          callback which shuts down some tablet servers.
    */
   private void suspensionTestBody(TServerKiller serverStopper) throws Exception {
-    ClientContext ctx = new ClientContext(getConnectionInfo());
+    ClientContext ctx = new ClientContext(getClientInfo());
 
     String tableName = getUniqueNames(1)[0];
 
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
index d9fad78..5ba3c61 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
@@ -85,7 +85,7 @@ public class ProxyDurabilityIT extends ConfigurableMacBase {
     File emptyFile = Files.createTempFile(null, null).toFile();
     emptyFile.deleteOnExit();
     proxyProps.put("tokenClass", PasswordToken.class.getName());
-    proxyProps.putAll(getConnectionInfo().getProperties());
+    proxyProps.putAll(getClientInfo().getProperties());
 
     TJSONProtocol.Factory protocol = new TJSONProtocol.Factory();
 
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index ea8f8f4..23b5f7c 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -227,7 +227,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
     }
 
     props.put("tokenClass", tokenClass);
-    props.putAll(SharedMiniClusterBase.getCluster().getConnectionInfo().getProperties());
+    props.putAll(SharedMiniClusterBase.getCluster().getClientInfo().getProperties());
     proxyPort = PortUtils.getRandomFreePort();
     proxyServer = Proxy.createProxyServer(HostAndPort.fromParts(hostname, proxyPort), factory,
         props).server;
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
index 91f5f46..79bad79 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java
@@ -380,7 +380,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB
     conn.tableOperations().flush(otherTable, null, null, true);
 
     // Get the tservers which the master deems as active
-    final ClientContext context = new ClientContext(getConnectionInfo());
+    final ClientContext context = new ClientContext(getClientInfo());
     List<String> tservers = MasterClient.execute(context,
         client -> client.getActiveTservers(Tracer.traceInfo(), context.rpcCreds()));
 
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
index a810f73..ed1fcdd 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
@@ -99,7 +99,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
       }
     };
 
-    ClientContext context = new ClientContext(getConnectionInfo());
+    ClientContext context = new ClientContext(getClientInfo());
     return new ReplicationOperationsImpl(context) {
       @Override
       protected boolean getMasterDrain(final TInfo tinfo, final TCredentials rpcCreds,

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.

Mime
View raw message