diff --git a/modules/ROOT/pages/authentication-authorization/password-and-user-recovery.adoc b/modules/ROOT/pages/authentication-authorization/password-and-user-recovery.adoc
index 8f28a12f6..2fb46c5b5 100644
--- a/modules/ROOT/pages/authentication-authorization/password-and-user-recovery.adoc
+++ b/modules/ROOT/pages/authentication-authorization/password-and-user-recovery.adoc
@@ -86,7 +86,7 @@ bin/neo4j start
 [[password-recovery-for-admin]]
 == Recover a lost password
 
-You can use a client such as xref:cypher-shell.adoc[][Cypher Shell] or the Neo4j Browser to connect to the xref:database-administration/index.adoc#manage-databases-system[`system`] database and set a new password for the admin user.
+You can use a client such as xref:cypher-shell.adoc[Cypher Shell] or the Neo4j Browser to connect to the xref:database-administration/index.adoc#manage-databases-system[`system`] database and set a new password for the admin user.
 
 [NOTE]
 ====
@@ -124,7 +124,7 @@ ALTER USER neo4j SET PASSWORD 'mynewpassword'
 [[recover-unassigned-admin-role]]
 == Recover an unassigned admin role
 
-You can use a client such as xref:cypher-shell.adoc[][Cypher Shell] or the Neo4j Browser to connect to the xref:database-administration/index.adoc#manage-databases-system[`system`] database and grant the admin user role to an existing user.
+You can use a client such as xref:cypher-shell.adoc[Cypher Shell] or the Neo4j Browser to connect to the xref:database-administration/index.adoc#manage-databases-system[`system`] database and grant the admin user role to an existing user.
 
 [NOTE]
 ====
@@ -162,7 +162,7 @@ GRANT ROLE admin TO neo4j
 [[recover-admin-role]]
 == Recover the admin role
 
-If you have removed the admin role from your system entirely, you can use a client such as xref:cypher-shell.adoc[][Cypher Shell] or the Neo4j Browser to connect to the xref:database-administration/index.adoc#manage-databases-system[`system`] database and recreate the role with its original capabilities.
+If you have removed the admin role from your system entirely, you can use a client such as xref:cypher-shell.adoc[Cypher Shell] or the Neo4j Browser to connect to the xref:database-administration/index.adoc#manage-databases-system[`system`] database and recreate the role with its original capabilities.
 
 [NOTE]
 ====
diff --git a/modules/ROOT/pages/backup-restore/planning.adoc b/modules/ROOT/pages/backup-restore/planning.adoc
index 96f15821e..03c03d2f6 100644
--- a/modules/ROOT/pages/backup-restore/planning.adoc
+++ b/modules/ROOT/pages/backup-restore/planning.adoc
@@ -51,7 +51,7 @@ This ensures that if for some reason your Neo4j DBMS crashes, you will be able t
 == Backup and restore options
 
 Neo4j supports backing up and restoring both online and offline databases.
