JAVA-2151: Drop "Dsl" suffix from query builder main classes (#1188)

commit: 9150b02e86578d8bb93e37a63c0ab61707e8a7b7 [log] [tgz]
author: Olivier Michallat <olim7t@users.noreply.github.com> Tue Feb 12 05:35:56 2019 -0800
committer: Alexandre Dutra <adutra@users.noreply.github.com> Tue Feb 12 14:35:56 2019 +0100
tree: afc982f3ada522a77212bb869e3cb90393c292ff
parent: 2177de63e946f3de28437f71cdcf1a6b407f84b9 [diff]
diff --git a/changelog/README.md b/changelog/README.md
index 244d57a..30be47f 100644
--- a/changelog/README.md
+++ b/changelog/README.md

@@ -4,6 +4,7 @@
 
 ### 4.0.0-rc1 (in progress)
 
+- [improvement] JAVA-2151: Drop "Dsl" suffix from query builder main classes
 - [new feature] JAVA-2144: Expose internal API to hook into the session lifecycle
 - [improvement] JAVA-2119: Add PagingIterable abstraction as a supertype of ResultSet
 - [bug] JAVA-2063: Normalize authentication logging

diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java
index c90b77e..777d35b 100644
--- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java
+++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java

@@ -204,8 +204,8 @@
    *   <li>to format the INITCOND in {@link AggregateMetadata#describe(boolean)};
    *   <li>in the {@code toString()} representation of some driver objects (such as {@link UdtValue}
    *       and {@link TupleValue}), which is only used in driver logs;
-   *   <li>for literal values in the query builder (see {@code QueryBuilderDsl#literal(Object,
-   *       CodecRegistry)} and {@code QueryBuilderDsl#literal(Object, TypeCodec)}).
+   *   <li>for literal values in the query builder (see {@code QueryBuilder#literal(Object,
+   *       CodecRegistry)} and {@code QueryBuilder#literal(Object, TypeCodec)}).
    * </ol>
    *
    * If you choose not to implement this method, don't throw an exception but instead return a

diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/osgi/OsgiBaseIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/osgi/OsgiBaseIT.java
index 16ee962..e173825 100644
--- a/integration-tests/src/test/java/com/datastax/oss/driver/osgi/OsgiBaseIT.java
+++ b/integration-tests/src/test/java/com/datastax/oss/driver/osgi/OsgiBaseIT.java

@@ -15,7 +15,7 @@
  */
 package com.datastax.oss.driver.osgi;
 
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.oss.driver.api.core.CqlSession;

diff --git a/manual/query_builder/README.md b/manual/query_builder/README.md
index d21da93..f3f8e97 100644
--- a/manual/query_builder/README.md
+++ b/manual/query_builder/README.md

@@ -21,7 +21,7 @@
 Here is our canonical example rewritten with the query builder:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 
 try (CqlSession session = CqlSession.builder().build()) {
   
@@ -38,11 +38,11 @@
 
 #### Fluent API
 
-All the starting methods are centralized in the [QueryBuilderDsl] class. To get started, add the
+All the starting methods are centralized in the [QueryBuilder] class. To get started, add the
 following import:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 ```
 
 Choose the method matching your desired statement, for example `selectFrom`. Then use your IDE's
@@ -183,6 +183,6 @@
   * [Terms](term/)
   * [Idempotence](idempotence/)
   
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/SchemaBuilderDsl.html
-[CqlIdentifier]:   http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/core/CqlIdentifier.html
+[QueryBuilder]:  http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/SchemaBuilder.html
+[CqlIdentifier]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/core/CqlIdentifier.html

diff --git a/manual/query_builder/condition/README.md b/manual/query_builder/condition/README.md
index a14b1b4..ae5b489 100644
--- a/manual/query_builder/condition/README.md
+++ b/manual/query_builder/condition/README.md

@@ -17,7 +17,7 @@
 `if_()`:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 
 Condition vCondition = Condition.column("v").isEqualTo(literal(1));
 deleteFrom("user")

diff --git a/manual/query_builder/delete/README.md b/manual/query_builder/delete/README.md
index 19359af..8117723 100644
--- a/manual/query_builder/delete/README.md
+++ b/manual/query_builder/delete/README.md

@@ -1,11 +1,11 @@
 ## DELETE
 
-To start a DELETE query, use one of the `deleteFrom` methods in [QueryBuilderDsl]. There are several
+To start a DELETE query, use one of the `deleteFrom` methods in [QueryBuilder]. There are several
 variants depending on whether your table name is qualified, and whether you use case-sensitive
 identifiers or case-insensitive strings:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 
 DeleteSelection delete = deleteFrom("user");
 ```
@@ -141,5 +141,5 @@
 Conditions are a common feature used by UPDATE and DELETE, so they have a
 [dedicated page](../condition) in this manual.
 
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
-[Selector]:        http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/select/Selector.html
+[QueryBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html
+[Selector]:     http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/select/Selector.html

diff --git a/manual/query_builder/insert/README.md b/manual/query_builder/insert/README.md
index 5606580..a6bf16d 100644
--- a/manual/query_builder/insert/README.md
+++ b/manual/query_builder/insert/README.md

@@ -1,11 +1,11 @@
 ## INSERT
 
-To start an INSERT query, use one of the `insertInto` methods in [QueryBuilderDsl]. There are
+To start an INSERT query, use one of the `insertInto` methods in [QueryBuilder]. There are
 several variants depending on whether your table name is qualified, and whether you use
 case-sensitive identifiers or case-insensitive strings:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 
 InsertInto insert = insertInto("user");
 ```
@@ -87,4 +87,4 @@
 
 If you call the method multiple times, the last value will be used.
 
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
+[QueryBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html

diff --git a/manual/query_builder/relation/README.md b/manual/query_builder/relation/README.md
index 80ed83f..5b03cb0 100644
--- a/manual/query_builder/relation/README.md
+++ b/manual/query_builder/relation/README.md

@@ -201,5 +201,5 @@
 execution time; on the other hand, it can be used as a workaround to handle new CQL features that
 are not yet covered by the query builder.
 
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
-[Relation]:        http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/relation/Relation.html
+[QueryBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html
+[Relation]:     http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/relation/Relation.html

diff --git a/manual/query_builder/schema/README.md b/manual/query_builder/schema/README.md
index fba9e41..4a66917 100644
--- a/manual/query_builder/schema/README.md
+++ b/manual/query_builder/schema/README.md

@@ -8,10 +8,10 @@
 * given a Java class that represents a table, view, or user defined type, generate representative
   schema DDL `CREATE` queries.
 
-Here is an example that demonstrates creating a keyspace and a table using [SchemaBuilderDsl]:
+Here is an example that demonstrates creating a keyspace and a table using [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 try (CqlSession session = CqlSession.builder().build()) {
   CreateKeyspace createKs = createKeyspace("cycling").withSimpleStrategy(1);
@@ -44,4 +44,4 @@
 * [function](function/)
 * [aggregate](aggregate/)
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html

diff --git a/manual/query_builder/schema/aggregate/README.md b/manual/query_builder/schema/aggregate/README.md
index 09a8d83..e6f2308 100644
--- a/manual/query_builder/schema/aggregate/README.md
+++ b/manual/query_builder/schema/aggregate/README.md

@@ -1,15 +1,15 @@
 ## Aggregate
 
 Aggregates enable users to apply User-defined functions (UDF) to rows in a data set and combine
-their values into a final result, for example average or standard deviation.  [SchemaBuilderDsl]
+their values into a final result, for example average or standard deviation.  [SchemaBuilder]
 offers API methods for creating and dropping aggregates.
 
 ### Creating an aggregate (CREATE AGGREGATE)
 
-To start a `CREATE AGGREGATE` query, use `createAggregate` in [SchemaBuilderDsl]:
+To start a `CREATE AGGREGATE` query, use `createAggregate` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 CreateAggregateStart create = createAggregate("average");
 ```
@@ -76,4 +76,4 @@
 // DROP AGGREGATE IF EXISTS average
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html

diff --git a/manual/query_builder/schema/function/README.md b/manual/query_builder/schema/function/README.md
index 56717bf..984b2e4 100644
--- a/manual/query_builder/schema/function/README.md
+++ b/manual/query_builder/schema/function/README.md

@@ -1,15 +1,15 @@
 ## Function
 
 User-defined functions (UDF) enable users to create user code written in JSR-232 compliant scripting
-languages that can be evaluated in CQL queries.  [SchemaBuilderDsl] offers API methods for creating
+languages that can be evaluated in CQL queries.  [SchemaBuilder] offers API methods for creating
 and dropping UDFs.
 
 ### Creating a Function (CREATE FUNCTION)
 
-To start a `CREATE FUNCTION` query, use `createFunction` in [SchemaBuilderDsl]:
+To start a `CREATE FUNCTION` query, use `createFunction` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 CreateFunctionStart create = createFunction("log");
 ```
@@ -92,4 +92,4 @@
 // DROP FUNCTION IF EXISTS log
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html

diff --git a/manual/query_builder/schema/index/README.md b/manual/query_builder/schema/index/README.md
index 8624f2c..dcb623c 100644
--- a/manual/query_builder/schema/index/README.md
+++ b/manual/query_builder/schema/index/README.md

@@ -1,15 +1,15 @@
 # Index
 
-An index provides a means of expanding the query capabilities of a table.  [SchemaBuilderDsl] offers
+An index provides a means of expanding the query capabilities of a table.  [SchemaBuilder] offers
 API methods for creating and dropping indices.  Unlike other schema members, there is no mechanism
 to alter an index.
 
 ### Creating an Index (CREATE INDEX)
 
-To start a `CREATE INDEX` query, use `createIndex` in [SchemaBuilderDsl]:
+To start a `CREATE INDEX` query, use `createIndex` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 // an index name is not required
 CreateIndexStart create = createIndex();
@@ -99,4 +99,4 @@
 // DROP INDEX IF EXISTS my_idx
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html

diff --git a/manual/query_builder/schema/keyspace/README.md b/manual/query_builder/schema/keyspace/README.md
index 5a8a434..90ea1a8 100644
--- a/manual/query_builder/schema/keyspace/README.md
+++ b/manual/query_builder/schema/keyspace/README.md

@@ -1,14 +1,14 @@
 ## Keyspace
 
 A keyspace is a top-level namespace that defines a name, replication strategy and configurable
-options. [SchemaBuilderDsl] offers API methods for creating, altering and dropping keyspaces.
+options. [SchemaBuilder] offers API methods for creating, altering and dropping keyspaces.
 
 ### Creating a Keyspace (CREATE KEYSPACE)
 
-To start a `CREATE KEYSPACE` query, use `createKeyspace` in [SchemaBuilderDsl]:
+To start a `CREATE KEYSPACE` query, use `createKeyspace` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 CreateKeyspaceStart create = createKeyspace("cycling");
 ```
@@ -83,6 +83,6 @@
 // DROP KEYSPACE IF EXISTS cycling
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html
 
 

diff --git a/manual/query_builder/schema/materialized_view/README.md b/manual/query_builder/schema/materialized_view/README.md
index 59e2894..f6c1263 100644
--- a/manual/query_builder/schema/materialized_view/README.md
+++ b/manual/query_builder/schema/materialized_view/README.md

@@ -2,15 +2,15 @@
 
 Materialized Views are an experimental feature introduced in Apache Cassandra 3.0 that provide a
 mechanism for server-side denormalization from a base table into a view that is updated when the
-base table is updated. [SchemaBuilderDsl] offers API methods for creating, altering and dropping
+base table is updated. [SchemaBuilder] offers API methods for creating, altering and dropping
 materialized views.
 
 ### Creating a Materialized View (CREATE MATERIALIZED VIEW)
 
-To start a `CREATE MATERIALIZED VIEW` query, use `createMaterializedView` in [SchemaBuilderDsl]:
+To start a `CREATE MATERIALIZED VIEW` query, use `createMaterializedView` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 CreateMaterializedViewStart create = createMaterializedView("cycling", "cyclist_by_age");
 ```
@@ -85,5 +85,5 @@
 // DROP MATERIALIZED VIEW IF EXISTS cyclist_by_age
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]:     http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html
 [RelationStructure]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/schema/RelationStructure.html

diff --git a/manual/query_builder/schema/table/README.md b/manual/query_builder/schema/table/README.md
index cf30d41..c35c693 100644
--- a/manual/query_builder/schema/table/README.md
+++ b/manual/query_builder/schema/table/README.md

@@ -1,14 +1,14 @@
 ## Table
 
-Data in Apache Cassandra is stored in tables.  [SchemaBuilderDsl] offers API methods for creating,
+Data in Apache Cassandra is stored in tables.  [SchemaBuilder] offers API methods for creating,
 altering, and dropping tables.
 
 ### Creating a Table (CREATE TABLE)
 
-To start a `CREATE TABLE` query, use `createTable` in [SchemaBuilderDsl]:
+To start a `CREATE TABLE` query, use `createTable` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 CreateTableStart create = createTable("cycling", "cyclist_name");
 ```
@@ -107,6 +107,6 @@
 // DROP TABLE IF EXISTS cyclist_name
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]:          http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html
 [CreateTableWithOptions]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/schema/CreateTableWithOptions.html
-[AlterTableWithOptions]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/schema/AlterTableWithOptions.html
+[AlterTableWithOptions]:  http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/schema/AlterTableWithOptions.html

diff --git a/manual/query_builder/schema/type/README.md b/manual/query_builder/schema/type/README.md
index 6642e70..dfa236d 100644
--- a/manual/query_builder/schema/type/README.md
+++ b/manual/query_builder/schema/type/README.md

@@ -1,14 +1,14 @@
 ## Type
 
 User-defined types are special types that can associate multiple named fields to a single column. 
-[SchemaBuilderDsl] offers API methods for creating, altering, and dropping types.
+[SchemaBuilder] offers API methods for creating, altering, and dropping types.
 
 ### Creating a Type (CREATE TYPE)
 
-To start a `CREATE TYPE` query, use `createType` in [SchemaBuilderDsl]:
+To start a `CREATE TYPE` query, use `createType` in [SchemaBuilder]:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.*;
 
 CreateTypeStart create = createType("mykeyspace", "address");
 ```
@@ -43,7 +43,7 @@
 ### Using a created Type in Schema Builder API
 
 After creating a UDT, one may wonder how to use it in other schema statements.  To do so, utilize
-`udt(name,frozen)` from [SchemaBuilderDsl], i.e:
+`udt(name,frozen)` from [SchemaBuilder], i.e:
 
 ```java
 CreateTable users = createTable("mykeyspace", "users")
@@ -88,4 +88,4 @@
 // DROP TYPE IF EXISTS address
 ```
 
-[SchemaBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.html
+[SchemaBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.html

diff --git a/manual/query_builder/select/README.md b/manual/query_builder/select/README.md
index b3bc49f..6151585 100644
--- a/manual/query_builder/select/README.md
+++ b/manual/query_builder/select/README.md

@@ -1,11 +1,11 @@
 ## SELECT
 
-Start your SELECT with the `selectFrom` method in [QueryBuilderDsl]. There are several variants
+Start your SELECT with the `selectFrom` method in [QueryBuilder]. There are several variants
 depending on whether your table name is qualified, and whether you use case-sensitive identifiers or
 case-insensitive strings:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 
 SelectFrom selectUser = selectFrom("user");
 ```
@@ -391,5 +391,5 @@
 // SELECT * FROM user ALLOW FILTERING
 ```
 
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
-[Selector]:        http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/select/Selector.html
+[QueryBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html
+[Selector]:     http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/select/Selector.html

diff --git a/manual/query_builder/term/README.md b/manual/query_builder/term/README.md
index 0214e33..160572f 100644
--- a/manual/query_builder/term/README.md
+++ b/manual/query_builder/term/README.md

@@ -6,7 +6,7 @@
   selectors;
 * as the right operand of [relations](../relation).
 
-To create a term, call one of the factory methods in [QueryBuilderDsl]:
+To create a term, call one of the factory methods in [QueryBuilder]:
 
 ### Literals
 
@@ -105,5 +105,5 @@
 execution time; on the other hand, it can be used as a workaround to handle new CQL features that
 are not yet covered by the query builder.
 
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
-[CodecRegistry]:   http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.html
\ No newline at end of file
+[QueryBuilder]:  http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html
+[CodecRegistry]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.html
\ No newline at end of file

diff --git a/manual/query_builder/update/README.md b/manual/query_builder/update/README.md
index a57708c..19d0b43 100644
--- a/manual/query_builder/update/README.md
+++ b/manual/query_builder/update/README.md

@@ -1,11 +1,11 @@
 ## UPDATE
 
-To start an UPDATE query, use one of the `update` methods in [QueryBuilderDsl]. There are several
+To start an UPDATE query, use one of the `update` methods in [QueryBuilder]. There are several
 variants depending on whether your table name is qualified, and whether you use case-sensitive
 identifiers or case-insensitive strings:
 
 ```java
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.*;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.*;
 
 UpdateStart update = update("user");
 ```
@@ -222,5 +222,5 @@
 Conditions are a common feature used by UPDATE and DELETE, so they have a
 [dedicated page](../condition) in this manual.
 
-[QueryBuilderDsl]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilderDsl.html
-[Assignment]:      http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/update/Assignment.html
+[QueryBuilder]: http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/QueryBuilder.html
+[Assignment]:   http://docs.datastax.com/en/drivers/java/4.0/com/datastax/oss/driver/api/query-builder/update/Assignment.html

diff --git a/query-builder/revapi.json b/query-builder/revapi.json
index 5567afe..07d232e 100644
--- a/query-builder/revapi.json
+++ b/query-builder/revapi.json

@@ -104,6 +104,26 @@
         "newArchive": "com.datastax.oss:java-driver-query-builder:jar:4.0.0-beta3",
         "elementKind": "parameter",
         "justification": "Fix nullability annotations on query builder range selectors"
+      },
+      {
+        "code": "java.class.removed",
+        "old": "class com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl",
+        "oldArchive": "com.datastax.oss:java-driver-query-builder:jar:4.0.0-beta3",
+        "justification": "JAVA-2151: Drop \"Dsl\" suffix from query builder main classes"
+      },
+      {
+        "code": "java.class.removed",
+        "old": "class com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl",
+        "oldArchive": "com.datastax.oss:java-driver-query-builder:jar:4.0.0-beta3",
+        "justification": "JAVA-2151: Drop \"Dsl\" suffix from query builder main classes"
+      },
+      {
+        "code": "java.method.parameterTypeChanged",
+        "old": "parameter SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions<SelfT extends com.datastax.oss.driver.api.querybuilder.schema.RelationOptions<SelfT extends com.datastax.oss.driver.api.querybuilder.schema.RelationOptions<SelfT>>>::withCaching(boolean, ===com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.RowsPerPartition===)",
+        "new": "parameter SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions<SelfT extends com.datastax.oss.driver.api.querybuilder.schema.RelationOptions<SelfT extends com.datastax.oss.driver.api.querybuilder.schema.RelationOptions<SelfT>>>::withCaching(boolean, ===com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition===)",
+        "oldArchive": "com.datastax.oss:java-driver-query-builder:jar:4.0.0-beta3",
+        "newArchive": "com.datastax.oss:java-driver-query-builder:jar:4.0.0-rc1-SNAPSHOT",
+        "justification": "JAVA-2151: Drop \"Dsl\" suffix from query builder main classes"
       }
     ]
   }

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilderDsl.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java
similarity index 99%
rename from query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilderDsl.java
rename to query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java
index c71f9a5..62ade2a 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilderDsl.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java

@@ -49,7 +49,7 @@
 import java.util.Arrays;
 
 /** A Domain-Specific Language to build CQL queries using Java code. */
-public class QueryBuilderDsl {
+public class QueryBuilder {
 
   /** Starts a SELECT query for a qualified table. */
   @NonNull

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/Raw.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/Raw.java
index 4a31d4c..453ee2f 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/Raw.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/Raw.java

@@ -25,7 +25,7 @@
  * A raw CQL snippet that will be appended to the query as-is, without any syntax checking or
  * escaping.
  *
- * <p>To build an instance of this type, use {@link QueryBuilderDsl#raw(String)}.
+ * <p>To build an instance of this type, use {@link QueryBuilder#raw(String)}.
  *
  * <p>It should be used with caution, as it's possible to generate invalid CQL that will fail at
  * execution time; on the other hand, it can be used as a workaround to handle new CQL features that

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java
similarity index 99%
rename from query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.java
rename to query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java
index 1205dc3..e6f63fe 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilderDsl.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java

@@ -58,7 +58,7 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 /** A Domain-Specific Language to build CQL DDL queries using Java code. */
-public class SchemaBuilderDsl {
+public class SchemaBuilder {
 
   /** Starts a CREATE KEYSPACE query. */
   @NonNull
@@ -661,7 +661,7 @@
   /**
    * Specifies the rows_per_partition configuration for table caching options.
    *
-   * @see RelationOptions#withCaching(boolean, SchemaBuilderDsl.RowsPerPartition)
+   * @see RelationOptions#withCaching(boolean, SchemaBuilder.RowsPerPartition)
    */
   public static class RowsPerPartition {
 

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java
index 7ee8805..e193e22 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.condition;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import com.datastax.oss.driver.internal.querybuilder.condition.DefaultConditionBuilder;
 import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnComponentLeftOperand;
@@ -147,7 +147,7 @@
   /**
    * Adds a raw CQL snippet as a condition.
    *
-   * <p>This is the equivalent of creating a condition with {@link QueryBuilderDsl#raw(String)} and
+   * <p>This is the equivalent of creating a condition with {@link QueryBuilder#raw(String)} and
    * passing it to {@link #if_(Condition)}.
    *
    * <p>The contents will be appended to the query as-is, without any syntax checking or escaping.
@@ -155,10 +155,10 @@
    * fail at execution time; on the other hand, it can be used as a workaround to handle new CQL
    * features that are not yet covered by the query builder.
    *
-   * @see QueryBuilderDsl#raw(String)
+   * @see QueryBuilder#raw(String)
    */
   @NonNull
   default SelfT ifRaw(@NonNull String raw) {
-    return if_(QueryBuilderDsl.raw(raw));
+    return if_(QueryBuilder.raw(raw));
   }
 }

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java
index ae01f19..8f325ce 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java

@@ -17,7 +17,7 @@
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.querybuilder.BindMarker;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause;
 import com.datastax.oss.driver.api.querybuilder.select.Selector;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
@@ -143,18 +143,18 @@
   /**
    * Specifies an element to delete as a raw CQL snippet.
    *
-   * <p>This is a shortcut for {@link #selector(Selector) selector(QueryBuilderDsl.raw(raw))}.
+   * <p>This is a shortcut for {@link #selector(Selector) selector(QueryBuilder.raw(raw))}.
    *
    * <p>The contents will be appended to the query as-is, without any syntax checking or escaping.
    * This method should be used with caution, as it's possible to generate invalid CQL that will
    * fail at execution time; on the other hand, it can be used as a workaround to handle new CQL
    * features that are not yet covered by the query builder.
    *
-   * @see QueryBuilderDsl#raw(String)
+   * @see QueryBuilder#raw(String)
    */
   @NonNull
   default DeleteSelection raw(@NonNull String raw) {
-    return selector(QueryBuilderDsl.raw(raw));
+    return selector(QueryBuilder.raw(raw));
   }
 
   /**

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java
index 80c8687..626ea69 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.relation;
 
 import com.datastax.oss.driver.api.querybuilder.BindMarker;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -39,7 +39,7 @@
    */
   @NonNull
   default ResultT in(@NonNull Iterable<Term> alternatives) {
-    return build(" IN ", QueryBuilderDsl.tuple(alternatives));
+    return build(" IN ", QueryBuilder.tuple(alternatives));
   }
 
   /** Var-arg equivalent of {@link #in(Iterable)} . */

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java
index cf7ac64..917ef93 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.relation;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import com.datastax.oss.driver.internal.core.CqlIdentifiers;
 import com.datastax.oss.driver.internal.querybuilder.DefaultRaw;
@@ -234,7 +234,7 @@
   /**
    * Adds a raw CQL snippet as a relation.
    *
-   * <p>This is the equivalent of creating a relation with {@link QueryBuilderDsl#raw(String)} and
+   * <p>This is the equivalent of creating a relation with {@link QueryBuilder#raw(String)} and
    * passing it to {@link #where(Relation)}.
    *
    * <p>The contents will be appended to the query as-is, without any syntax checking or escaping.

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java
index fad26f1..4aae708 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface AlterTableAddColumn {
@@ -26,7 +26,7 @@
    * Adds a column definition in the ALTER TABLE statement.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   AlterTableAddColumnEnd addColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType);
@@ -44,7 +44,7 @@
    * Adds a static column definition in the ALTER TABLE statement.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   AlterTableAddColumnEnd addStaticColumn(

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java
index d641ce6..7306508 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.querybuilder.BuildableQuery;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface AlterTableStart
@@ -36,7 +36,7 @@
    * Completes ALTER TABLE specifying the the type of a column should be changed.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   BuildableQuery alterColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java
index 27701ee..67c2c74 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.querybuilder.BuildableQuery;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface AlterTypeStart extends AlterTypeRenameField {
@@ -28,7 +28,7 @@
    * Completes ALTER TYPE specifying the the type of a field should be changed.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   BuildableQuery alterField(@NonNull CqlIdentifier fieldName, @NonNull DataType dataType);
@@ -46,7 +46,7 @@
    * Completes ALTER TYPE by adding a field definition in the ALTER TYPE statement.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   BuildableQuery addField(@NonNull CqlIdentifier fieldName, @NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java
index 39de627..bd615c4 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface CreateAggregateStart {
@@ -42,7 +42,7 @@
    * <p>Parameter keys are added in the order of their declaration.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateAggregateStart withParameter(@NonNull DataType paramType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java
index 31d8102..4a128ba 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface CreateAggregateStateFunc {
@@ -28,7 +28,7 @@
    * the state function.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateAggregateEnd withSType(@NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java
index 3e69032..9ece2c1 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface CreateFunctionStart {
@@ -43,7 +43,7 @@
    * <p>Parameter keys are added in the order of their declaration.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateFunctionStart withParameter(@NonNull CqlIdentifier paramName, @NonNull DataType paramType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java
index 8beba9f..f085228 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface CreateFunctionWithNullOption {
@@ -27,7 +27,7 @@
    * returned from the function.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateFunctionWithType returnsType(@NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java
index 5be5271..78c1268 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.querybuilder.BuildableQuery;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface CreateTable extends BuildableQuery, OngoingPartitionKey, CreateTableWithOptions {
@@ -33,7 +33,7 @@
    * <p>Clustering key columns are added in the order of their declaration.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateTable withClusteringColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType);
@@ -51,7 +51,7 @@
    * Adds a column definition in the CREATE TABLE statement.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateTable withColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType);
@@ -72,7 +72,7 @@
    * #withColumn(CqlIdentifier, DataType) addColumn} call).
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateTable withStaticColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java
index b6be3b9..dc5b724 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface OngoingCreateType {
@@ -29,7 +29,7 @@
    * <p>Fields keys are added in the order of their declaration.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateType withField(@NonNull CqlIdentifier identifier, @NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java
index 1987fd8..6314638 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java

@@ -18,7 +18,7 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public interface OngoingPartitionKey {
@@ -32,7 +32,7 @@
    * <p>Partition keys are added in the order of their declaration.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link SchemaBuilderDsl#udt(CqlIdentifier, boolean)}.
+   * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}.
    */
   @NonNull
   CreateTable withPartitionKey(@NonNull CqlIdentifier columnName, @NonNull DataType dataType);

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java
index 022cee2..271fa99 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java

@@ -15,9 +15,9 @@
  */
 package com.datastax.oss.driver.api.querybuilder.schema;
 
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.RowsPerPartition;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition;
 
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
 import com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -79,9 +79,9 @@
   /**
    * Defines the compaction strategy to use.
    *
-   * @see SchemaBuilderDsl#sizeTieredCompactionStrategy()
-   * @see SchemaBuilderDsl#leveledCompactionStrategy()
-   * @see SchemaBuilderDsl#timeWindowCompactionStrategy()
+   * @see SchemaBuilder#sizeTieredCompactionStrategy()
+   * @see SchemaBuilder#leveledCompactionStrategy()
+   * @see SchemaBuilder#timeWindowCompactionStrategy()
    */
   @NonNull
   default SelfT withCompaction(@NonNull CompactionStrategy<?> compactionStrategy) {

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java
index f4f5ed4..df58d75 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java

@@ -22,7 +22,7 @@
 import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -272,7 +272,7 @@
    * selection, like a nested UDT).
    *
    * <p>In other words, this is a shortcut for {{@link #field(Selector, CqlIdentifier)
-   * field(QueryBuilderDsl.column(udtColumnId), fieldId)}.
+   * field(QueryBuilder.column(udtColumnId), fieldId)}.
    *
    * @see Selector#field(CqlIdentifier, CqlIdentifier)
    */
@@ -311,7 +311,7 @@
    * Shortcut for element selection when the target collection is a simple column.
    *
    * <p>In other words, this is the equivalent of {@link #element(Selector, Term)
-   * element(QueryBuilderDsl.column(collection), index)}.
+   * element(QueryBuilder.column(collection), index)}.
    *
    * @see Selector#element(CqlIdentifier, Term)
    */
@@ -481,7 +481,7 @@
    * (map<int,text>){a:b,c:d}}.
    *
    * <p>To create the data types, use the constants and static methods in {@link DataTypes}, or
-   * {@link QueryBuilderDsl#udt(CqlIdentifier)}.
+   * {@link QueryBuilder#udt(CqlIdentifier)}.
    *
    * <p>This is a shortcut for {@link #selector(Selector) selector(Selector.mapOf(elementSelectors,
    * keyType, valueType))}.
@@ -666,7 +666,7 @@
    * Casts a selector to a type, as in {@code SELECT CAST(a AS double)}.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link QueryBuilderDsl#udt(CqlIdentifier)}.
+   * {@link QueryBuilder#udt(CqlIdentifier)}.
    *
    * <p>This is a shortcut for {@link #selector(Selector) selector(Selector.function(keyspaceId,
    * functionId, arguments))}.
@@ -747,7 +747,7 @@
    *
    * @throws CodecNotFoundException if there is no default CQL mapping for the Java type of {@code
    *     value}.
-   * @see QueryBuilderDsl#literal(Object)
+   * @see QueryBuilder#literal(Object)
    */
   @NonNull
   default Select literal(@Nullable Object value) {
@@ -764,7 +764,7 @@
    * @see DriverContext#getCodecRegistry()
    * @throws CodecNotFoundException if {@code codecRegistry} does not contain any codec that can
    *     handle {@code value}.
-   * @see QueryBuilderDsl#literal(Object, CodecRegistry)
+   * @see QueryBuilder#literal(Object, CodecRegistry)
    */
   @NonNull
   default Select literal(@Nullable Object value, @NonNull CodecRegistry codecRegistry) {
@@ -777,11 +777,11 @@
    * <p>This is an alternative to {@link #literal(Object)} for custom type mappings. The value will
    * be turned into a string with {@link TypeCodec#format(Object)}, and inlined in the query.
    *
-   * @see QueryBuilderDsl#literal(Object, TypeCodec)
+   * @see QueryBuilder#literal(Object, TypeCodec)
    */
   @NonNull
   default <T> Select literal(@Nullable T value, @Nullable TypeCodec<T> codec) {
-    return selector(QueryBuilderDsl.literal(value, codec));
+    return selector(QueryBuilder.literal(value, codec));
   }
 
   /**
@@ -793,11 +793,11 @@
    * features that are not yet covered by the query builder.
    *
    * <p>This is a shortcut for {@link #selector(Selector)
-   * selector(QueryBuilderDsl.raw(rawExpression))}.
+   * selector(QueryBuilder.raw(rawExpression))}.
    */
   @NonNull
   default Select raw(@NonNull String rawExpression) {
-    return selector(QueryBuilderDsl.raw(rawExpression));
+    return selector(QueryBuilder.raw(rawExpression));
   }
 
   /**

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java
index af3da19..2b8f008 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
 import com.datastax.oss.driver.api.querybuilder.BindMarker;
 import com.datastax.oss.driver.api.querybuilder.BuildableQuery;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause;
 import com.datastax.oss.driver.internal.core.CqlIdentifiers;
 import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
@@ -156,8 +156,8 @@
   /**
    * Adds a LIMIT clause to this query with a bind marker.
    *
-   * <p>To create the argument, use one of the factory methods in {@link QueryBuilderDsl}, for
-   * example {@link QueryBuilderDsl#bindMarker() bindMarker()}.
+   * <p>To create the argument, use one of the factory methods in {@link QueryBuilder}, for example
+   * {@link QueryBuilder#bindMarker() bindMarker()}.
    *
    * <p>If this method or {@link #limit(int)} is called multiple times, the last value is used.
    * {@code null} can be passed to cancel a previous limit.
@@ -177,8 +177,8 @@
   /**
    * Adds a PER PARTITION LIMIT clause to this query with a bind marker.
    *
-   * <p>To create the argument, use one of the factory methods in {@link QueryBuilderDsl}, for
-   * example {@link QueryBuilderDsl#bindMarker() bindMarker()}.
+   * <p>To create the argument, use one of the factory methods in {@link QueryBuilder}, for example
+   * {@link QueryBuilder#bindMarker() bindMarker()}.
    *
    * <p>If this method or {@link #perPartitionLimit(int)} is called multiple times, the last value
    * is used. {@code null} can be passed to cancel a previous limit.

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Selector.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Selector.java
index b0a6ae3..f3654f7 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Selector.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Selector.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.querybuilder.CqlSnippet;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import com.datastax.oss.driver.internal.querybuilder.ArithmeticOperator;
 import com.datastax.oss.driver.internal.querybuilder.select.AllSelector;
@@ -351,7 +351,7 @@
    * (map<int,text>){a:b,c:d}}.
    *
    * <p>To create the data types, use the constants and static methods in {@link DataTypes}, or
-   * {@link QueryBuilderDsl#udt(CqlIdentifier)}.
+   * {@link QueryBuilder#udt(CqlIdentifier)}.
    *
    * @see #mapOf(Map)
    */
@@ -367,7 +367,7 @@
    * Provides a type hint for a selector, as in {@code SELECT (double)1/3}.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link QueryBuilderDsl#udt(CqlIdentifier)}.
+   * {@link QueryBuilder#udt(CqlIdentifier)}.
    */
   @NonNull
   static Selector typeHint(@NonNull Selector selector, @NonNull DataType targetType) {
@@ -490,7 +490,7 @@
    * Casts a selector to a type, as in {@code SELECT CAST(a AS double)}.
    *
    * <p>To create the data type, use the constants and static methods in {@link DataTypes}, or
-   * {@link QueryBuilderDsl#udt(CqlIdentifier)}.
+   * {@link QueryBuilder#udt(CqlIdentifier)}.
    *
    * @throws IllegalArgumentException if the selector is aliased.
    */

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/term/Term.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/term/Term.java
index 1e3c1c8..5daa05a 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/term/Term.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/term/Term.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.querybuilder.BuildableQuery;
 import com.datastax.oss.driver.api.querybuilder.CqlSnippet;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.relation.ArithmeticRelationBuilder;
 import com.datastax.oss.driver.api.querybuilder.select.Selector;
 
@@ -33,9 +33,8 @@
  *   <li>as the right operand of a {@link ArithmeticRelationBuilder#isEqualTo(Term) relation}.
  * </ul>
  *
- * To build instances of this type, use the factory methods in {@link QueryBuilderDsl}, such as
- * {@link QueryBuilderDsl#literal(Object) literal}, {@link QueryBuilderDsl#tuple(Iterable) tuple},
- * etc.
+ * To build instances of this type, use the factory methods in {@link QueryBuilder}, such as {@link
+ * QueryBuilder#literal(Object) literal}, {@link QueryBuilder#tuple(Iterable) tuple}, etc.
  */
 public interface Term extends CqlSnippet {
 

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/Assignment.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/Assignment.java
index f52104a..d918c8a 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/Assignment.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/Assignment.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.querybuilder.BuildableQuery;
 import com.datastax.oss.driver.api.querybuilder.CqlSnippet;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnComponentLeftOperand;
 import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnLeftOperand;
@@ -109,7 +109,7 @@
   /** Increments a counter by 1, as in {@code SET c+=1} . */
   @NonNull
   static Assignment increment(@NonNull CqlIdentifier columnId) {
-    return increment(columnId, QueryBuilderDsl.literal(1));
+    return increment(columnId, QueryBuilder.literal(1));
   }
 
   /** Shortcut for {@link #increment(CqlIdentifier) CqlIdentifier.fromCql(columnName)}. */
@@ -136,7 +136,7 @@
   /** Decrements a counter by 1, as in {@code SET c-=1} . */
   @NonNull
   static Assignment decrement(@NonNull CqlIdentifier columnId) {
-    return decrement(columnId, QueryBuilderDsl.literal(1));
+    return decrement(columnId, QueryBuilder.literal(1));
   }
 
   /** Shortcut for {@link #decrement(CqlIdentifier) CqlIdentifier.fromCql(columnName)}. */

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/OngoingAssignment.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/OngoingAssignment.java
index 8ac5714..67af1f0 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/OngoingAssignment.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/update/OngoingAssignment.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.update;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Arrays;
@@ -156,13 +156,13 @@
    * Increments a counter by 1, as in {@code SET c+=1} .
    *
    * <p>This is a shortcut for {@link #increment(CqlIdentifier, Term)} increment(columnId,
-   * QueryBuilderDsl.literal(1))}.
+   * QueryBuilder.literal(1))}.
    *
    * @see Assignment#increment(CqlIdentifier)
    */
   @NonNull
   default UpdateWithAssignments increment(@NonNull CqlIdentifier columnId) {
-    return increment(columnId, QueryBuilderDsl.literal(1));
+    return increment(columnId, QueryBuilder.literal(1));
   }
 
   /**
@@ -207,7 +207,7 @@
    */
   @NonNull
   default UpdateWithAssignments decrement(@NonNull CqlIdentifier columnId) {
-    return decrement(columnId, QueryBuilderDsl.literal(1));
+    return decrement(columnId, QueryBuilder.literal(1));
   }
 
   /**

diff --git a/query-builder/src/main/java/com/datastax/oss/driver/internal/querybuilder/insert/DefaultInsert.java b/query-builder/src/main/java/com/datastax/oss/driver/internal/querybuilder/insert/DefaultInsert.java
index 68e41a8..32c81cd 100644
--- a/query-builder/src/main/java/com/datastax/oss/driver/internal/querybuilder/insert/DefaultInsert.java
+++ b/query-builder/src/main/java/com/datastax/oss/driver/internal/querybuilder/insert/DefaultInsert.java

@@ -19,7 +19,7 @@
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.cql.SimpleStatementBuilder;
 import com.datastax.oss.driver.api.querybuilder.BindMarker;
-import com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl;
+import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.insert.Insert;
 import com.datastax.oss.driver.api.querybuilder.insert.InsertInto;
 import com.datastax.oss.driver.api.querybuilder.insert.JsonInsert;
@@ -80,7 +80,7 @@
     return new DefaultInsert(
         keyspace,
         table,
-        QueryBuilderDsl.literal(json),
+        QueryBuilder.literal(json),
         missingJsonBehavior,
         ImmutableMap.of(),
         timestamp,

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionTest.java
index b395eec..0629696 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.condition;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.deleteFrom;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentConditionTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentConditionTest.java
index e8a0a8a..2a75bba 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentConditionTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentConditionTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.delete;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.deleteFrom;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentRelationTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentRelationTest.java
index 0403193..fa8afdf 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentRelationTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteFluentRelationTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.delete;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
 
 import com.datastax.oss.driver.api.querybuilder.relation.RelationTest;
 import com.datastax.oss.driver.api.querybuilder.select.SelectFluentRelationTest;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteIdempotenceTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteIdempotenceTest.java
index 4a495b1..5d9cb05 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteIdempotenceTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteIdempotenceTest.java

@@ -16,11 +16,11 @@
 package com.datastax.oss.driver.api.querybuilder.delete;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.deleteFrom;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.function;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.function;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelectorTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelectorTest.java
index f59879f..7c3f768 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelectorTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelectorTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.delete;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.deleteFrom;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteTimestampTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteTimestampTest.java
index 01c6ac6..27c3436 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteTimestampTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteTimestampTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.delete;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/InsertIdempotenceTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/InsertIdempotenceTest.java
index 990e0e7..57fd401 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/InsertIdempotenceTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/InsertIdempotenceTest.java

@@ -16,12 +16,12 @@
 package com.datastax.oss.driver.api.querybuilder.insert;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.add;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.function;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.insertInto;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.tuple;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.add;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.function;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.tuple;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsertTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsertTest.java
index e78a646..5bfd7ee 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsertTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsertTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.insert;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.insertInto;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/RegularInsertTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/RegularInsertTest.java
index 671afa5..c445411 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/RegularInsertTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/RegularInsertTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.insert;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.insertInto;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/RelationTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/RelationTest.java
index a00732f..f3ff81e 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/RelationTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/RelationTest.java

@@ -16,10 +16,10 @@
 package com.datastax.oss.driver.api.querybuilder.relation;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.tuple;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.tuple;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/TermTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/TermTest.java
index 11c7ea1..d46bd69 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/TermTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/relation/TermTest.java

@@ -16,25 +16,25 @@
 package com.datastax.oss.driver.api.querybuilder.relation;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.add;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.currentDate;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.currentTime;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.currentTimeUuid;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.currentTimestamp;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.function;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.maxTimeUuid;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.minTimeUuid;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.multiply;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.negate;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.now;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.remainder;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.subtract;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.toDate;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.toTimestamp;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.toUnixTimestamp;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.typeHint;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.add;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.currentDate;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.currentTime;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.currentTimeUuid;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.currentTimestamp;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.function;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.maxTimeUuid;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.minTimeUuid;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.multiply;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.negate;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.now;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.remainder;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.subtract;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.toDate;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.toTimestamp;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.toUnixTimestamp;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.typeHint;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.data.TupleValue;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterKeyspaceTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterKeyspaceTest.java
index 43ed98a..6d56be7 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterKeyspaceTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterKeyspaceTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.alterKeyspace;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.alterKeyspace;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterMaterializedViewTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterMaterializedViewTest.java
index 9a4da72..360b6f3 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterMaterializedViewTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterMaterializedViewTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.alterMaterializedView;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.alterMaterializedView;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableTest.java
index 907e8ef..16db985 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.alterTable;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.alterTable;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeTest.java
index 3e5bdbb..6ae49c8 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.alterType;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.alterType;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateTest.java
index b10f3ae..f9dcf41 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.tuple;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createAggregate;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.tuple;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createAggregate;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionTest.java
index ec58a54..02a91fd 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createFunction;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.udt;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createFunction;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.udt;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexTest.java
index df0eda3..d654219 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createIndex;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createIndex;
 
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceTest.java
index 89e0edd..3c067aa 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createKeyspace;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createKeyspace;
 
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewTest.java
index 8a8912a..88ff1da 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createMaterializedView;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createMaterializedView;
 
 import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableTest.java
index 0db25b0..16f4c2e 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableTest.java

@@ -16,13 +16,13 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createTable;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.udt;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createTable;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.udt;
 
 import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl;
-import com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.RowsPerPartition;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition;
 import com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.CompactionWindowUnit;
 import com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.TimestampResolution;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
@@ -261,7 +261,7 @@
                 .withPartitionKey("k", DataTypes.INT)
                 .withColumn("v", DataTypes.TEXT)
                 .withCompaction(
-                    SchemaBuilderDsl.sizeTieredCompactionStrategy()
+                    SchemaBuilder.sizeTieredCompactionStrategy()
                         .withBucketHigh(1.6)
                         .withBucketLow(0.6)
                         .withColdReadsToOmit(0.1)
@@ -284,7 +284,7 @@
                 .withPartitionKey("k", DataTypes.INT)
                 .withColumn("v", DataTypes.TEXT)
                 .withCompaction(
-                    SchemaBuilderDsl.leveledCompactionStrategy()
+                    SchemaBuilder.leveledCompactionStrategy()
                         .withSSTableSizeInMB(110)
                         .withTombstoneCompactionIntervalInSeconds(3600)))
         .hasCql(
@@ -298,7 +298,7 @@
                 .withPartitionKey("k", DataTypes.INT)
                 .withColumn("v", DataTypes.TEXT)
                 .withCompaction(
-                    SchemaBuilderDsl.timeWindowCompactionStrategy()
+                    SchemaBuilder.timeWindowCompactionStrategy()
                         .withCompactionWindow(10, CompactionWindowUnit.DAYS)
                         .withTimestampResolution(TimestampResolution.MICROSECONDS)
                         .withUnsafeAggressiveSSTableExpiration(false)))

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeTest.java
index 7ac7943..7015d49 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.createType;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.udt;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.createType;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.udt;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropAggregateTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropAggregateTest.java
index ae622c4..5af9442 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropAggregateTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropAggregateTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropAggregate;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropAggregate;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropFunctionTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropFunctionTest.java
index 10b81c0..6a50f12 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropFunctionTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropFunctionTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropFunction;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropFunction;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropIndexTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropIndexTest.java
index 55c435b..46efe7c 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropIndexTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropIndexTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropIndex;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropIndex;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropKeyspaceTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropKeyspaceTest.java
index 6e12000..fa84c4e 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropKeyspaceTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropKeyspaceTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropKeyspace;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropKeyspace;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropMaterializedViewTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropMaterializedViewTest.java
index 94a059a..a323de0 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropMaterializedViewTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropMaterializedViewTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropMaterializedView;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropMaterializedView;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTableTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTableTest.java
index a0fe53e..0a98607 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTableTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTableTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropTable;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropTable;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTypeTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTypeTest.java
index 43cb72a..cb9613f 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTypeTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/DropTypeTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.schema;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.SchemaBuilderDsl.dropType;
+import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.dropType;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectAllowFilteringTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectAllowFilteringTest.java
index ae58744..79c89fe 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectAllowFilteringTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectAllowFilteringTest.java

@@ -16,7 +16,7 @@
 package com.datastax.oss.driver.api.querybuilder.select;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectFluentRelationTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectFluentRelationTest.java
index 78693ad..884454d 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectFluentRelationTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectFluentRelationTest.java

@@ -16,10 +16,10 @@
 package com.datastax.oss.driver.api.querybuilder.select;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.tuple;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.tuple;
 
 import com.datastax.oss.driver.api.querybuilder.relation.RelationTest;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectGroupByTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectGroupByTest.java
index 3912550..12d6d2e 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectGroupByTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectGroupByTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.select;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectLimitTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectLimitTest.java
index 53f8369..cba2e83 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectLimitTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectLimitTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.select;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectOrderingTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectOrderingTest.java
index d5b1147..348c735 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectOrderingTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectOrderingTest.java

@@ -18,8 +18,8 @@
 import static com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder.ASC;
 import static com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder.DESC;
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
 
 import com.datastax.oss.driver.api.querybuilder.relation.Relation;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectSelectorTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectSelectorTest.java
index c5d981b..bd32634 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectSelectorTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectSelectorTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.select;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.selectFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentAssignmentTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentAssignmentTest.java
index 22872e0..184ad2e 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentAssignmentTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentAssignmentTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.update;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.update;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.update;
 
 import com.datastax.oss.driver.api.querybuilder.Literal;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentConditionTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentConditionTest.java
index efbcd66..8a56243 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentConditionTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentConditionTest.java

@@ -16,9 +16,9 @@
 package com.datastax.oss.driver.api.querybuilder.update;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.update;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.update;
 
 import org.junit.Test;
 

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentRelationTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentRelationTest.java
index f726056..86559ea 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentRelationTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateFluentRelationTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.update;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.update;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.update;
 
 import com.datastax.oss.driver.api.querybuilder.relation.RelationTest;
 import com.datastax.oss.driver.api.querybuilder.select.SelectFluentRelationTest;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateIdempotenceTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateIdempotenceTest.java
index 869f5d2..1f42448 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateIdempotenceTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateIdempotenceTest.java

@@ -16,11 +16,11 @@
 package com.datastax.oss.driver.api.querybuilder.update;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.function;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.literal;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.raw;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.update;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.function;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.raw;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.update;
 
 import java.util.Arrays;
 import org.junit.Test;

diff --git a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateTimestampTest.java b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateTimestampTest.java
index f808a9f..6ae165b 100644
--- a/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateTimestampTest.java
+++ b/query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/update/UpdateTimestampTest.java

@@ -16,8 +16,8 @@
 package com.datastax.oss.driver.api.querybuilder.update;
 
 import static com.datastax.oss.driver.api.querybuilder.Assertions.assertThat;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.bindMarker;
-import static com.datastax.oss.driver.api.querybuilder.QueryBuilderDsl.update;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.update;
 
 import org.junit.Test;
commit	9150b02e86578d8bb93e37a63c0ab61707e8a7b7	[log] [tgz]
author	Olivier Michallat <olim7t@users.noreply.github.com>	Tue Feb 12 05:35:56 2019 -0800
committer	Alexandre Dutra <adutra@users.noreply.github.com>	Tue Feb 12 14:35:56 2019 +0100
tree	afc982f3ada522a77212bb869e3cb90393c292ff
parent	2177de63e946f3de28437f71cdcf1a6b407f84b9 [diff]