diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java
index 2ef7e08cf44..8ed1fe4daad 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
@@ -32,7 +32,7 @@ import org.elasticsearch.common.unit.TimeValue;
  */
 public class ClusterHealthRequestBuilder extends BaseClusterRequestBuilder<ClusterHealthRequest, ClusterHealthResponse> {
 
-    public ClusterHealthRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public ClusterHealthRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new ClusterHealthRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
index 800285f8866..7ce3fa7b925 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.cluster.node.info;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class NodesInfoRequestBuilder extends BaseClusterRequestBuilder<NodesInfoRequest, NodesInfoResponse> {
 
-    public NodesInfoRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public NodesInfoRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new NodesInfoRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java
index afd5876b672..ea37be3c281 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.admin.cluster.node.restart;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartRequest;
 import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartResponse;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
@@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.TimeValue;
  */
 public class NodesRestartRequestBuilder extends BaseClusterRequestBuilder<NodesRestartRequest, NodesRestartResponse> {
 
-    public NodesRestartRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public NodesRestartRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new NodesRestartRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java
index 84af0b6936a..0fa38f88a0b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.admin.cluster.node.shutdown;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequest;
 import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownResponse;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
@@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.TimeValue;
  */
 public class NodesShutdownRequestBuilder extends BaseClusterRequestBuilder<NodesShutdownRequest, NodesShutdownResponse> {
 
-    public NodesShutdownRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public NodesShutdownRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new NodesShutdownRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java
index 759dcadd4cf..0c97c2969c2 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.cluster.node.stats;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequest;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class NodesStatsRequestBuilder extends BaseClusterRequestBuilder<NodesStatsRequest, NodesStatsResponse> {
 
-    public NodesStatsRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public NodesStatsRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new NodesStatsRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java
index 2958934b77b..2d3ff4fb61f 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java
@@ -23,15 +23,15 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequest;
 import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingResponse;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class BroadcastPingRequestBuilder extends BaseClusterRequestBuilder<BroadcastPingRequest, BroadcastPingResponse> {
 
-    public BroadcastPingRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public BroadcastPingRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new BroadcastPingRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java
index 9fb7ca470e4..bda02272766 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequest;
 import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingResponse;
 import org.elasticsearch.action.support.replication.ReplicationType;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
@@ -32,7 +32,7 @@ import org.elasticsearch.common.unit.TimeValue;
  */
 public class ReplicationPingRequestBuilder extends BaseClusterRequestBuilder<ReplicationPingRequest, ReplicationPingResponse> {
 
-    public ReplicationPingRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public ReplicationPingRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new ReplicationPingRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java
index 5bce60daa0a..9e481278354 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.cluster.ping.single;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequest;
 import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class SinglePingRequestBuilder extends BaseClusterRequestBuilder<SinglePingRequest, SinglePingResponse> {
 
-    public SinglePingRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public SinglePingRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new SinglePingRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java
index 116ec0d22fb..49b62921a87 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.cluster.state;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder;
-import org.elasticsearch.client.internal.InternalClusterAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class ClusterStateRequestBuilder extends BaseClusterRequestBuilder<ClusterStateRequest, ClusterStateResponse> {
 
-    public ClusterStateRequestBuilder(InternalClusterAdminClient clusterClient) {
+    public ClusterStateRequestBuilder(ClusterAdminClient clusterClient) {
         super(clusterClient, new ClusterStateRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java
index ae3c10e2d95..8c378ed04af 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java
@@ -24,6 +24,7 @@ import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ListenableActionFuture;
 import org.elasticsearch.action.support.PlainListenableActionFuture;
+import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.action.RequestBuilder;
 import org.elasticsearch.client.internal.InternalClusterAdminClient;
 
@@ -36,8 +37,8 @@ public abstract class BaseClusterRequestBuilder<Request extends ActionRequest, R
 
     protected final Request request;
 
-    protected BaseClusterRequestBuilder(InternalClusterAdminClient client, Request request) {
-        this.client = client;
+    protected BaseClusterRequestBuilder(ClusterAdminClient client, Request request) {
+        this.client = (InternalClusterAdminClient) client;
         this.request = request;
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java
index 73c1a47fc9d..66b977255f7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.indices.alias;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class IndicesAliasesRequestBuilder extends BaseIndicesRequestBuilder<IndicesAliasesRequest, IndicesAliasesResponse> {
 
-    public IndicesAliasesRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public IndicesAliasesRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new IndicesAliasesRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java
index cac4ecea6df..3e70a5727cd 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java
@@ -23,15 +23,15 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest;
 import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class ClearIndicesCacheRequestBuilder extends BaseIndicesRequestBuilder<ClearIndicesCacheRequest, ClearIndicesCacheResponse> {
 
-    public ClearIndicesCacheRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public ClearIndicesCacheRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new ClearIndicesCacheRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java
index 504c9455d1b..18fe304cf5f 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.admin.indices.create;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.builder.XContentBuilder;
@@ -35,7 +35,7 @@ import java.util.Map;
  */
 public class CreateIndexRequestBuilder extends BaseIndicesRequestBuilder<CreateIndexRequest, CreateIndexResponse> {
 
-    public CreateIndexRequestBuilder(InternalIndicesAdminClient indicesClient, String index) {
+    public CreateIndexRequestBuilder(IndicesAdminClient indicesClient, String index) {
         super(indicesClient, new CreateIndexRequest(index));
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java
index 31d9ba5d5e2..82cab72cc31 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.admin.indices.delete;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
@@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.TimeValue;
  */
 public class DeleteIndexRequestBuilder extends BaseIndicesRequestBuilder<DeleteIndexRequest, DeleteIndexResponse> {
 
-    public DeleteIndexRequestBuilder(InternalIndicesAdminClient indicesClient, String index) {
+    public DeleteIndexRequestBuilder(IndicesAdminClient indicesClient, String index) {
         super(indicesClient, new DeleteIndexRequest(index));
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java
index 68119551731..249acfc9ffd 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.indices.flush;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class FlushRequestBuilder extends BaseIndicesRequestBuilder<FlushRequest, FlushResponse> {
 
-    public FlushRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public FlushRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new FlushRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java
index 90345b622ac..3afa4674319 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.admin.indices.gateway.snapshot;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequest;
 import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
@@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.TimeValue;
  */
 public class GatewaySnapshotRequestBuilder extends BaseIndicesRequestBuilder<GatewaySnapshotRequest, GatewaySnapshotResponse> {
 
-    public GatewaySnapshotRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public GatewaySnapshotRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new GatewaySnapshotRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java
index 6e960134ecc..1ab34e172ca 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.admin.indices.mapping.put;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.builder.XContentBuilder;
 
@@ -34,7 +34,7 @@ import java.util.Map;
  */
 public class PutMappingRequestBuilder extends BaseIndicesRequestBuilder<PutMappingRequest, PutMappingResponse> {
 
-    public PutMappingRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public PutMappingRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new PutMappingRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java
index 519ab33e2e4..ae4cfae9a5a 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest;
 import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
 /**
  * A request to optimize one or more indices. In order to optimize on all the indices, pass an empty array or
@@ -40,7 +40,7 @@ import org.elasticsearch.client.internal.InternalIndicesAdminClient;
  */
 public class OptimizeRequestBuilder extends BaseIndicesRequestBuilder<OptimizeRequest, OptimizeResponse> {
 
-    public OptimizeRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public OptimizeRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new OptimizeRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java
index 0036e3ccc3d..4a20f989048 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
 /**
  * A refresh request making all operations performed since the last refresh available for search. The (near) real-time
@@ -35,7 +35,7 @@ import org.elasticsearch.client.internal.InternalIndicesAdminClient;
  */
 public class RefreshRequestBuilder extends BaseIndicesRequestBuilder<RefreshRequest, RefreshResponse> {
 
-    public RefreshRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public RefreshRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new RefreshRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java
index 76d4c61e376..441b29ff049 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java
@@ -22,15 +22,15 @@ package org.elasticsearch.client.action.admin.indices.status;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.status.IndicesStatusRequest;
 import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder;
-import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
 /**
  * @author kimchy (shay.banon)
  */
 public class IndicesStatusRequestBuilder extends BaseIndicesRequestBuilder<IndicesStatusRequest, IndicesStatusResponse> {
 
-    public IndicesStatusRequestBuilder(InternalIndicesAdminClient indicesClient) {
+    public IndicesStatusRequestBuilder(IndicesAdminClient indicesClient) {
         super(indicesClient, new IndicesStatusRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java
index fd83892a444..c5f4dc30183 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java
@@ -24,6 +24,7 @@ import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ListenableActionFuture;
 import org.elasticsearch.action.support.PlainListenableActionFuture;
+import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.client.action.RequestBuilder;
 import org.elasticsearch.client.internal.InternalIndicesAdminClient;
 
@@ -36,8 +37,8 @@ public abstract class BaseIndicesRequestBuilder<Request extends ActionRequest, R
 
     protected final Request request;
 
-    protected BaseIndicesRequestBuilder(InternalIndicesAdminClient client, Request request) {
-        this.client = client;
+    protected BaseIndicesRequestBuilder(IndicesAdminClient client, Request request) {
+        this.client = (InternalIndicesAdminClient) client;
         this.request = request;
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java
index 603baa7552e..95a99688e55 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.count.CountRequest;
 import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 import org.elasticsearch.index.query.QueryBuilder;
 
 /**
@@ -34,7 +34,7 @@ import org.elasticsearch.index.query.QueryBuilder;
  */
 public class CountRequestBuilder extends BaseRequestBuilder<CountRequest, CountResponse> {
 
-    public CountRequestBuilder(InternalClient client) {
+    public CountRequestBuilder(Client client) {
         super(client, new CountRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java
index d0404d66010..5f688907114 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.support.replication.ReplicationType;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 
 import javax.annotation.Nullable;
 
@@ -35,7 +35,7 @@ import javax.annotation.Nullable;
  */
 public class DeleteRequestBuilder extends BaseRequestBuilder<DeleteRequest, DeleteResponse> {
 
-    public DeleteRequestBuilder(InternalClient client, @Nullable String index) {
+    public DeleteRequestBuilder(Client client, @Nullable String index) {
         super(client, new DeleteRequest(index));
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java
index b61d729b824..08deeec3d40 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest;
 import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;
 import org.elasticsearch.action.support.replication.ReplicationType;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.builder.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class DeleteByQueryRequestBuilder extends BaseRequestBuilder<DeleteByQueryRequest, DeleteByQueryResponse> {
 
-    public DeleteByQueryRequestBuilder(InternalClient client) {
+    public DeleteByQueryRequestBuilder(Client client) {
         super(client, new DeleteByQueryRequest());
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java
index 6cb974178a6..4b341a8f74c 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java
@@ -22,8 +22,8 @@ package org.elasticsearch.client.action.get;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 
 import javax.annotation.Nullable;
 
@@ -34,7 +34,7 @@ import javax.annotation.Nullable;
  */
 public class GetRequestBuilder extends BaseRequestBuilder<GetRequest, GetResponse> {
 
-    public GetRequestBuilder(InternalClient client, @Nullable String index) {
+    public GetRequestBuilder(Client client, @Nullable String index) {
         super(client, new GetRequest(index));
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java
index b0839d129c4..1196d5258a8 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.support.replication.ReplicationType;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.builder.XContentBuilder;
@@ -39,7 +39,7 @@ import java.util.Map;
  */
 public class IndexRequestBuilder extends BaseRequestBuilder<IndexRequest, IndexResponse> {
 
-    public IndexRequestBuilder(InternalClient client, @Nullable String index) {
+    public IndexRequestBuilder(Client client, @Nullable String index) {
         super(client, new IndexRequest(index));
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java
index d8cf075daa9..7f9845f8d26 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java
@@ -25,8 +25,8 @@ import org.elasticsearch.action.search.SearchOperationThreading;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.xcontent.XContentQueryBuilder;
 import org.elasticsearch.search.Scroll;
@@ -47,7 +47,7 @@ public class SearchRequestBuilder extends BaseRequestBuilder<SearchRequest, Sear
 
     private HighlightBuilder highlightBuilder;
 
-    public SearchRequestBuilder(InternalClient client) {
+    public SearchRequestBuilder(Client client) {
         super(client, new SearchRequest());
     }
 
@@ -222,11 +222,26 @@ public class SearchRequestBuilder extends BaseRequestBuilder<SearchRequest, Sear
         return this;
     }
 
+    /**
+     * Adds a script based field to load and return. The field does not have to be stored,
+     * but its recommended to use non analyzed or numeric fields.
+     *
+     * @param name   The name that will represent this value in the return hit
+     * @param script The script to use
+     */
     public SearchRequestBuilder addScriptField(String name, String script) {
         sourceBuilder().scriptField(name, script);
         return this;
     }
 
+    /**
+     * Adds a script based field to load and return. The field does not have to be stored,
+     * but its recommended to use non analyzed or numeric fields.
+     *
+     * @param name   The name that will represent this value in the return hit
+     * @param script The script to use
+     * @param params Parameters that the script can use.
+     */
     public SearchRequestBuilder addScriptField(String name, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, script, params);
         return this;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java
index 4675d5e82b3..6652bf87706 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.search.SearchOperationThreading;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.support.BaseRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.search.Scroll;
 
@@ -35,7 +35,7 @@ import org.elasticsearch.search.Scroll;
  */
 public class SearchScrollRequestBuilder extends BaseRequestBuilder<SearchScrollRequest, SearchResponse> {
 
-    public SearchScrollRequestBuilder(InternalClient client, String scrollId) {
+    public SearchScrollRequestBuilder(Client client, String scrollId) {
         super(client, new SearchScrollRequest(scrollId));
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java
index 9af89d3e58a..b830db608ab 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java
@@ -24,6 +24,7 @@ import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ListenableActionFuture;
 import org.elasticsearch.action.support.PlainListenableActionFuture;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.action.RequestBuilder;
 import org.elasticsearch.client.internal.InternalClient;
 
@@ -36,8 +37,8 @@ public abstract class BaseRequestBuilder<Request extends ActionRequest, Response
 
     protected final Request request;
 
-    protected BaseRequestBuilder(InternalClient client, Request request) {
-        this.client = client;
+    protected BaseRequestBuilder(Client client, Request request) {
+        this.client = (InternalClient) client;
         this.request = request;
     }