-It uses xref:neo4j-admin-neo4j-cli.adoc[][Neo4j Admin tool] commands, which can be run from a live, as well as from an offline Neo4j DBMS.
+It uses xref:neo4j-admin-neo4j-cli.adoc[Neo4j Admin tool] commands, which can be run from a live, as well as from an offline Neo4j DBMS.
 All `neo4j-admin` commands must be invoked as the `neo4j` user to ensure the appropriate file permissions.
 
 * `neo4j-admin database backup/restore` (Enterprise only) -– used for performing online backup (xref:backup-restore/modes.adoc#full-backup[full] and xref:backup-restore/modes.adoc#differential-backup[differential]) and restore operations.
diff --git a/modules/ROOT/pages/configuration/file-locations.adoc b/modules/ROOT/pages/configuration/file-locations.adoc
index d90f82b0a..4ade23ea7 100644
--- a/modules/ROOT/pages/configuration/file-locations.adoc
+++ b/modules/ROOT/pages/configuration/file-locations.adoc
@@ -24,7 +24,7 @@ For the Neo4j's uses of the Java Native Access (JNA) library, set `server.jvm.ad
 [[neo4j-bin]]
 === Bin
 
-The _bin_ directory contains the Neo4j running script and built-in tools, such as xref:cypher-shell.adoc[][Cypher Shell] and xref:neo4j-admin-neo4j-cli.adoc[][Neo4j Admin].
+The _bin_ directory contains the Neo4j running script and built-in tools, such as xref:cypher-shell.adoc[Cypher Shell] and xref:neo4j-admin-neo4j-cli.adoc[].
 
 File permissions:: Read only and execute.
 
diff --git a/modules/ROOT/pages/database-administration/queries.adoc b/modules/ROOT/pages/database-administration/queries.adoc
index 878bf236e..8339bd12d 100644
--- a/modules/ROOT/pages/database-administration/queries.adoc
+++ b/modules/ROOT/pages/database-administration/queries.adoc
@@ -4,7 +4,7 @@
 
 [NOTE]
 ====
-All commands and example queries in this section are run in xref:cypher-shell.adoc[][the Neo4j Cypher Shell command-line interface (CLI)].
+All commands and example queries in this section are run in xref:cypher-shell.adoc[].
 
 Note that the `cypher-shell` queries are not case-sensitive, but must end with a semicolon.
 ====
diff --git a/modules/ROOT/pages/docker/operations.adoc b/modules/ROOT/pages/docker/operations.adoc
index cbed1a445..1e5d3fb18 100644
--- a/modules/ROOT/pages/docker/operations.adoc
+++ b/modules/ROOT/pages/docker/operations.adoc
@@ -7,7 +7,7 @@ You can use the Neo4j tools when running Neo4j in a Docker container.
 [[docker-neo4j-admin]]
 == Use Neo4j Admin
 
-The xref:neo4j-admin-neo4j-cli.adoc[][Neo4j Admin tool] can be run locally within a container using the following command:
+The xref:neo4j-admin-neo4j-cli.adoc[`neo4j-admin` CLI] can be run locally within a container using the following command:
 
 [source, shell]
 ----
@@ -16,7 +16,7 @@ docker exec --interactive --tty <containerID/name> neo4j-admin <category> <comma
 
 To determine the container ID or name, run `docker ps` to list the currently running Docker containers.
 
-For more information about the `neo4j-admin` commands, see xref:neo4j-admin-neo4j-cli.adoc[][Neo4j Admin and Neo4j CLI].
+For more information about the `neo4j-admin` commands, see xref:neo4j-admin-neo4j-cli.adoc[].
 
 [[docker-neo4j-import]]
 == Use Neo4j Import
@@ -67,7 +67,7 @@ neo4j-admin database import full --nodes=Movies=/import/movies_header.csv,/impor
 [[docker-neo4j-memrec]]
 == Use Neo4j Admin for memory recommendations
 
-The xref:configuration/neo4j-admin-memrec.adoc[][neo4j-admin server memory-recommendation] command with the argument `--docker` outputs environmental variables that can be passed to a Neo4j docker container.
+The xref:configuration/neo4j-admin-memrec.adoc[neo4j-admin server memory-recommendation] command with the argument `--docker` outputs environmental variables that can be passed to a Neo4j docker container.
 The following example shows how `neo4j-admin server memory-recommendation --docker` provides a memory recommendation in a docker-friendly format.
 
 .Invoke `neo4j-admin server memory-recommendation --docker`
@@ -142,7 +142,7 @@ The `$HOME/neo4j/reports` folder should now contain a zip file of reports.
 [[docker-cypher-shell]]
 == Use Cypher Shell
 
-The xref:cypher-shell.adoc[][Neo4j Cypher Shell tool] can be run locally within a container using the following command:
+The xref:cypher-shell.adoc[] can be run locally within a container using the following command:
 
 [source, shell]
 ----
diff --git a/modules/ROOT/pages/installation/linux/debian.adoc b/modules/ROOT/pages/installation/linux/debian.adoc
index 8fe8f27a7..048fbbbc8 100644
--- a/modules/ROOT/pages/installation/linux/debian.adoc
+++ b/modules/ROOT/pages/installation/linux/debian.adoc
@@ -140,7 +140,7 @@ If you cannot reach `https://debian.neo4j.com`, perhaps due to a firewall, you n
 
 [NOTE]
 ====
-It is important to note that using this method will mean that the offline machine will not receive the dependencies that are normally downloaded and installed automatically when using `apt` for installing Neo4j; xref:cypher-shell.adoc[][Cypher Shell] and Java (if not installed already):
+It is important to note that using this method will mean that the offline machine will not receive the dependencies that are normally downloaded and installed automatically when using `apt` for installing Neo4j; xref:cypher-shell.adoc[Cypher Shell] and Java (if not installed already):
 
 * The Cypher Shell package can be downloaded from {neo4j-download-center-uri}[Neo4j Deployment Center].
 * For information on supported versions of Java, see xref:installation/requirements.adoc[System requirements].
diff --git a/modules/ROOT/pages/installation/linux/rpm.adoc b/modules/ROOT/pages/installation/linux/rpm.adoc
index 26a9cea2a..64163b0e0 100644
--- a/modules/ROOT/pages/installation/linux/rpm.adoc
+++ b/modules/ROOT/pages/installation/linux/rpm.adoc
@@ -139,7 +139,7 @@ If you cannot reach `\https://yum.neo4j.com/stable/{neo4j-version}` to install N
 
 [NOTE]
 ====
-It is important to note that using this method means that the offline machine cannot receive the dependencies that are normally downloaded and installed automatically when using `yum` for installing Neo4j, xref:cypher-shell.adoc[][Neo4j Cypher Shell], and Java.
+It is important to note that using this method means that the offline machine cannot receive the dependencies that are normally downloaded and installed automatically when using `yum` for installing Neo4j, xref:cypher-shell.adoc[Neo4j Cypher Shell], and Java.
 ====
 
 . Download the Neo4j and Cypher Shell RPM installers from https://neo4j.com/deployment-center/[Deployment Center] or run the following to obtain the required packages:
diff --git a/modules/ROOT/pages/introduction.adoc b/modules/ROOT/pages/introduction.adoc
index a24dbb8c2..328b1b346 100644
--- a/modules/ROOT/pages/introduction.adoc
+++ b/modules/ROOT/pages/introduction.adoc
@@ -130,7 +130,7 @@ a| link:https://neo4j.com/docs/cdc/current/[Change Data Capture (CDC)]
 |
 |
 
-| xref:cypher-shell.adoc[][Cypher Shell]
+| xref:cypher-shell.adoc[Cypher Shell]
 | {check-mark}
 | {check-mark}
 
diff --git a/modules/ROOT/pages/performance/memory-configuration.adoc b/modules/ROOT/pages/performance/memory-configuration.adoc
index 3ddbe9b1a..c9c8fce38 100644
--- a/modules/ROOT/pages/performance/memory-configuration.adoc
+++ b/modules/ROOT/pages/performance/memory-configuration.adoc
@@ -96,13 +96,13 @@ Otherwise, Neo4j computes some heuristic values at startup based on the availabl
 [discrete]
 [[memory-configuration-initial]]
 Initial memory recommendation::
-Use the `xref:configuration/neo4j-admin-memrec.adoc[][neo4j-admin server memory-recommendation]` command to get an initial recommendation for how to distribute a certain amount of memory.
+Use the xref:configuration/neo4j-admin-memrec.adoc[`neo4j-admin server memory-recommendation`] command to get an initial recommendation for how to distribute a certain amount of memory.
 The values may need to be adjusted to cater for each specific use case.
 
 [discrete]
 [[memory-configuration-database]]
 Inspect the memory settings of all databases in a DBMS::
-The `xref:configuration/neo4j-admin-memrec.adoc[][neo4j-admin server memory-recommendation]` command is useful for inspecting the current distribution of data and indexes.
+The xref:configuration/neo4j-admin-memrec.adoc[`neo4j-admin server memory-recommendation`] command is useful for inspecting the current distribution of data and indexes.
 +
 .Use `neo4j-admin server memory-recommendation` to inspect the memory settings of all your databases
 ====
diff --git a/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc b/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc
index eafc328a7..e01bd1636 100644
--- a/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc
@@ -26,7 +26,7 @@ They use:
 * The _import_ directory of the Neo4j installation to store all the CSV files.
 However, the CSV files can be located in any directory of your file system.
 * UNIX-styled paths.
-* The xref:neo4j-admin-neo4j-cli.adoc[][`neo4j-admin database import`] command.
+* The xref:import.adoc[`neo4j-admin database import`] command.
 
 //To create a cluster based on imported data, see <<causal-clustering-seed-import>>.
 
diff --git a/modules/ROOT/pages/tutorial/tutorial-composite-database.adoc b/modules/ROOT/pages/tutorial/tutorial-composite-database.adoc
index 927b9b134..dac27a73f 100644
--- a/modules/ROOT/pages/tutorial/tutorial-composite-database.adoc
+++ b/modules/ROOT/pages/tutorial/tutorial-composite-database.adoc
@@ -131,7 +131,7 @@ Note that Cypher queries must end with a semicolon.
 +
 [NOTE]
 ====
-For more information about the Cypher Shell command-line interface (CLI) and how to use it, see xref:cypher-shell.adoc[][].
+For more information about the Cypher Shell command-line interface (CLI) and how to use it, see xref:cypher-shell.adoc[].
 ====
 . Run the command `SHOW DATABASES` to list all available databases:
 +