diff --git a/modules/guides/pages/bulk-operations.adoc b/modules/guides/pages/bulk-operations.adoc
index 3a08e4f1b..5871e15a2 100644
--- a/modules/guides/pages/bulk-operations.adoc
+++ b/modules/guides/pages/bulk-operations.adoc
@@ -138,7 +138,7 @@ To read multiple documents in Couchbase perform a bulk `get` operation.
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 Use the `cbc cat` command to retrieve multiple documents by their IDs. 
diff --git a/modules/guides/pages/connect.adoc b/modules/guides/pages/connect.adoc
index 974a27ed7..458fcd63d 100644
--- a/modules/guides/pages/connect.adoc
+++ b/modules/guides/pages/connect.adoc
@@ -53,7 +53,7 @@ To connect to a standalone or Docker installation with _unencrypted_ network acc
 
 [{tabs}]
 ====
-cbc::
+CLI::
 + 
 -- 
 Most `cbc` sub-commands will require some form of authentication to access a cluster or perform operations on data within a bucket.
@@ -189,7 +189,7 @@ Before using X.509 certificate based authentication, you should run through the
 
 [{tabs}]
 ====
-cbc::
+CLI::
 + 
 -- 
 . To securely connect to Couchbase Server using `cbc`, pass `-U` for the connection URL immediately after a sub-command.
diff --git a/modules/guides/pages/creating-data.adoc b/modules/guides/pages/creating-data.adoc
index 9530111d5..a9972a8c3 100644
--- a/modules/guides/pages/creating-data.adoc
+++ b/modules/guides/pages/creating-data.adoc
@@ -31,7 +31,7 @@ To create a single document in Couchbase, perform an insert operation.
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 . Create a structured JSON document to insert in the database.
@@ -185,7 +185,7 @@ To specify further parameters for the inserted document, such as expiry, add the
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 . Create a structured document object containing your data.
diff --git a/modules/guides/pages/deleting-data.adoc b/modules/guides/pages/deleting-data.adoc
index 84e93a196..509dc2e82 100644
--- a/modules/guides/pages/deleting-data.adoc
+++ b/modules/guides/pages/deleting-data.adoc
@@ -27,7 +27,7 @@ To delete a specific field within a document, perform a _Sub-Document_ remove op
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 Use the `cbc rm` command to delete a document from the database.
@@ -141,7 +141,7 @@ To delete a specific field within a document you can perform a _Sub-Document_ re
 
 [{tabs}]
 ====
-cbc-subdoc::
+CLI::
 +
 --
 . Connect to the `cbc-subdoc` interactive shell.
diff --git a/modules/guides/pages/reading-data.adoc b/modules/guides/pages/reading-data.adoc
index db7d80dbe..692ee1ab1 100644
--- a/modules/guides/pages/reading-data.adoc
+++ b/modules/guides/pages/reading-data.adoc
@@ -30,7 +30,7 @@ To read a single document in Couchbase, perform a get operation.
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 Use the `cbc cat` command to retrieve a document by ID and output its data.
@@ -180,7 +180,7 @@ To specify further parameters, such as expiry, add options to the get operation.
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 Use the `cbc cat` command to retrieve a document by ID and pass options as required.
@@ -325,7 +325,7 @@ To fetch a specific field inside a document, you can perform a sub-document get
 
 [{tabs}]
 ====
-cbc-subdoc::
+CLI::
 +
 --
 . Connect to the `cbc-subdoc` interactive shell.
diff --git a/modules/guides/pages/updating-data.adoc b/modules/guides/pages/updating-data.adoc
index cb966e334..d21e573c0 100644
--- a/modules/guides/pages/updating-data.adoc
+++ b/modules/guides/pages/updating-data.adoc
@@ -29,7 +29,7 @@ To update a document, or create the document if it doesn't exist, perform an ups
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 . Create a JSON document containing the updated data.
@@ -163,7 +163,7 @@ To update a document that already exists, perform a replace operation.
 
 [{tabs}]
 ====
-cbc::
+CLI::
 +
 --
 . Update a JSON document with some new data.
@@ -341,7 +341,7 @@ You can use either a Sub-Document upsert or replace operation depending on what
 
 [{tabs}]
 ====
-cbc-subdoc::
+CLI::
 +
 --
 . Connect to the `cbc-subdoc` interactive shell.