diff --git a/content/v2.0/organizations/buckets/delete-bucket.md b/content/v2.0/organizations/buckets/delete-bucket.md
index db45745fa..6bc8a0aa1 100644
--- a/content/v2.0/organizations/buckets/delete-bucket.md
+++ b/content/v2.0/organizations/buckets/delete-bucket.md
@@ -27,7 +27,7 @@ to delete a bucket.
 Use the [`influx bucket delete` command](/v2.0/reference/cli/influx/bucket/delete)
 to delete a bucket. Deleting a bucket requires the following:
 
-- The bucket ID _(provided in the output of `influx bucket find`)_
+- The bucket ID _(provided in the output of `influx bucket list`)_
 - The name or ID of the organization to which the bucket belongs
 
 ```sh
diff --git a/content/v2.0/organizations/buckets/update-bucket.md b/content/v2.0/organizations/buckets/update-bucket.md
index 15cef3f05..ea9499252 100644
--- a/content/v2.0/organizations/buckets/update-bucket.md
+++ b/content/v2.0/organizations/buckets/update-bucket.md
@@ -49,7 +49,7 @@ If you change a bucket name, be sure to update the bucket in the above places as
 Use the [`influx bucket update` command](/v2.0/reference/cli/influx/bucket/update)
 to update a bucket. Updating a bucket requires the following:
 
-- The bucket ID _(provided in the output of `influx bucket find`)_
+- The bucket ID _(provided in the output of `influx bucket list`)_
 - The name or ID of the organization the bucket belongs to.
 
 ##### Update the name of a bucket
diff --git a/content/v2.0/organizations/buckets/view-buckets.md b/content/v2.0/organizations/buckets/view-buckets.md
index 5dd6e91a9..abc9b50b4 100644
--- a/content/v2.0/organizations/buckets/view-buckets.md
+++ b/content/v2.0/organizations/buckets/view-buckets.md
@@ -20,13 +20,13 @@ weight: 202
 
 ## View buckets using the influx CLI
 
-Use the [`influx bucket find` command](/v2.0/reference/cli/influx/bucket/find)
-to view a buckets in an organization. 
+Use the [`influx bucket list` command](/v2.0/reference/cli/influx/bucket/list)
+to view a buckets in an organization.
 
 ```sh
-influx bucket find
+influx bucket list
 ```
 
 Other filtering options such as filtering by organization, name, or ID are available.
-See the [`influx bucket find` documentation](/v2.0/reference/cli/influx/bucket/find)
+See the [`influx bucket list` documentation](/v2.0/reference/cli/influx/bucket/list)
 for information about other available flags.
diff --git a/content/v2.0/organizations/delete-org.md b/content/v2.0/organizations/delete-org.md
index 7776c98dd..ff4829ce2 100644
--- a/content/v2.0/organizations/delete-org.md
+++ b/content/v2.0/organizations/delete-org.md
@@ -29,7 +29,7 @@ to delete an organization.
 Use the [`influx org delete` command](/v2.0/reference/cli/influx/org/delete)
 to delete an organization. Deleting an organization requires the following:
 
-- The organization ID _(provided in the output of `influx org find`)_
+- The organization ID _(provided in the output of `influx org list`)_
 
 ```sh
 # Syntax
diff --git a/content/v2.0/organizations/members/add-member.md b/content/v2.0/organizations/members/add-member.md
index 0521bb038..1992db240 100644
--- a/content/v2.0/organizations/members/add-member.md
+++ b/content/v2.0/organizations/members/add-member.md
@@ -30,7 +30,7 @@ _Complete content coming soon_ -->
 1. Get a list of users and their IDs by running the following:
 
 ```sh
-influx user find
+influx user list
 ```
 
 2. To add a user to an organization, run the following command:
