diff --git a/content/enterprise_influxdb/v1.10/about-the-project/release-notes-changelog.md b/content/enterprise_influxdb/v1.10/about-the-project/release-notes-changelog.md
index 4675fb92a..eade23b92 100644
--- a/content/enterprise_influxdb/v1.10/about-the-project/release-notes-changelog.md
+++ b/content/enterprise_influxdb/v1.10/about-the-project/release-notes-changelog.md
@@ -155,7 +155,7 @@ An edge case regression was introduced into this version that may cause a consta
 
 - Resolve issue to enable [mutex profiling](/enterprise_influxdb/v1.9/tools/api/#debugpprof-http-endpoint).
 
-#### influx-ctl updates
+#### influxd-ctl updates
 
 - Improve [`influxd-ctl join`](/enterprise_influxdb/v1.9/tools/influxd-ctl/#join) robustness and provide better error messages on failure.
 - Add user friendly error message when accessing a TLS-enabled server without TLS enabled on client.
diff --git a/content/enterprise_influxdb/v1.10/administration/configure/anti-entropy/anti-entropy-api.md b/content/enterprise_influxdb/v1.10/administration/configure/anti-entropy/anti-entropy-api.md
index b47745396..cc1544f0e 100644
--- a/content/enterprise_influxdb/v1.10/administration/configure/anti-entropy/anti-entropy-api.md
+++ b/content/enterprise_influxdb/v1.10/administration/configure/anti-entropy/anti-entropy-api.md
@@ -14,7 +14,7 @@ aliases:
 >**Note:** The Anti-Entropy API is available from the meta nodes and is only available when the Anti-Entropy service is enabled in the data node configuration settings. For information on the configuration settings, see
 > [Anti-Entropy settings](/enterprise_influxdb/v1.10/administration/config-data-nodes/#anti-entropy-ae-settings).
 
-Use the [Anti-Entropy service](/enterprise_influxdb/v1.10/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influx-ctl entropy`](/enterprise_influxdb/v1.10/tools/influxd-ctl/#entropy) (also available on meta nodes).
+Use the [Anti-Entropy service](/enterprise_influxdb/v1.10/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influxd-ctl entropy`](/enterprise_influxdb/v1.10/tools/influxd-ctl/#entropy) (also available on meta nodes).
 
 The base URL is:
 
diff --git a/content/enterprise_influxdb/v1.10/introduction/installation/single-server.md b/content/enterprise_influxdb/v1.10/introduction/installation/single-server.md
index 852978629..53d8b7643 100644
--- a/content/enterprise_influxdb/v1.10/introduction/installation/single-server.md
+++ b/content/enterprise_influxdb/v1.10/introduction/installation/single-server.md
@@ -77,7 +77,7 @@ through server restarts.
 The InfluxDB Enterprise meta process oversees and manages the InfluxDB Enterprise
 data process. In multi-node clusters, meta nodes manage data syncing and high
 availability of data nodes. In a single-node installation, the meta process 
-and the accompanying [`influx-ctl` utility](/enterprise_influxdb/v1.10/tools/influxd-ctl/)
+and the accompanying [`influxd-ctl` utility](/enterprise_influxdb/v1.10/tools/influxd-ctl/)
 still manage the "cluster", even though the meta and data processes exist on the
 same server.
 
@@ -218,7 +218,7 @@ sudo systemctl start influxdb-meta
     influxdb  3207  0.8  4.4 483000 22168 ?        Ssl  17:05   0:08 /usr/bin/influxd-meta -config /etc/influxdb/influxdb-meta.conf
     ```
 
-5. **Use `influx-ctl` to add the meta process to the InfluxDB Enterprise "cluster"**:
+5. **Use `influxd-ctl` to add the meta process to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl add-meta <your-host-name>:8091
@@ -230,7 +230,7 @@ sudo systemctl start influxdb-meta
     Added meta node x at <your-host-name>:8091
     ```
 
-6. **Use `influx-ctl` to verify the meta node was added to the InfluxDB Enterprise "cluster"**:
+6. **Use `influxd-ctl` to verify the meta node was added to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl show
@@ -408,7 +408,7 @@ sudo systemctl start influxdb
     Check the [logs](/enterprise_influxdb/v1.10/administration/logs/)
     for error messages and verify the previous setup steps are complete.
 
-5. **Use `influx-ctl` to add the data process to the InfluxDB Enterprise "cluster"**:
+5. **Use `influxd-ctl` to add the data process to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl add-data <your-host-name>:8088
@@ -420,7 +420,7 @@ sudo systemctl start influxdb
     Added meta node y at <your-host-name>:8088
     ```
 
-6. **Use `influx-ctl` to verify the data node was added to the InfluxDB Enterprise "cluster"**:
+6. **Use `influxd-ctl` to verify the data node was added to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl show
diff --git a/content/enterprise_influxdb/v1.5/administration/renaming.md b/content/enterprise_influxdb/v1.5/administration/renaming.md
index 064ee6c19..3fd07e283 100644
--- a/content/enterprise_influxdb/v1.5/administration/renaming.md
+++ b/content/enterprise_influxdb/v1.5/administration/renaming.md
@@ -27,7 +27,7 @@ First, spend write and query activity to the cluster.
 - Repeat the process for the last meta node (former leader).
 
 Intermediate verification:
-- Verify the state of the cluster with `influx-ctl show`. The version must be reported on all nodes for them to be healthy.
+- Verify the state of the cluster with `influxd-ctl show`. The version must be reported on all nodes for them to be healthy.
 - Verify there is a meta leader with `curl localhost:8091/status` and that all meta nodes list the rest in the output.
 - Restart all data nodes one by one. Verify that `/var/lib/influxdb/meta/client.json` on all data nodes references the new meta names.
 - Verify the `show shards` output lists all shards and node ownership as expected.
@@ -43,7 +43,7 @@ Intermediate verification:
 - Repeat on the remaining data nodes. Remember to only execute the `update-data` command from the meta leader.
 
 Final verification:
-- Verify the state of the cluster with `influx-ctl show`. The version must be reported on all nodes for them to be healthy.
+- Verify the state of the cluster with `influxd-ctl show`. The version must be reported on all nodes for them to be healthy.
 - Verify the `show shards` output lists all shards and node ownership as expected.
 - Verify meta queries work (show measurements under a database).
 - Verify data are being queried successfully.
diff --git a/content/enterprise_influxdb/v1.5/guides/rebalance.md b/content/enterprise_influxdb/v1.5/guides/rebalance.md
index 5b67c468d..551562585 100644
--- a/content/enterprise_influxdb/v1.5/guides/rebalance.md
+++ b/content/enterprise_influxdb/v1.5/guides/rebalance.md
@@ -35,7 +35,7 @@ throughput, follow the steps in
 
 The following sections assume that you already added a new data node to the
 cluster, and they use the
-[`influx-ctl` tool](/enterprise_influxdb/v1.5/administration/cluster-commands/) available on
+[`influxd-ctl` tool](/enterprise_influxdb/v1.5/administration/cluster-commands/) available on
 all meta nodes.
 
 Before you begin, stop writing historical data to InfluxDB.
diff --git a/content/enterprise_influxdb/v1.5/guides/replacing-nodes.md b/content/enterprise_influxdb/v1.5/guides/replacing-nodes.md
index 3f1ce3813..e4d8c894c 100644
--- a/content/enterprise_influxdb/v1.5/guides/replacing-nodes.md
+++ b/content/enterprise_influxdb/v1.5/guides/replacing-nodes.md
@@ -167,7 +167,7 @@ influxd-ctl remove-meta -force -tcpAddr enterprise-meta-02:8089 enterprise-meta-
 ```
 
 #### 2.3. Add the new meta node
-Once the non-leader meta node has been removed, use `influx-ctl add-meta` to replace it with the new meta node:
+Once the non-leader meta node has been removed, use `influxd-ctl add-meta` to replace it with the new meta node:
 
 ```bash
 # Pattern
@@ -320,7 +320,7 @@ The time it takes for copying to complete is determined by the number of shards
 Check on the status of the copy-shard process with:
 
 ```bash
-influx-ctl copy-shard-status
+influxd-ctl copy-shard-status
 ```
 
 The output will show all currently running copy-shard processes.
diff --git a/content/enterprise_influxdb/v1.6/administration/renaming.md b/content/enterprise_influxdb/v1.6/administration/renaming.md
index ef631fe95..c4cb9bb77 100644
--- a/content/enterprise_influxdb/v1.6/administration/renaming.md
+++ b/content/enterprise_influxdb/v1.6/administration/renaming.md
@@ -27,7 +27,7 @@ First, spend write and query activity to the cluster.
 - Repeat the process for the last meta node (former leader).
 
 Intermediate verification:
-- Verify the state of the cluster with `influx-ctl show`. The version must be reported on all nodes for them to be healthy.
+- Verify the state of the cluster with `influxd-ctl show`. The version must be reported on all nodes for them to be healthy.
 - Verify there is a meta leader with `curl localhost:8091/status` and that all meta nodes list the rest in the output.
 - Restart all data nodes one by one. Verify that `/var/lib/influxdb/meta/client.json` on all data nodes references the new meta names.
 - Verify the `show shards` output lists all shards and node ownership as expected.
@@ -43,7 +43,7 @@ Intermediate verification:
 - Repeat on the remaining data nodes. Remember to only execute the `update-data` command from the meta leader.
 
 Final verification:
-- Verify the state of the cluster with `influx-ctl show`. The version must be reported on all nodes for them to be healthy.
+- Verify the state of the cluster with `influxd-ctl show`. The version must be reported on all nodes for them to be healthy.
 - Verify the `show shards` output lists all shards and node ownership as expected.
 - Verify meta queries work (show measurements under a database).
 - Verify data are being queried successfully.
diff --git a/content/enterprise_influxdb/v1.6/guides/rebalance.md b/content/enterprise_influxdb/v1.6/guides/rebalance.md
index 5afbf1ae1..63cfdca65 100644
--- a/content/enterprise_influxdb/v1.6/guides/rebalance.md
+++ b/content/enterprise_influxdb/v1.6/guides/rebalance.md
@@ -35,7 +35,7 @@ throughput, follow the steps in
 
 The following sections assume that you already added a new data node to the
 cluster, and they use the
-[`influx-ctl` tool](/enterprise_influxdb/v1.6/administration/cluster-commands/) available on
+[`influxd-ctl` tool](/enterprise_influxdb/v1.6/administration/cluster-commands/) available on
 all meta nodes.
 
 Before you begin, stop writing historical data to InfluxDB.
diff --git a/content/enterprise_influxdb/v1.7/administration/anti-entropy-api.md b/content/enterprise_influxdb/v1.7/administration/anti-entropy-api.md
index 95388207d..16aa69270 100644
--- a/content/enterprise_influxdb/v1.7/administration/anti-entropy-api.md
+++ b/content/enterprise_influxdb/v1.7/administration/anti-entropy-api.md
@@ -12,7 +12,7 @@ menu:
 > is enabled in the data node configuration settings. For information on the configuration settings, see
 > [Anti-Entropy settings](/enterprise_influxdb/v1.7/administration/config-data-nodes/#anti-entropy-ae-settings).
 
-Use the [Anti-Entropy service](/enterprise_influxdb/v1.7/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influx-ctl entropy`](/enterprise_influxdb/v1.7/administration/cluster-commands/#entropy) (also available on meta nodes).
+Use the [Anti-Entropy service](/enterprise_influxdb/v1.7/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influxd-ctl entropy`](/enterprise_influxdb/v1.7/administration/cluster-commands/#entropy) (also available on meta nodes).
 
 The base URL is:
 
diff --git a/content/enterprise_influxdb/v1.8/administration/anti-entropy/anti-entropy-api.md b/content/enterprise_influxdb/v1.8/administration/anti-entropy/anti-entropy-api.md
index e424ac3c6..fdba569ce 100644
--- a/content/enterprise_influxdb/v1.8/administration/anti-entropy/anti-entropy-api.md
+++ b/content/enterprise_influxdb/v1.8/administration/anti-entropy/anti-entropy-api.md
@@ -14,7 +14,7 @@ aliases:
 >**Note:** The Anti-Entropy API is available from the meta nodes and is only available when the Anti-Entropy service is enabled in the data node configuration settings. For information on the configuration settings, see
 > [Anti-Entropy settings](/enterprise_influxdb/v1.8/administration/config-data-nodes/#anti-entropy-ae-settings).
 
-Use the [Anti-Entropy service](/enterprise_influxdb/v1.8/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influx-ctl entropy`](/enterprise_influxdb/v1.8/administration/cluster-commands/#entropy) (also available on meta nodes).
+Use the [Anti-Entropy service](/enterprise_influxdb/v1.8/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influxd-ctl entropy`](/enterprise_influxdb/v1.8/administration/cluster-commands/#entropy) (also available on meta nodes).
 
 The base URL is:
 
diff --git a/content/enterprise_influxdb/v1.9/about-the-project/release-notes-changelog.md b/content/enterprise_influxdb/v1.9/about-the-project/release-notes-changelog.md
index b70e0613f..2c665e58e 100644
--- a/content/enterprise_influxdb/v1.9/about-the-project/release-notes-changelog.md
+++ b/content/enterprise_influxdb/v1.9/about-the-project/release-notes-changelog.md
@@ -86,7 +86,7 @@ An edge case regression was introduced into this version that may cause a consta
 
 - Resolve issue to enable [mutex profiling](/enterprise_influxdb/v1.9/tools/api/#debugpprof-http-endpoint).
 
-#### influx-ctl updates
+#### influxd-ctl updates
 
 - Improve [`influxd-ctl join`](/enterprise_influxdb/v1.9/tools/influxd-ctl/#join) robustness and provide better error messages on failure.
 - Add user friendly error message when accessing a TLS-enabled server without TLS enabled on client.
diff --git a/content/enterprise_influxdb/v1.9/administration/configure/anti-entropy/anti-entropy-api.md b/content/enterprise_influxdb/v1.9/administration/configure/anti-entropy/anti-entropy-api.md
index d0c3b3419..835dfc077 100644
--- a/content/enterprise_influxdb/v1.9/administration/configure/anti-entropy/anti-entropy-api.md
+++ b/content/enterprise_influxdb/v1.9/administration/configure/anti-entropy/anti-entropy-api.md
@@ -14,7 +14,7 @@ aliases:
 >**Note:** The Anti-Entropy API is available from the meta nodes and is only available when the Anti-Entropy service is enabled in the data node configuration settings. For information on the configuration settings, see
 > [Anti-Entropy settings](/enterprise_influxdb/v1.9/administration/config-data-nodes/#anti-entropy-ae-settings).
 
-Use the [Anti-Entropy service](/enterprise_influxdb/v1.9/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influx-ctl entropy`](/enterprise_influxdb/v1.9/tools/influxd-ctl/#entropy) (also available on meta nodes).
+Use the [Anti-Entropy service](/enterprise_influxdb/v1.9/administration/anti-entropy) in InfluxDB Enterprise to monitor and repair entropy in data nodes and their shards. To access the Anti-Entropy API and work with this service, use [`influxd-ctl entropy`](/enterprise_influxdb/v1.9/tools/influxd-ctl/#entropy) (also available on meta nodes).
 
 The base URL is:
 
diff --git a/content/enterprise_influxdb/v1.9/introduction/installation/single-server.md b/content/enterprise_influxdb/v1.9/introduction/installation/single-server.md
index 16b37f54a..95a4b617d 100644
--- a/content/enterprise_influxdb/v1.9/introduction/installation/single-server.md
+++ b/content/enterprise_influxdb/v1.9/introduction/installation/single-server.md
@@ -77,7 +77,7 @@ through server restarts.
 The InfluxDB Enterprise meta process oversees and manages the InfluxDB Enterprise
 data process. In multi-node clusters, meta nodes manage data syncing and high
 availability of data nodes. In a single-node installation, the meta process 
-and the accompanying [`influx-ctl` utility](/enterprise_influxdb/v1.9/tools/influxd-ctl/)
+and the accompanying [`influxd-ctl` utility](/enterprise_influxdb/v1.9/tools/influxd-ctl/)
 still manage the "cluster", even though the meta and data processes exist on the
 same server.
 
@@ -218,7 +218,7 @@ sudo systemctl start influxdb-meta
     influxdb  3207  0.8  4.4 483000 22168 ?        Ssl  17:05   0:08 /usr/bin/influxd-meta -config /etc/influxdb/influxdb-meta.conf
     ```
 
-5. **Use `influx-ctl` to add the meta process to the InfluxDB Enterprise "cluster"**:
+5. **Use `influxd-ctl` to add the meta process to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl add-meta <your-host-name>:8091
@@ -230,7 +230,7 @@ sudo systemctl start influxdb-meta
     Added meta node x at <your-host-name>:8091
     ```
 
-6. **Use `influx-ctl` to verify the meta node was added to the InfluxDB Enterprise "cluster"**:
+6. **Use `influxd-ctl` to verify the meta node was added to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl show
@@ -408,7 +408,7 @@ sudo systemctl start influxdb
     Check the [logs](/enterprise_influxdb/v1.9/administration/logs/)
     for error messages and verify the previous setup steps are complete.
 
-5. **Use `influx-ctl` to add the data process to the InfluxDB Enterprise "cluster"**:
+5. **Use `influxd-ctl` to add the data process to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl add-data <your-host-name>:8088
@@ -420,7 +420,7 @@ sudo systemctl start influxdb
     Added meta node y at <your-host-name>:8088
     ```
 
-6. **Use `influx-ctl` to verify the data node was added to the InfluxDB Enterprise "cluster"**:
+6. **Use `influxd-ctl` to verify the data node was added to the InfluxDB Enterprise "cluster"**:
 
     ```sh
     influxd-ctl show