diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
index a6a1b0ba9915e4..f6e692c4255d57 100644
--- a/docs/setup/docker.asciidoc
+++ b/docs/setup/docker.asciidoc
@@ -9,7 +9,7 @@ https://github.com/elastic/kibana-docker/tree/{branch}[GitHub].
 
 These images are free to use under the Elastic license. They contain open source 
 and free commercial features and access to paid commercial features.  
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
 paid commercial features. See the 
 https://www.elastic.co/subscriptions[Subscriptions] page for information about 
 Elastic license levels.
diff --git a/docs/setup/install.asciidoc b/docs/setup/install.asciidoc
index 2e7e8c119302e1..748878c250b957 100644
--- a/docs/setup/install.asciidoc
+++ b/docs/setup/install.asciidoc
@@ -48,7 +48,7 @@ downloaded from the Elastic Docker Registry.
 <<docker,Running Kibana on Docker>>
 
 IMPORTANT: If your Elasticsearch installation is protected by
-{ref}/secure-cluster.html[{security}] see
+{ref}/secure-cluster.html[{security-features}] see
 {kibana-ref}/using-kibana-with-security.html[Configuring security in Kibana] for
 additional setup instructions.
 
diff --git a/docs/setup/install/deb.asciidoc b/docs/setup/install/deb.asciidoc
index 0bfbccbaed2bae..b1e2d189ff14c1 100644
--- a/docs/setup/install/deb.asciidoc
+++ b/docs/setup/install/deb.asciidoc
@@ -7,7 +7,7 @@ Kibana on any Debian-based system such as Debian and Ubuntu.
 
 This package is free to use under the Elastic license. It contains open source 
 and free commercial features and access to paid commercial features. 
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
 paid commercial features. See the 
 https://www.elastic.co/subscriptions[Subscriptions] page for information about 
 Elastic license levels.
diff --git a/docs/setup/install/rpm.asciidoc b/docs/setup/install/rpm.asciidoc
index 295ad10206b118..46889334ed0ba5 100644
--- a/docs/setup/install/rpm.asciidoc
+++ b/docs/setup/install/rpm.asciidoc
@@ -11,7 +11,7 @@ such as SLES 11 and CentOS 5.  Please see <<targz>> instead.
 
 This package is free to use under the Elastic license. It contains open source 
 and free commercial features and access to paid commercial features. 
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
 paid commercial features. See the 
 https://www.elastic.co/subscriptions[Subscriptions] page for information about 
 Elastic license levels.
diff --git a/docs/setup/install/targz.asciidoc b/docs/setup/install/targz.asciidoc
index f119a53b491809..a4c1d269e8af3d 100644
--- a/docs/setup/install/targz.asciidoc
+++ b/docs/setup/install/targz.asciidoc
@@ -6,7 +6,7 @@ are the easiest formats to use when trying out Kibana.
 
 These packages are free to use under the Elastic license. They contain open 
 source and free commercial features and access to paid commercial features. 
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
 paid commercial features. See the 
 https://www.elastic.co/subscriptions[Subscriptions] page for information about 
 Elastic license levels.
diff --git a/docs/setup/install/windows.asciidoc b/docs/setup/install/windows.asciidoc
index b7f695062ae2c0..d301a43778fbf8 100644
--- a/docs/setup/install/windows.asciidoc
+++ b/docs/setup/install/windows.asciidoc
@@ -5,7 +5,7 @@ Kibana can be installed on Windows using the `.zip` package.
 
 This package is free to use under the Elastic license. It contains open source 
 and free commercial features and access to paid commercial features. 
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
 paid commercial features. See the 
 https://www.elastic.co/subscriptions[Subscriptions] page for information about 
 Elastic license levels.
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index 2441128116a149..b4685147b975ce 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -82,4 +82,4 @@ includes a watch that submits requests as the built-in `elastic` user:
 <<automating-report-generation>>.
 
 For more information about configuring watches, see
-{ref}/how-watcher-works.html[How Watcher works].
+{ref}/how-watcher-works.html[How {watcher} works].