diff --git a/content/v2.0/organizations/members/remove-member.md b/content/v2.0/organizations/members/remove-member.md
index 2e74f76d0..9ec3a55f5 100644
--- a/content/v2.0/organizations/members/remove-member.md
+++ b/content/v2.0/organizations/members/remove-member.md
@@ -33,7 +33,7 @@ For information about deleting a user from InfluxDB, see [Delete a user](/v2.0/u
 Use the [`influx org members remove` command](/v2.0/reference/cli/influx/org/members/remove)
 to remove a member from an organization. Removing a member requires the following:
 
-- The organization name or ID _(provided in the output of [`influx org find`](/v2.0/reference/cli/influx/org/find/))_
+- The organization name or ID _(provided in the output of [`influx org list`](/v2.0/reference/cli/influx/org/list/))_
 - The member ID _(provided in the output of [`influx org members list`](/v2.0/reference/cli/influx/org/members/list/))_
 
 ```sh
diff --git a/content/v2.0/organizations/update-org.md b/content/v2.0/organizations/update-org.md
index 2c3e14f11..fc4fbf834 100644
--- a/content/v2.0/organizations/update-org.md
+++ b/content/v2.0/organizations/update-org.md
@@ -38,7 +38,7 @@ If you change an organization name, be sure to update the organization in the ab
 Use the [`influx org update` command](/v2.0/reference/cli/influx/org/update)
 to update an organization. Updating an organization requires the following:
 
-- The org ID _(provided in the output of `influx org find`)_
+- The org ID _(provided in the output of `influx org list`)_
 
 ##### Update the name of a organization
 ```sh
diff --git a/content/v2.0/organizations/view-orgs.md b/content/v2.0/organizations/view-orgs.md
index c253d8ee7..a8dd4bf4d 100644
--- a/content/v2.0/organizations/view-orgs.md
+++ b/content/v2.0/organizations/view-orgs.md
@@ -23,15 +23,15 @@ to view organizations.
 
 ## View organizations using the influx CLI
 
-Use the [`influx org find` command](/v2.0/reference/cli/influx/org/find)
+Use the [`influx org list` command](/v2.0/reference/cli/influx/org/list)
 to view organizations.
 
 ```sh
-influx org find
+influx org list
 ```
 
 Filtering options such as filtering by name or ID are available.
-See the [`influx org find` documentation](/v2.0/reference/cli/influx/org/find)
+See the [`influx org list` documentation](/v2.0/reference/cli/influx/org/list)
 for information about other available flags.
 
 ## View your organization ID
@@ -46,10 +46,10 @@ http://localhost:9999/orgs/<span class="bp" style="font-weight:bold;margin:0 .15
 
 
 ### Organization ID in the CLI
-Use [`influx org find`](#view-organizations-using-the-influx-cli) to view your organization ID.
+Use [`influx org list`](#view-organizations-using-the-influx-cli) to view your organization ID.
 
 ```sh
-> influx org find
+> influx org list
 
 ID                  Name
 03a2bbf46249a000    org-1
diff --git a/content/v2.0/process-data/manage-tasks/delete-task.md b/content/v2.0/process-data/manage-tasks/delete-task.md
index 1ae4dbd05..8232e9cb8 100644
--- a/content/v2.0/process-data/manage-tasks/delete-task.md
+++ b/content/v2.0/process-data/manage-tasks/delete-task.md
@@ -25,7 +25,7 @@ related:
 ## Delete a task with the influx CLI
 Use the `influx task delete` command to delete a task.
 
-_This command requires a task ID, which is available in the output of `influx task find`._
+_This command requires a task ID, which is available in the output of `influx task list`._
 
 ```sh
 # Syntax
diff --git a/content/v2.0/process-data/manage-tasks/run-task.md b/content/v2.0/process-data/manage-tasks/run-task.md
index 297ca4308..607e8d759 100644
--- a/content/v2.0/process-data/manage-tasks/run-task.md
+++ b/content/v2.0/process-data/manage-tasks/run-task.md
@@ -34,10 +34,10 @@ To run a task from the `influx` CLI, the task must have already run at least onc
 
 ```sh
 # List all tasks to find the ID of the task to run
-influx task find
+influx task list
 
 # Use the task ID to list previous runs of the task
-influx task run find --task-id=0000000000000000
+influx task run list --task-id=0000000000000000
 
 # Use the task ID and run ID to retry a run
 influx task run retry --task-id=0000000000000000 --run-id=0000000000000000
diff --git a/content/v2.0/process-data/manage-tasks/task-run-history.md b/content/v2.0/process-data/manage-tasks/task-run-history.md
index 5539fc32d..a24fe8397 100644
--- a/content/v2.0/process-data/manage-tasks/task-run-history.md
+++ b/content/v2.0/process-data/manage-tasks/task-run-history.md
@@ -31,14 +31,14 @@ to view task run histories and associated logs.
 To view logs associated with a run, click **View Logs** next to the run in the task's run history.
 
 ## View a task's run history with the influx CLI
-Use the `influx task run find` command to view a task's run history.
+Use the `influx task run list` command to view a task's run history.
 
 ```sh
 # List all tasks to find the ID of the task to run
-influx task find
+influx task list
 
 # Use the task ID to view the run history of a task
-influx task run find --task-id=0000000000000000
+influx task run list --task-id=0000000000000000
 ```
 
 {{% note %}}
diff --git a/content/v2.0/process-data/manage-tasks/update-task.md b/content/v2.0/process-data/manage-tasks/update-task.md
index 0a2ae7a54..54dfdc324 100644
--- a/content/v2.0/process-data/manage-tasks/update-task.md
+++ b/content/v2.0/process-data/manage-tasks/update-task.md
@@ -38,7 +38,7 @@ task you want to activate or inactivate.
 ## Update a task with the influx CLI
 Use the `influx task update` command to update or change the status of an existing task.
 
-_This command requires a task ID, which is available in the output of `influx task find`._
+_This command requires a task ID, which is available in the output of `influx task list`._
 
 #### Update a task Flux script
 Pass the file path of your updated Flux script to the `influx task update` command
diff --git a/content/v2.0/process-data/manage-tasks/view-tasks.md b/content/v2.0/process-data/manage-tasks/view-tasks.md
index 2c8c91083..4787b4a37 100644
--- a/content/v2.0/process-data/manage-tasks/view-tasks.md
+++ b/content/v2.0/process-data/manage-tasks/view-tasks.md
@@ -9,7 +9,7 @@ menu:
     parent: Manage tasks
 weight: 202
 related:
-  - /v2.0/reference/cli/influx/task/find
+  - /v2.0/reference/cli/influx/task/list
 ---
 
 ## View tasks in the InfluxDB UI
@@ -25,14 +25,14 @@ Click the **Tasks** icon in the left navigation to view the lists of tasks.
 3. Click on the heading of any column to sort by that field.
 
 ## View tasks with the influx CLI
-Use the `influx task find` command to return a list of created tasks.
+Use the `influx task list` command to return a list of created tasks.
 
 ```sh
-influx task find
+influx task list
 ```
 
 #### Filter tasks using the CLI
 Other filtering options such as filtering by organization or user,
 or limiting the number of tasks returned, are available.
-See the [`influx task find` documentation](/v2.0/reference/cli/influx/task/find)
+See the [`influx task list` documentation](/v2.0/reference/cli/influx/task/list)
 for information about other available flags.
diff --git a/content/v2.0/query-data/guides/monitor-states.md b/content/v2.0/query-data/guides/monitor-states.md
index da62068f2..cf5471d98 100644
--- a/content/v2.0/query-data/guides/monitor-states.md
+++ b/content/v2.0/query-data/guides/monitor-states.md
@@ -14,7 +14,7 @@ Flux helps you monitor states in your metrics and events:
 
 - [Find how long a state persists](#find-how-long-a-state-persists)
 - [Count the number of consecutive states](#count-the-number-of-consecutive-states)
-- [Detect state changes](#detect-state-changes)
+<!-- - [Detect state changes](#detect-state-changes) -->
 
 If you're just getting started with Flux queries, check out the following:
 
@@ -24,7 +24,7 @@ If you're just getting started with Flux queries, check out the following:
 ## Find how long a state persists
 
 1. Use the [`stateDuration()`](/v2.0/reference/flux/stdlib/built-in/transformations/stateduration/) function to calculate how long a column value has remained the same value (or state). Include the following information:
-  
+
   - **Column to search:** any tag key, tag value, field key, field value, or measurement.
   - **Value:** the value (or state) to search for in the specified column.
   - **State duration column:** a new column to store the state duration─the length of time that the specified value persists.
@@ -83,7 +83,7 @@ _time                   _value        door_closed
 
         ```js
         |> stateCount
-           (fn: (r) => 
+           (fn: (r) =>
             r._column_to_search == "value_to_search_for",
             column: "state_count"`
           )
@@ -148,9 +148,9 @@ Detect state changes with the `monitor.stateChanges()` function. To use the `mon
 
     {{< nav-icon "alerts" >}}
 
-2. If you haven't already, [create a check](/v2.0/monitor-alert/checks/create/) that stores statuses (`CRIT`, `WARN`, `INFO`, `OK` or `ANY`) in the `_level` column. <!-- specify how to do this with monitor.check() function or in UI, with check threshold or deadman? 
+2. If you haven't already, [create a check](/v2.0/monitor-alert/checks/create/) that stores statuses (`CRIT`, `WARN`, `INFO`, `OK` or `ANY`) in the `_level` column. <!-- specify how to do this with monitor.check() function or in UI, with check threshold or deadman?
 3. Import the InfluxDB `monitor` package.
-4. In your query, the specify the check. <!--can users specify a Flux query with the `monitoring` bucket and _level field without specifying the check? does importing the monitor package create the `monitoring` bucket? 
+4. In your query, the specify the check. <!--can users specify a Flux query with the `monitoring` bucket and _level field without specifying the check? does importing the monitor package create the `monitoring` bucket?
 5. Use the `monitor.stateChanges()` function and include the following information:
 
   - `fromLevel` (optional; by default, this is set to `any`)
diff --git a/content/v2.0/reference/cli/influx/auth/_index.md b/content/v2.0/reference/cli/influx/auth/_index.md
index 56ac6f674..7a5cc4300 100644
--- a/content/v2.0/reference/cli/influx/auth/_index.md
+++ b/content/v2.0/reference/cli/influx/auth/_index.md
@@ -26,7 +26,7 @@ influx auth [command]
 | [active](/v2.0/reference/cli/influx/auth/active)     | Activate authorization   |
 | [create](/v2.0/reference/cli/influx/auth/create)     | Create authorization     |
 | [delete](/v2.0/reference/cli/influx/auth/delete)     | Delete authorization     |
-| [find](/v2.0/reference/cli/influx/auth/find)         | Find authorization       |
+| [list](/v2.0/reference/cli/influx/auth/list)         | List authorizations      |
 | [inactive](/v2.0/reference/cli/influx/auth/inactive) | Inactivate authorization |
 
 ## Flags
diff --git a/content/v2.0/reference/cli/influx/auth/find.md b/content/v2.0/reference/cli/influx/auth/list.md
similarity index 63%
rename from content/v2.0/reference/cli/influx/auth/find.md
rename to content/v2.0/reference/cli/influx/auth/list.md
index bf61c1c7c..e1c910537 100644
--- a/content/v2.0/reference/cli/influx/auth/find.md
+++ b/content/v2.0/reference/cli/influx/auth/list.md
@@ -1,24 +1,29 @@
 ---
-title: influx auth find
-description: The 'influx auth find' command lists and searches authorizations in InfluxDB.
+title: influx auth list
+description: The 'influx auth list' command lists and searches authorizations in InfluxDB.
 menu:
   v2_0_ref:
-    name: influx auth find
+    name: influx auth list
     parent: influx auth
 weight: 201
+aliases:
+  - /v2.0/reference/cli/influx/auth/find
 ---
 
-The `influx auth find` command lists and searches authorizations in InfluxDB.
+The `influx auth list` command lists and searches authorizations in InfluxDB.
 
 ## Usage
 ```
-influx auth find [flags]
+influx auth list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag           | Description                 | Input type  |
 |:----           |:-----------                 |:----------: |
-| `-h`, `--help` | Help for the `find` command |             |
+| `-h`, `--help` | Help for the `list` command |             |
 | `-i`, `--id`   | Authorization ID            | string      |
 | `-o`, `--org`  | Organization name           | string      |
 | `--org-id`     | Organization ID             | string      |
diff --git a/content/v2.0/reference/cli/influx/bucket/_index.md b/content/v2.0/reference/cli/influx/bucket/_index.md
index ff8e9e0ec..77706679b 100644
--- a/content/v2.0/reference/cli/influx/bucket/_index.md
+++ b/content/v2.0/reference/cli/influx/bucket/_index.md
@@ -22,7 +22,7 @@ influx bucket [command]
 |:----------                                         |:-----------   |
 | [create](/v2.0/reference/cli/influx/bucket/create) | Create bucket |
 | [delete](/v2.0/reference/cli/influx/bucket/delete) | Delete bucket |
-| [find](/v2.0/reference/cli/influx/bucket/find)     | Find buckets  |
+| [list](/v2.0/reference/cli/influx/bucket/find)     | List buckets  |
 | [update](/v2.0/reference/cli/influx/bucket/update) | Update bucket |
 
 ## Flags
diff --git a/content/v2.0/reference/cli/influx/bucket/find.md b/content/v2.0/reference/cli/influx/bucket/list.md
similarity index 66%
rename from content/v2.0/reference/cli/influx/bucket/find.md
rename to content/v2.0/reference/cli/influx/bucket/list.md
index a5bc5d096..5983100c5 100644
--- a/content/v2.0/reference/cli/influx/bucket/find.md
+++ b/content/v2.0/reference/cli/influx/bucket/list.md
@@ -1,24 +1,29 @@
 ---
-title: influx bucket find
-description: The 'influx bucket find' command lists and searches for buckets in InfluxDB.
+title: influx bucket list
+description: The 'influx bucket list' command lists and searches for buckets in InfluxDB.
 menu:
   v2_0_ref:
-    name: influx bucket find
+    name: influx bucket list
     parent: influx bucket
 weight: 201
+aliases:
+  - /v2.0/reference/cli/influx/bucket/find
 ---
 
-The `influx bucket find` command lists and searches for buckets in InfluxDB.
+The `influx bucket list` command lists and searches for buckets in InfluxDB.
 
 ## Usage
 ```
-influx bucket find [flags]
+influx bucket list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag           | Description                 | Input type  | {{< cli/mapped >}}   |
 |:----           |:-----------                 |:----------: |:------------------   |
-| `-h`, `--help` | Help for the `find` command |             |                      |
+| `-h`, `--help` | Help for the `list` command |             |                      |
 | `-i`, `--id`   | Bucket ID                   | string      |                      |
 | `-n`, `--name` | Bucket name                 | string      | `INFLUX_BUCKET_NAME` |
 | `-o`, `--org`  | Organization name           | string      | `INFLUX_ORG`         |
diff --git a/content/v2.0/reference/cli/influx/org/_index.md b/content/v2.0/reference/cli/influx/org/_index.md
index 461e5936a..ca87a58a7 100644
--- a/content/v2.0/reference/cli/influx/org/_index.md
+++ b/content/v2.0/reference/cli/influx/org/_index.md
@@ -25,7 +25,7 @@ influx org [command]
 |:----------                                        |:-----------                      |
 | [create](/v2.0/reference/cli/influx/org/create)   | Create an organization           |
 | [delete](/v2.0/reference/cli/influx/org/delete)   | Delete an organization           |
-| [find](/v2.0/reference/cli/influx/org/find)       | Find organizations               |
+| [list](/v2.0/reference/cli/influx/org/list)       | List organizations               |
 | [members](/v2.0/reference/cli/influx/org/members) | Organization membership commands |
 | [update](/v2.0/reference/cli/influx/org/update)   | Update an organization           |
 
diff --git a/content/v2.0/reference/cli/influx/org/find.md b/content/v2.0/reference/cli/influx/org/list.md
similarity index 59%
rename from content/v2.0/reference/cli/influx/org/find.md
rename to content/v2.0/reference/cli/influx/org/list.md
index 0a0826388..d72ddf958 100644
--- a/content/v2.0/reference/cli/influx/org/find.md
+++ b/content/v2.0/reference/cli/influx/org/list.md
@@ -1,24 +1,29 @@
 ---
-title: influx org find
-description: The 'influx org find' lists and searches for organizations in InfluxDB.
+title: influx org list
+description: The 'influx org list' lists and searches for organizations in InfluxDB.
 menu:
   v2_0_ref:
-    name: influx org find
+    name: influx org list
     parent: influx org
 weight: 201
+aliases:
+  - /v2.0/reference/influx/org/find
 ---
 
-The `influx org find` lists and searches for organizations in InfluxDB.
+The `influx org list` lists and searches for organizations in InfluxDB.
 
 ## Usage
 ```
-influx org find [flags]
+influx org list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag           | Description                 | Input type  | {{< cli/mapped >}} |
 |:----           |:-----------                 |:----------: |:------------------ |
-| `-h`, `--help` | Help for the `find` command |             |                    |
+| `-h`, `--help` | Help for the `list` command |             |                    |
 | `-i`, `--id`   | Organization ID             | string      | `INFLUX_ORG`       |
 | `-n`, `--name` | Organization name           | string      | `INFLUX_ORG_ID`    |
 
diff --git a/content/v2.0/reference/cli/influx/secret/_index.md b/content/v2.0/reference/cli/influx/secret/_index.md
index 9cd99768e..bad420c8d 100644
--- a/content/v2.0/reference/cli/influx/secret/_index.md
+++ b/content/v2.0/reference/cli/influx/secret/_index.md
@@ -21,7 +21,7 @@ influx secret [subcommand]
 | Subcommand                                          | Description            |
 |:----------                                          |:-----------            |
 | [delete](/v2.0/reference/cli/influx/secret/delete/) | Delete a secret        |
-| [find](/v2.0/reference/cli/influx/secret/find/)     | Find secrets           |
+| [list](/v2.0/reference/cli/influx/secret/list/)     | List secrets           |
 | [update](/v2.0/reference/cli/influx/secret/update/) | Add or update a secret |
 
 ## Flags
diff --git a/content/v2.0/reference/cli/influx/secret/find.md b/content/v2.0/reference/cli/influx/secret/list.md
similarity index 62%
rename from content/v2.0/reference/cli/influx/secret/find.md
rename to content/v2.0/reference/cli/influx/secret/list.md
index 48a9cee63..f58a271b8 100644
--- a/content/v2.0/reference/cli/influx/secret/find.md
+++ b/content/v2.0/reference/cli/influx/secret/list.md
@@ -1,25 +1,28 @@
 ---
-title: influx secret find
-description: The 'influx secret find' command lists secret keys.
+title: influx secret list
+description: The 'influx secret list' command lists secret keys.
 menu:
   v2_0_ref:
-    name: influx secret find
+    name: influx secret list
     parent: influx secret
 weight: 101
 v2.0/tags: [secrets]
 ---
 
-The `influx secret find` command lists secret keys.
+The `influx secret list` command lists secret keys.
 
 ## Usage
 ```
-influx secret find [flags]
+influx secret list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag           | Description                 | Input type | {{< cli/mapped >}} |
 |:----           |:-----------                 |:----------:|:------------------ |
-| `-h`, `--help` | Help for the `find` command |            |                    |
+| `-h`, `--help` | Help for the `list` command |            |                    |
 | `-o`, `--org`  | Organization name           | string     | `INFLUX_ORG`       |
 | `--org-id`     | Organization ID             | string     | `INFLUX_ORG_ID`    |
 
diff --git a/content/v2.0/reference/cli/influx/task/_index.md b/content/v2.0/reference/cli/influx/task/_index.md
index 1b1e7aa02..ec1d99d5d 100644
--- a/content/v2.0/reference/cli/influx/task/_index.md
+++ b/content/v2.0/reference/cli/influx/task/_index.md
@@ -22,7 +22,7 @@ influx task [command]
 |:----------                                       |:-----------          |
 | [create](/v2.0/reference/cli/influx/task/create) | Create task          |
 | [delete](/v2.0/reference/cli/influx/task/delete) | Delete task          |
-| [find](/v2.0/reference/cli/influx/task/find)     | Find tasks           |
+| [list](/v2.0/reference/cli/influx/task/list)     | List tasks           |
 | [log](/v2.0/reference/cli/influx/task/log)       | Log related commands |
 | [retry](/v2.0/reference/cli/influx/task/retry)   | retry a run          |
 | [run](/v2.0/reference/cli/influx/task/run)       | Run related commands |
diff --git a/content/v2.0/reference/cli/influx/task/find.md b/content/v2.0/reference/cli/influx/task/list.md
similarity index 71%
rename from content/v2.0/reference/cli/influx/task/find.md
rename to content/v2.0/reference/cli/influx/task/list.md
index d2c93d3f8..8158f577d 100644
--- a/content/v2.0/reference/cli/influx/task/find.md
+++ b/content/v2.0/reference/cli/influx/task/list.md
@@ -1,24 +1,29 @@
 ---
-title: influx task find
-description: The 'influx task find' command lists and searches for tasks in InfluxDB.
+title: influx task list
+description: The 'influx task list' command lists and searches for tasks in InfluxDB.
 menu:
   v2_0_ref:
-    name: influx task find
+    name: influx task list
     parent: influx task
 weight: 201
+aliases:
+  - /v2.0/reference/cli/influx/task/find
 ---
 
-The `influx task find` command lists and searches for tasks in InfluxDB.
+The `influx task list` command lists and searches for tasks in InfluxDB.
 
 ## Usage
 ```
-influx task find [flags]
+influx task list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag              | Description                             | Input type  | {{< cli/mapped >}} |
 |:----              |:-----------                             |:----------: |:------------------ |
-| `-h`, `--help`    | Help for the `find` command             |             |                    |
+| `-h`, `--help`    | Help for the `list` command             |             |                    |
 | `-i`, `--id`      | Task ID                                 | string      |                    |
 | `--limit`         | Number of tasks to find (default `100`) | integer     |                    |
 | `--org`           | Task organization name                  | string      | `INFLUX_ORG`       |
diff --git a/content/v2.0/reference/cli/influx/task/log/_index.md b/content/v2.0/reference/cli/influx/task/log/_index.md
index 5c9d7ec30..8a5a5c22b 100644
--- a/content/v2.0/reference/cli/influx/task/log/_index.md
+++ b/content/v2.0/reference/cli/influx/task/log/_index.md
@@ -1,6 +1,6 @@
 ---
 title: influx task log
-description: The 'influx task log' and its subcommand 'find' output log information related related to a task.
+description: The 'influx task log' and its subcommand 'list' output log information related related to a task.
 menu:
   v2_0_ref:
     name: influx task log
@@ -9,7 +9,7 @@ weight: 201
 v2.0/tags: [logs]
 ---
 
-The `influx task log` command and its subcommand `find` output log information related to a task.
+The `influx task log` command and its subcommand `list` output log information related to a task.
 
 ## Usage
 ```
@@ -20,7 +20,7 @@ influx task log [command]
 ## Subcommands
 | Subcommand                                       | Description        |
 |:----------                                       |:-----------        |
-| [find](/v2.0/reference/cli/influx/task/log/find) | Find logs for task |
+| [list](/v2.0/reference/cli/influx/task/log/list) | List logs for task |
 
 ## Flags
 | Flag           | Description                |
diff --git a/content/v2.0/reference/cli/influx/task/log/find.md b/content/v2.0/reference/cli/influx/task/log/list.md
similarity index 53%
rename from content/v2.0/reference/cli/influx/task/log/find.md
rename to content/v2.0/reference/cli/influx/task/log/list.md
index b2b308c4e..bf657dc95 100644
--- a/content/v2.0/reference/cli/influx/task/log/find.md
+++ b/content/v2.0/reference/cli/influx/task/log/list.md
@@ -1,24 +1,29 @@
 ---
-title: influx task log find
-description: The 'influx task log find' command outputs log information related to a task.
+title: influx task log list
+description: The 'influx task log list' command outputs log information related to a task.
 menu:
   v2_0_ref:
-    name: influx task log find
+    name: influx task log list
     parent: influx task log
 weight: 301
+aliases:
+  - /v2.0/reference/cli/influx/task/log/find
 ---
 
-The `influx task log find` command outputs log information related to a task.
+The `influx task log list` command outputs log information related to a task.
 
 ## Usage
 ```
-influx task log find [flags]
+influx task log list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag           | Description                 | Input type  |
 |:----           |:-----------                 |:----------: |
-| `-h`, `--help` | Help for the `find` command |             |
+| `-h`, `--help` | Help for the `list` command |             |
 | `--run-id`     | Run ID                      | string      |
 | `--task-id`    | **(Required)** Task ID      | string      |
 
diff --git a/content/v2.0/reference/cli/influx/task/run/_index.md b/content/v2.0/reference/cli/influx/task/run/_index.md
index 229c1872f..206e9c7e1 100644
--- a/content/v2.0/reference/cli/influx/task/run/_index.md
+++ b/content/v2.0/reference/cli/influx/task/run/_index.md
@@ -1,7 +1,7 @@
 ---
 title: influx task run
 description: >
-  The 'influx task run' command and its subcommand 'find' output information
+  The 'influx task run' command and its subcommand 'list' output information
   related to runs of a task.
 menu:
   v2_0_ref:
@@ -10,7 +10,7 @@ menu:
 weight: 201
 ---
 
-The `influx task run` command and its subcommand `find` output information related to runs of a task.
+The `influx task run` command and its subcommand `list` output information related to runs of a task.
 
 ## Usage
 ```
@@ -21,7 +21,7 @@ influx task run [command]
 ## Subcommands
 | Subcommand                                       | Description          |
 |:----------                                       |:-----------          |
-| [find](/v2.0/reference/cli/influx/task/run/find) | Find runs for a task |
+| [list](/v2.0/reference/cli/influx/task/run/list) | List runs for a task |
 
 ## Flags
 | Flag           | Description                |
diff --git a/content/v2.0/reference/cli/influx/task/run/find.md b/content/v2.0/reference/cli/influx/task/run/list.md
similarity index 62%
rename from content/v2.0/reference/cli/influx/task/run/find.md
rename to content/v2.0/reference/cli/influx/task/run/list.md
index 1aa4efbeb..2cb387727 100644
--- a/content/v2.0/reference/cli/influx/task/run/find.md
+++ b/content/v2.0/reference/cli/influx/task/run/list.md
@@ -1,26 +1,31 @@
 ---
-title: influx task run find
-description: The 'influx task run find' command outputs information related to runs of a task.
+title: influx task run list
+description: The 'influx task run list' command outputs information related to runs of a task.
 menu:
   v2_0_ref:
-    name: influx task run find
+    name: influx task run list
     parent: influx task run
 weight: 301
+aliases:
+  - /v2.0/reference/cli/influx/task/run/find
 ---
 
-The `influx task run find` command outputs information related to runs of a task.
+The `influx task run list` command outputs information related to runs of a task.
 
 ## Usage
 ```
-influx task run find [flags]
+influx task run list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag          | Description                 | Input type  |
 |:----          |:-----------                 |:----------: |
 | `--after`     | After-time for filtering    | string      |
 | `--before`    | Before-time for filtering   | string      |
-| `-h`,`--help` | Help for the `find` command |             |
+| `-h`,`--help` | Help for the `list` command |             |
 | `--limit`     | Limit the number of results | integer     |
 | `--run-id`    | Run ID                      | string      |
 | `--task-id`   | **(Required)** Task ID      | string      |
diff --git a/content/v2.0/reference/cli/influx/user/_index.md b/content/v2.0/reference/cli/influx/user/_index.md
index 07faf49b1..ad7eac2e8 100644
--- a/content/v2.0/reference/cli/influx/user/_index.md
+++ b/content/v2.0/reference/cli/influx/user/_index.md
@@ -22,7 +22,7 @@ influx user [command]
 |:----------                                           |:-----------              |
 | [create](/v2.0/reference/cli/influx/user/create)     | Create a user            |
 | [delete](/v2.0/reference/cli/influx/user/delete)     | Delete a user            |
-| [find](/v2.0/reference/cli/influx/user/find)         | Find a user              |
+| [list](/v2.0/reference/cli/influx/user/list)         | List users               |
 | [password](/v2.0/reference/cli/influx/user/password) | Update a user's password |
 | [update](/v2.0/reference/cli/influx/user/update)     | Update a user            |
 
diff --git a/content/v2.0/reference/cli/influx/user/find.md b/content/v2.0/reference/cli/influx/user/list.md
similarity index 52%
rename from content/v2.0/reference/cli/influx/user/find.md
rename to content/v2.0/reference/cli/influx/user/list.md
index 5fea61164..116c9725f 100644
--- a/content/v2.0/reference/cli/influx/user/find.md
+++ b/content/v2.0/reference/cli/influx/user/list.md
@@ -1,24 +1,29 @@
 ---
-title: influx user find
-description: The 'influx user find' lists and searches for users in InfluxDB.
+title: influx user list
+description: The 'influx user list' lists users in InfluxDB.
 menu:
   v2_0_ref:
-    name: influx user find
+    name: influx user list
     parent: influx user
 weight: 201
+aliases:
+  - /v2.0/reference/cli/influx/user/find
 ---
 
-The `influx user find` command lists and searches for users in InfluxDB.
+The `influx user list` command lists users in InfluxDB.
 
 ## Usage
 ```
-influx user find [flags]
+influx user list [flags]
 ```
 
+#### Aliases
+`list`, `ls`, `find`
+
 ## Flags
 | Flag           | Description                 | Input type  |
 |:----           |:-----------                 |:----------: |
-| `-h`, `--help` | Help for the `find` command |             |
+| `-h`, `--help` | Help for the `list` command |             |
 | `-i`, `--id`   | User ID                     | string      |
 | `-n`, `--name` | Username                    | string      |
 
diff --git a/content/v2.0/reference/glossary.md b/content/v2.0/reference/glossary.md
index 3ed8234cb..6f095fbab 100644
--- a/content/v2.0/reference/glossary.md
+++ b/content/v2.0/reference/glossary.md
@@ -852,7 +852,7 @@ For example:
 h2o_level, location=santa_monica, h2o_feet
 ```
 
-Related entries: [series](/influxdb/v1.7/concepts/glossary/#series)
+Related entries: [series](#series)
 
 ### server
 
@@ -918,8 +918,8 @@ Related entries: [bin](#bin)
 
 ### step-plot
 
-In InfluxDB 1.x, a [step-plot graph](https://docs.influxdata.com/chronograf/v1.7/guides/visualization-types/#step-plot-graph) displays time series data in a staircase graph.
-In InfluxDB 2.0, generate a similar graph using the step interpolation option for [line graphs](https://v2.docs.influxdata.com/v2.0/visualize-data/visualization-types/graph/#options).
+A data visualization that displays time series data in a staircase graph.
+Generate a step-plot using the step [interpolation option for line graphs](/v2.0/visualize-data/visualization-types/graph/#options).
 
 ### stream
 
diff --git a/content/v2.0/reference/key-concepts/data-elements.md b/content/v2.0/reference/key-concepts/data-elements.md
index 14f48efc6..55335323b 100644
--- a/content/v2.0/reference/key-concepts/data-elements.md
+++ b/content/v2.0/reference/key-concepts/data-elements.md
@@ -27,6 +27,7 @@ InfluxDB 2.0 includes the following data elements:
 
 The sample data below is used to illustrate data elements concepts.
 _Hover over highlighted terms to get acquainted with InfluxDB terminology and layout._
+<a id="sample-data"></a>
 
 **bucket:**  `my_bucket`
 
@@ -53,11 +54,11 @@ A field includes a field key stored in the `_field` column and a field value sto
 
 A field key is a string that represents the name of the field. In the sample data above, `bees` and `ants` are field keys.
 
-### Field values
+### Field value
 
 A field value represents the value of an associated field. Field values can be strings, floats, integers, or booleans. The field values in the sample data show the number of `bees` at specified times: `23`, and `28` and the number of `ants` at a specified time: `30` and `32`.
 
-### Field sets
+### Field set
 
 A field set is a collection of field key-value pairs associated with a timestamp. The sample data includes the following field sets:
 
@@ -79,16 +80,16 @@ census bees=28i,ants=32i 1566086760000000000
 The columns in the sample data, `location` and `scientist`, are tags.
 Tags include tag keys and tag values that are stored as strings and metadata.
 
-### Tag keys
+### Tag key
 
 The tag keys in the sample data are `location` and `scientist`.
 
-### Tag values
+### Tag value
 
 The tag key `location` has two tag values: `klamath` and `portland`.
 The tag key `scientist` also has two tag values: `anderson` and `mullen`.
 
-### Tag sets
+### Tag set
 
 The collection of tag key-value pairs make up a tag set. The sample data includes the following four tag sets:
 
diff --git a/content/v2.0/security/secrets/manage-secrets/delete.md b/content/v2.0/security/secrets/manage-secrets/delete.md
index 9a25fa035..7255afeef 100644
--- a/content/v2.0/security/secrets/manage-secrets/delete.md
+++ b/content/v2.0/security/secrets/manage-secrets/delete.md
@@ -11,7 +11,7 @@ weight: 304
 Delete secrets using the `influx` command line interface (CLI) or the InfluxDB API.
 
 ## Delete a secret using the influx CLI
-Use the [`influx secret delete` command](/v2.0/reference/influx/secret/delete/)
+Use the [`influx secret delete` command](/v2.0/reference/cli/influx/secret/delete/)
 to delete a secret key-value pair from your organization.
 Provide the secret key to delete with the `-k` or `--key` flag.
 
diff --git a/content/v2.0/security/secrets/manage-secrets/view.md b/content/v2.0/security/secrets/manage-secrets/view.md
index b14fdd0bb..06d43c572 100644
--- a/content/v2.0/security/secrets/manage-secrets/view.md
+++ b/content/v2.0/security/secrets/manage-secrets/view.md
@@ -11,11 +11,11 @@ weight: 302
 View secret keys using the `influx` command line interface (CLI) or the InfluxDB API.
 
 ## View secret keys using the influx CLI
-Use the [`influx secret find` command](/v2.0/reference/cli/influx/secret/find/)
+Use the [`influx secret list` command](/v2.0/reference/cli/influx/secret/list/)
 to list your organization's secret keys.
 
 ```sh
-influx secret find
+influx secret list
 ```
 
 ## View secret keys using the InfluxDB API
diff --git a/content/v2.0/security/tokens/create-token.md b/content/v2.0/security/tokens/create-token.md
index 683e830dd..eb37bdc1c 100644
--- a/content/v2.0/security/tokens/create-token.md
+++ b/content/v2.0/security/tokens/create-token.md
@@ -48,5 +48,5 @@ influx auth create -o my-org \
 ```
 
 Filtering options such as filtering by authorization ID, username, or user ID are available.
-See the [`influx auth find` documentation](/v2.0/reference/cli/influx/auth/find)
+See the [`influx auth list` documentation](/v2.0/reference/cli/influx/auth/list)
 for information about other available flags.
diff --git a/content/v2.0/security/tokens/view-tokens.md b/content/v2.0/security/tokens/view-tokens.md
index 3e5fe9d22..150395965 100644
--- a/content/v2.0/security/tokens/view-tokens.md
+++ b/content/v2.0/security/tokens/view-tokens.md
@@ -25,13 +25,13 @@ command line interface (CLI).
 
 ## View tokens using the influx CLI
 
-Use the [`influx auth find` command](/v2.0/reference/cli/influx/auth/find)
+Use the [`influx auth list` command](/v2.0/reference/cli/influx/auth/list)
 to view tokens.
 
 ```sh
-influx auth find
+influx auth list
 ```
 
 Filtering options such as filtering by authorization ID, username, or user ID are available.
-See the [`influx auth find` documentation](/v2.0/reference/cli/influx/auth/find)
+See the [`influx auth list` documentation](/v2.0/reference/cli/influx/auth/list)
 for information about other available flags.
diff --git a/content/v2.0/users/change-password.md b/content/v2.0/users/change-password.md
index 374f6554f..7f718bea8 100644
--- a/content/v2.0/users/change-password.md
+++ b/content/v2.0/users/change-password.md
@@ -20,7 +20,7 @@ User passwords cannot be updated in the InfluxDB UI.
 Use the [`influx user password` command](/v2.0/reference/cli/influx/user/password)
 to update a password for a user. To update a password, you need the following:
 
-- Username or user ID _(provided in the output of `influx user find`)_
+- Username or user ID _(provided in the output of `influx user list`)_
 - New password
 
 ##### Update a password
diff --git a/content/v2.0/users/create-user.md b/content/v2.0/users/create-user.md
index 04bfbc708..786fa3f34 100644
--- a/content/v2.0/users/create-user.md
+++ b/content/v2.0/users/create-user.md
@@ -25,7 +25,7 @@ and include the following:
 
 - Username
 - Organization name or organization ID to add the user to _(provided in the output of
-  [`influx org find`](/v2.0/reference/cli/influx/org/find/))_
+  [`influx org list`](/v2.0/reference/cli/influx/org/list/))_
 
 ```sh
 # Syntax
@@ -41,7 +41,7 @@ include a password and organization ID with the `influx user create` command.
 
 - Username
 - Organization name or organization ID to add the user to _(provided in the output of
-  [`influx org find`](/v2.0/reference/cli/influx/org/find/))_
+  [`influx org list`](/v2.0/reference/cli/influx/org/list/))_
 - Password
 
 ```sh
diff --git a/content/v2.0/users/delete-user.md b/content/v2.0/users/delete-user.md
index ea05e6b81..a8ce2ba42 100644
--- a/content/v2.0/users/delete-user.md
+++ b/content/v2.0/users/delete-user.md
@@ -15,7 +15,7 @@ to delete a user.
 {{% warn %}}
 Deleting a user removes them completely from InfluxDB.
 To remove a user from an organization without deleting the user entirely, see
-[Remove a member from an organization](/v2.0/org/members/remove/).
+[Remove a member from an organization](/v2.0/organizations/members/remove-member/).
 {{% /warn %}}
 
 ## Delete a user from the InfluxDB UI
@@ -29,7 +29,7 @@ Users cannot be deleted from the InfluxDB UI.
 Use the [`influx user delete` command](/v2.0/reference/cli/influx/user/delete)
 to delete a user. Deleting a user requires the following:
 
-- The user ID _(provided in the output of `influx user find`)_
+- The user ID _(provided in the output of `influx user list`)_
 
 ```sh
 # Syntax
diff --git a/content/v2.0/users/update-user.md b/content/v2.0/users/update-user.md
index 83927a7f9..3873e626d 100644
--- a/content/v2.0/users/update-user.md
+++ b/content/v2.0/users/update-user.md
@@ -23,7 +23,7 @@ User information cannot be updated in the InfluxDB UI.
 Use the [`influx user update` command](/v2.0/reference/cli/influx/user/update)
 to update a user. Updating a user requires the following:
 
-- The user ID _(provided in the output of `influx user find`)_
+- The user ID _(provided in the output of `influx user list`)_
 
 ##### Update the name of a user
 ```sh
diff --git a/content/v2.0/users/view-users.md b/content/v2.0/users/view-users.md
index 79b98b8e1..73fcc6745 100644
--- a/content/v2.0/users/view-users.md
+++ b/content/v2.0/users/view-users.md
@@ -20,13 +20,13 @@ There is no list of users in the InfluxDB UI.
 
 ## View users using the influx CLI
 
-Use the [`influx user find` command](/v2.0/reference/cli/influx/user/find)
+Use the [`influx user list` command](/v2.0/reference/cli/influx/user/list)
 to view users.
 
 ```sh
-influx user find
+influx user list
 ```
 
 Filtering options such as filtering by username or ID are available.
-See the [`influx user find` documentation](/v2.0/reference/cli/influx/user/find)
+See the [`influx user list` documentation](/v2.0/reference/cli/influx/user/list)
 for information about other available flags.
diff --git a/content/v2.0/visualize-data/explore-metrics.md b/content/v2.0/visualize-data/explore-metrics.md
index 663a3af1e..851b4d0cf 100644
--- a/content/v2.0/visualize-data/explore-metrics.md
+++ b/content/v2.0/visualize-data/explore-metrics.md
@@ -32,7 +32,7 @@ See [Get started with Flux](/v2.0/query-data/get-started) to learn more about Fl
 
 2. Use the Flux builder in the bottom panel to create a Flux query:
   - Select a bucket to define your data source.
-  - Edit your time range with the [time range option](/select-time-range/) in the dropdown menu.
+  - Edit your time range with the [time range option](#select-time-range) in the dropdown menu.
   - Add filters to narrow your data by selecting attributes or columns in the dropdown menu.
   - Select **Group** from the **Filter** dropdown menu to group data into tables. For more about how grouping data in Flux works, see [Group data](/v2.0/query-data/guides/group-data/).    
 3. Alternatively, click **Script Editor** to manually edit the query.
diff --git a/content/v2.0/write-data/_index.md b/content/v2.0/write-data/_index.md
index 61f0757cc..76b8900ed 100644
--- a/content/v2.0/write-data/_index.md
+++ b/content/v2.0/write-data/_index.md
@@ -28,11 +28,11 @@ To write data into InfluxDB, you need the following:
 
 - an organization
 {{% note %}}
-See [View organizations](/v2.0/organizations/view-orgs/#view-your-organization-id/) for instructions on viewing your organization ID.
+See [View organizations](/v2.0/organizations/view-orgs/#view-your-organization-id) for instructions on viewing your organization ID.
 {{% /note %}}
 - a bucket
 {{% note %}}
-See [View buckets](/v2.0/organizations/view-orgs/#view-your-organization-id/) for instructions on viewing your bucket ID.
+See [View buckets](/v2.0/organizations/buckets/view-buckets/) for instructions on viewing your bucket ID.
 {{% /note %}}
 - an [authentication token](/v2.0/security/tokens/view-tokens/)