diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/BeakerxClientManager.java b/kernel/base/src/main/java/com/twosigma/beakerx/BeakerxClientManager.java
index 0b56cfcd18..efd693a104 100644
--- a/kernel/base/src/main/java/com/twosigma/beakerx/BeakerxClientManager.java
+++ b/kernel/base/src/main/java/com/twosigma/beakerx/BeakerxClientManager.java
@@ -18,14 +18,14 @@
 
 public class BeakerxClientManager {
 
-  private static BeakerClient beakerxClientInst;
+  private static BeakerXClient beakerxClientInst;
 
-  public static BeakerClient register(BeakerClient beakerxClient) {
+  public static BeakerXClient register(BeakerXClient beakerxClient) {
     beakerxClientInst = beakerxClient;
     return beakerxClientInst;
   }
 
-  public static BeakerClient get() {
+  public static BeakerXClient get() {
     return beakerxClientInst;
   }
 }
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/NamespaceClient.java b/kernel/base/src/main/java/com/twosigma/beakerx/NamespaceClient.java
index 8fc4aed814..7bddcc1b29 100644
--- a/kernel/base/src/main/java/com/twosigma/beakerx/NamespaceClient.java
+++ b/kernel/base/src/main/java/com/twosigma/beakerx/NamespaceClient.java
@@ -38,7 +38,7 @@
 import static com.fasterxml.jackson.databind.SerializationFeature.WRITE_ENUMS_USING_TO_STRING;
 import static com.twosigma.beakerx.kernel.msg.JupyterMessages.COMM_MSG;
 
-public class NamespaceClient implements BeakerClient {
+public class NamespaceClient implements BeakerXClient {
 
   private static Map<String, SynchronousQueue<Object>> messagePool = new HashMap<>();
   private ObjectMapper objectMapper;
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
index a58fd4a99c..c61f378b01 100644
--- a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
+++ b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.BeakerxClientManager;
 import com.twosigma.beakerx.DefaultJVMVariables;
 import com.twosigma.beakerx.inspect.Inspect;
@@ -55,7 +55,7 @@ public abstract class BaseEvaluator implements Evaluator {
   protected Imports imports;
   private final CellExecutor executor;
   private Path tempFolder;
-  private BeakerClient beakerxClient;
+  private BeakerXClient beakerxClient;
   protected EvaluatorParameters evaluatorParameters;
   private EvaluatorHooks cancelHooks = new EvaluatorHooks();
 
@@ -66,7 +66,7 @@ public BaseEvaluator(String id,
                        CellExecutor cellExecutor,
                        TempFolderFactory tempFolderFactory,
                        EvaluatorParameters evaluatorParameters,
-                       BeakerClient beakerxClient) {
+                       BeakerXClient beakerxClient) {
     shellId = id;
     sessionId = sId;
     executor = cellExecutor;
@@ -109,7 +109,7 @@ public ClassLoader getClassLoaderForImport() {
   }
 
   @Override
-  public BeakerClient getBeakerx() {
+  public BeakerXClient getBeakerx() {
     return beakerxClient;
   }
 
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/Evaluator.java b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/Evaluator.java
index 24a192acef..d8162768a5 100644
--- a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/Evaluator.java
+++ b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/Evaluator.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.inspect.InspectResult;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.kernel.AddImportStatus;
@@ -76,5 +76,5 @@ public interface Evaluator {
 
   void registerCancelHook(Hook hook);
 
-  BeakerClient getBeakerx();
+  BeakerXClient getBeakerx();
 }
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/EvaluatorManager.java b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/EvaluatorManager.java
index 7a5a76c8ed..5e6561addd 100644
--- a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/EvaluatorManager.java
+++ b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/EvaluatorManager.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.inspect.InspectResult;
@@ -120,7 +120,7 @@ public void registerCancelHook(Hook hook) {
     evaluator.registerCancelHook(hook);
   }
 
-  public BeakerClient getBeakerx() {
+  public BeakerXClient getBeakerx() {
     return evaluator.getBeakerx();
   }
 }
diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/evaluator/EvaluatorTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/evaluator/EvaluatorTest.java
index 64cf65cca4..2ef4506e09 100644
--- a/kernel/base/src/test/java/com/twosigma/beakerx/evaluator/EvaluatorTest.java
+++ b/kernel/base/src/test/java/com/twosigma/beakerx/evaluator/EvaluatorTest.java
@@ -16,7 +16,7 @@
 
 package com.twosigma.beakerx.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.CodeCell;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
@@ -195,7 +195,7 @@ public int getResetEnvironmentCounter() {
   }
 
 
-  public static class BeakexClientTestImpl implements BeakerClient {
+  public static class BeakexClientTestImpl implements BeakerXClient {
 
     @Override
     public void showProgressUpdate(String message, int progress) {
diff --git a/kernel/clojure/src/main/java/com/twosigma/beakerx/clojure/evaluator/ClojureEvaluator.java b/kernel/clojure/src/main/java/com/twosigma/beakerx/clojure/evaluator/ClojureEvaluator.java
index d65eb04881..300760bfcf 100644
--- a/kernel/clojure/src/main/java/com/twosigma/beakerx/clojure/evaluator/ClojureEvaluator.java
+++ b/kernel/clojure/src/main/java/com/twosigma/beakerx/clojure/evaluator/ClojureEvaluator.java
@@ -21,7 +21,7 @@
 import clojure.lang.RT;
 import clojure.lang.Symbol;
 import clojure.lang.Var;
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.clojure.autocomplete.ClojureAutocomplete;
@@ -60,13 +60,13 @@ public ClojureEvaluator(String id,
                           CellExecutor cellExecutor,
                           TempFolderFactory tempFolderFactory,
                           EvaluatorParameters evaluatorParameters,
-                          BeakerClient beakerxClient) {
+                          BeakerXClient beakerxClient) {
     super(id, sId, cellExecutor, tempFolderFactory, evaluatorParameters, beakerxClient);
     requirements = new ArrayList<>();
     init();
   }
 
-  public ClojureEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public ClojureEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     this(id,
             sId,
             new BeakerCellExecutor("clojure"),
diff --git a/kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java b/kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java
index f6789e9319..39a882134a 100644
--- a/kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java
+++ b/kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.groovy.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.evaluator.BaseEvaluator;
@@ -54,7 +54,7 @@ public class GroovyEvaluator extends BaseEvaluator {
   private ImportCustomizer icz;
   private BeakerXUrlClassLoader beakerxUrlClassLoader;
 
-  public GroovyEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public GroovyEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     this(id,
             sId,
             new BeakerCellExecutor("groovy"),
@@ -68,7 +68,7 @@ public GroovyEvaluator(String id,
                          CellExecutor cellExecutor,
                          TempFolderFactory tempFolderFactory,
                          EvaluatorParameters evaluatorParameters,
-                         BeakerClient beakerxClient) {
+                         BeakerXClient beakerxClient) {
     super(id, sId, cellExecutor, tempFolderFactory, evaluatorParameters, beakerxClient);
     cps = new GroovyClasspathScanner();
     gac = createGroovyAutocomplete(cps);
diff --git a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/TestGroovyEvaluator.java b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/TestGroovyEvaluator.java
index 20848482a1..8f299c99bf 100644
--- a/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/TestGroovyEvaluator.java
+++ b/kernel/groovy/src/test/java/com/twosigma/beakerx/groovy/TestGroovyEvaluator.java
@@ -16,7 +16,7 @@
 package com.twosigma.beakerx.groovy;
 
 import com.twosigma.beakerx.AutotranslationService;
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.evaluator.BaseEvaluator;
 import com.twosigma.beakerx.evaluator.EvaluatorTest;
 import com.twosigma.beakerx.evaluator.TempFolderFactory;
@@ -56,7 +56,7 @@ public String getContextAsString() {
     };
   }
 
-  public static BaseEvaluator groovyEvaluator(BeakerClient client) {
+  public static BaseEvaluator groovyEvaluator(BeakerXClient client) {
     GroovyEvaluator evaluator = new GroovyEvaluator(
             "id",
             "sid",
diff --git a/kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaEvaluator.java b/kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaEvaluator.java
index a71092ee00..aac31e67b3 100644
--- a/kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaEvaluator.java
+++ b/kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaEvaluator.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.javash.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.evaluator.BaseEvaluator;
@@ -45,7 +45,7 @@ public class JavaEvaluator extends BaseEvaluator {
   private JavaAutocomplete jac;
   private JavaBeakerXUrlClassLoader loader = null;
 
-  public JavaEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public JavaEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     this(id, sId, new BeakerCellExecutor("javash"), new TempFolderFactoryImpl(), evaluatorParameters, beakerxClient);
   }
 
@@ -54,7 +54,7 @@ public JavaEvaluator(String id,
                        CellExecutor cellExecutor,
                        TempFolderFactory tempFolderFactory,
                        EvaluatorParameters evaluatorParameters,
-                       BeakerClient beakerxClient) {
+                       BeakerXClient beakerxClient) {
     super(id, sId, cellExecutor, tempFolderFactory, evaluatorParameters, beakerxClient);
     packageId = "com.twosigma.beaker.javash.bkr" + shellId.split("-")[0];
     cps = new JavaClasspathScanner();
diff --git a/kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinEvaluator.java b/kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinEvaluator.java
index 72ed24216c..63c844575d 100644
--- a/kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinEvaluator.java
+++ b/kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinEvaluator.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.kotlin.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.autocomplete.ClasspathScanner;
@@ -52,11 +52,11 @@ public class KotlinEvaluator extends BaseEvaluator {
   private ReplClassLoader loader = null;
   private BeakerXUrlClassLoader kotlinClassLoader;
 
-  public KotlinEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public KotlinEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     this(id, sId, new BeakerCellExecutor("kotlin"), new TempFolderFactoryImpl(), evaluatorParameters, beakerxClient);
   }
 
-  public KotlinEvaluator(String id, String sId, CellExecutor cellExecutor, TempFolderFactory tempFolderFactory, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public KotlinEvaluator(String id, String sId, CellExecutor cellExecutor, TempFolderFactory tempFolderFactory, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     super(id, sId, cellExecutor, tempFolderFactory, evaluatorParameters, beakerxClient);
     cps = new ClasspathScanner();
     createRepl();
diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaEvaluator.java b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaEvaluator.java
index 23d09c2cd0..ede8d55b85 100644
--- a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaEvaluator.java
+++ b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaEvaluator.java
@@ -17,7 +17,7 @@
 package com.twosigma.beakerx.scala.evaluator;
 
 import com.google.inject.Provider;
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.evaluator.BaseEvaluator;
@@ -56,7 +56,7 @@ public class ScalaEvaluator extends BaseEvaluator {
   private BeakerXUrlClassLoader classLoader;
   private ScalaEvaluatorGlue shell;
 
-  public ScalaEvaluator(String id, String sId, Provider<BeakerObjectConverter> osp, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public ScalaEvaluator(String id, String sId, Provider<BeakerObjectConverter> osp, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     this(id,
             sId,
             osp,
@@ -67,7 +67,7 @@ public ScalaEvaluator(String id, String sId, Provider<BeakerObjectConverter> osp
             beakerxClient);
   }
 
-  public ScalaEvaluator(String id, String sId, Provider<BeakerObjectConverter> osp, CellExecutor cellExecutor, BeakerxObjectFactory beakerxObjectFactory, TempFolderFactory tempFolderFactory, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public ScalaEvaluator(String id, String sId, Provider<BeakerObjectConverter> osp, CellExecutor cellExecutor, BeakerxObjectFactory beakerxObjectFactory, TempFolderFactory tempFolderFactory, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     super(id, sId, cellExecutor, tempFolderFactory, evaluatorParameters, beakerxClient);
     this.objectSerializerProvider = osp;
     this.beakerxObjectFactory = beakerxObjectFactory;
diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/BeakerParser.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/BeakerParser.java
index 9ee103188f..6d22c54ab8 100644
--- a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/BeakerParser.java
+++ b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/BeakerParser.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.sql;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -41,7 +41,7 @@ public class BeakerParser {
 
   protected final JDBCClient jdbcClient;
   
-  private BeakerClient client;
+  private BeakerXClient client;
   private ConnectionStringHolder dbURI;
   private Map<String, String> inputs = new HashMap<>();
   private Set<String> outputs = new HashSet<>();
@@ -50,7 +50,7 @@ public class BeakerParser {
 
   private List<BeakerParseResult> results = new ArrayList<>();
 
-  public BeakerParser(String script, BeakerClient client, ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString, JDBCClient jdbcClient) throws IOException, DBConnectionException {
+  public BeakerParser(String script, BeakerXClient client, ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString, JDBCClient jdbcClient) throws IOException, DBConnectionException {
     this.client = client;
     this.jdbcClient = jdbcClient;
     this.defaultConnectionString = defaultConnectionString;
diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/QueryExecutor.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/QueryExecutor.java
index 2f588f9736..2c4d6175df 100644
--- a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/QueryExecutor.java
+++ b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/QueryExecutor.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.sql;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.jvm.object.OutputCell;
 import com.twosigma.beakerx.jvm.object.OutputContainer;
 import com.twosigma.beakerx.table.TableDisplay;
@@ -47,7 +47,7 @@ public QueryExecutor(JDBCClient jdbcClient) {
     this.jdbcClient = jdbcClient;
   }
 
-  public synchronized Object executeQuery(String script, BeakerClient namespaceClient, ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString)
+  public synchronized Object executeQuery(String script, BeakerXClient namespaceClient, ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString)
       throws SQLException, IOException, ReadVariableException {
 
     BeakerParser beakerParser = new BeakerParser(script, namespaceClient, defaultConnectionString, namedConnectionString, jdbcClient);
@@ -183,7 +183,7 @@ private void adoptResult(BeakerParseResult queryLine, QueryResult queryResult, L
     }
   }
 
-  private QueryResult executeQuery(int currentIterationIndex, BeakerParseResult queryLine, Connection conn, BeakerClient namespaceClient) throws SQLException, ReadVariableException {
+  private QueryResult executeQuery(int currentIterationIndex, BeakerParseResult queryLine, Connection conn, BeakerXClient namespaceClient) throws SQLException, ReadVariableException {
 
     QueryResult queryResult = new QueryResult();
 
diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/autocomplete/db/DbExplorerFactory.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/autocomplete/db/DbExplorerFactory.java
index 3b8358fe20..a47510a38e 100644
--- a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/autocomplete/db/DbExplorerFactory.java
+++ b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/autocomplete/db/DbExplorerFactory.java
@@ -16,7 +16,7 @@
 
 package com.twosigma.beakerx.sql.autocomplete.db;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.BeakerxClientManager;
 import com.twosigma.beakerx.sql.BeakerParser;
 import com.twosigma.beakerx.sql.ConnectionStringHolder;
@@ -40,7 +40,7 @@ public class DbExplorerFactory {
   public static DbInfo getDbInfo(String txt, JDBCClient jdbcClient, String sessionId,
                                  ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString) {
 
-    final BeakerClient namespaceClient = BeakerxClientManager.get();
+    final BeakerXClient namespaceClient = BeakerxClientManager.get();
     final BeakerParser beakerParser;
     try {
       beakerParser = new BeakerParser(txt, namespaceClient,
diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLCodeRunner.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLCodeRunner.java
index 5fc8f780a8..40656c3d00 100644
--- a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLCodeRunner.java
+++ b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLCodeRunner.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.sql.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.jvm.object.SimpleEvaluationObject;
 import com.twosigma.beakerx.sql.ReadVariableException;
@@ -33,9 +33,9 @@ class SQLCodeRunner implements Callable<TryResult> {
 
   private SQLEvaluator sqlEvaluator;
   private final SimpleEvaluationObject simpleEvaluationObject;
-  private final BeakerClient namespaceClient;
+  private final BeakerXClient namespaceClient;
 
-  SQLCodeRunner(SQLEvaluator sqlEvaluator, SimpleEvaluationObject seo, BeakerClient namespaceClient) {
+  SQLCodeRunner(SQLEvaluator sqlEvaluator, SimpleEvaluationObject seo, BeakerXClient namespaceClient) {
     this.sqlEvaluator = sqlEvaluator;
     this.simpleEvaluationObject = seo;
     this.namespaceClient = namespaceClient;
diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLEvaluator.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLEvaluator.java
index dd77000d3f..a210b684df 100644
--- a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLEvaluator.java
+++ b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLEvaluator.java
@@ -16,7 +16,7 @@
 package com.twosigma.beakerx.sql.evaluator;
 
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.autocomplete.AutocompleteResult;
 import com.twosigma.beakerx.autocomplete.ClasspathScanner;
@@ -68,11 +68,11 @@ public class SQLEvaluator extends BaseEvaluator {
   private JDBCClient jdbcClient;
   private DynamicClassLoaderSimple loader;
 
-  public SQLEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public SQLEvaluator(String id, String sId, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     this(id, sId, new BeakerCellExecutor("sql"), new TempFolderFactoryImpl(), evaluatorParameters, beakerxClient);
   }
 
-  public SQLEvaluator(String id, String sId, CellExecutor cellExecutor, TempFolderFactory tempFolderFactory, EvaluatorParameters evaluatorParameters, BeakerClient beakerxClient) {
+  public SQLEvaluator(String id, String sId, CellExecutor cellExecutor, TempFolderFactory tempFolderFactory, EvaluatorParameters evaluatorParameters, BeakerXClient beakerxClient) {
     super(id, sId, cellExecutor, tempFolderFactory, evaluatorParameters, beakerxClient);
     packageId = "com.twosigma.beaker.sql.bkr" + shellId.split("-")[0];
     cps = new ClasspathScanner();
@@ -241,7 +241,7 @@ public List<ConnectionStringBean> getListOfConnectiononWhoNeedDialog() {
     return ret;
   }
 
-  public Object executeQuery(String expression, BeakerClient namespaceClient, ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString) throws SQLException, IOException, ReadVariableException {
+  public Object executeQuery(String expression, BeakerXClient namespaceClient, ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString) throws SQLException, IOException, ReadVariableException {
     return queryExecutor.executeQuery(expression, namespaceClient, defaultConnectionString, namedConnectionString);
   }
 
diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLWorkerThread.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLWorkerThread.java
index 144222c635..72273f7488 100644
--- a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLWorkerThread.java
+++ b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLWorkerThread.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.sql.evaluator;
 
-import com.twosigma.beakerx.BeakerClient;
+import com.twosigma.beakerx.BeakerXClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.evaluator.JobDescriptor;
 import org.slf4j.Logger;
@@ -36,7 +36,7 @@ class SQLWorkerThread implements Callable<TryResult> {
 
   @Override
   public TryResult call() throws Exception {
-    BeakerClient namespaceClient = null;
+    BeakerXClient namespaceClient = null;
     TryResult r;
     job.getSimpleEvaluationObject().started();
     try {