diff --git a/docs/antora.yml b/docs/antora.yml
index 9da788455..4e1d55cfe 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -14,10 +14,10 @@ asciidoc:
     asciidoctor-maven-plugin-name: Asciidoctor Maven Plugin
     asciidoctor-maven-plugin-url: https://github.com/asciidoctor/asciidoctor-maven-plugin
     asciidoctor-url: https://asciidoctor.org
-    asciidoctorj-epub-name: Asciidoctorj EPUB3
+    asciidoctorj-epub-name: AsciidoctorJ EPUB3
     asciidoctorj-epub-url: https://github.com/asciidoctor/asciidoctorj-epub3
     asciidoctorj-name: AsciidoctorJ
-    asciidoctorj-pdf-name: Asciidoctorj PDF
+    asciidoctorj-pdf-name: AsciidoctorJ PDF
     asciidoctorj-pdf-url: https://github.com/asciidoctor/asciidoctorj-pdf
     asciidoctorj-url: https://github.com/asciidoctor/asciidoctorj
     asciidoctorjs-name: Asciidoctor.js
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index c39e8c4aa..6887c8b70 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -1,18 +1,17 @@
-* xref:index.adoc[]
 * xref:compatibility.adoc[]
 * xref:quick-start.adoc[]
 * xref:common-task-configuration.adoc[]
-* xref:asciidoctorj-base-plugin.adoc[]
-* xref:asciidoctorj-plugin.adoc[]
-* xref:asciidoctorj-pdf-plugin.adoc[]
-* xref:asciidoctorj-epub-plugin.adoc[]
-* xref:asciidoctorj-revealjs-plugin.adoc[]
+* Plugins
+** xref:asciidoctorj-base-plugin.adoc[]
+** xref:asciidoctorj-plugin.adoc[]
+** xref:asciidoctorj-pdf-plugin.adoc[]
+** xref:asciidoctorj-epub-plugin.adoc[]
+** xref:asciidoctorj-revealjs-plugin.adoc[]
+** xref:asciidoctorj-gems-plugin.adoc[]
+** xref:asciidoctoreditorconfig-plugin.adoc[]
 // * xref:asciidoctorj-leanpub-plugin.adoc[]
-* xref:asciidoctorj-gems-plugin.adoc[]
 * xref:asciidoctor-diagram.adoc[]
 // * xref:kindlegen-plugin.adoc[]
 * xref:asciidoctorj-custom-extensions.adoc[]
-* xref:asciidoctorjs-plugin.adoc[]
-* xref:asciidoctoreditorconfig-plugin.adoc[]
 * xref:docinfo.adoc[]
 * xref:upgrading.adoc[]
diff --git a/docs/modules/ROOT/pages/asciidoctoreditorconfig-plugin.adoc b/docs/modules/ROOT/pages/asciidoctoreditorconfig-plugin.adoc
index 50361060a..68ce9dd0a 100644
--- a/docs/modules/ROOT/pages/asciidoctoreditorconfig-plugin.adoc
+++ b/docs/modules/ROOT/pages/asciidoctoreditorconfig-plugin.adoc
@@ -1,4 +1,4 @@
-= The Asciidoctor Editor Config Plugin
+= Asciidoctor Editor Config Plugin
 
 [source,groovy,role="primary"]
 [subs=attributes+]
diff --git a/docs/modules/ROOT/pages/asciidoctorj-base-plugin.adoc b/docs/modules/ROOT/pages/asciidoctorj-base-plugin.adoc
index 770c83554..32031f54d 100644
--- a/docs/modules/ROOT/pages/asciidoctorj-base-plugin.adoc
+++ b/docs/modules/ROOT/pages/asciidoctorj-base-plugin.adoc
@@ -1,6 +1,6 @@
 = AsciidoctorJ Base Plugin
 
-This plugin is automatically applied by all AsciidoctorJ-based plugins.
+This plugin is automatically applied by all {asciidoctorj-name}-based plugins.
 
 Adds an extension for configuring which version of {asciidoctorj-name} and various other {asciidoctorj-name} backends.
 
diff --git a/docs/modules/ROOT/pages/compatibility.adoc b/docs/modules/ROOT/pages/compatibility.adoc
index d3335a649..749a7f138 100644
--- a/docs/modules/ROOT/pages/compatibility.adoc
+++ b/docs/modules/ROOT/pages/compatibility.adoc
@@ -1,4 +1,4 @@
 = Compatibility
 
-This collection of plugins requires at least Gradle 4.9, JDK 11.0 and AsciidoctorJ 2.0.0 to run.
+This collection of plugins requires at least Gradle 4.9, JDK 11.0 and {asciidoctorj-name} 2.0.0 to run.
 If you need prior Gradle, JDK or {asciidoctorj-name} support please use a plugin from the 1.5.x or 1.6.x release series.
diff --git a/docs/modules/appendices/nav.adoc b/docs/modules/appendices/nav.adoc
index 573c01894..ba16d8ff6 100644
--- a/docs/modules/appendices/nav.adoc
+++ b/docs/modules/appendices/nav.adoc
@@ -1,4 +1,5 @@
 * Appendices
+** xref:asciidoctorjs-plugin.adoc[]
 ** xref:tips-and-tricks.adoc[]
 ** xref:known-limitations.adoc[]
 ** xref:hacking.adoc[]
diff --git a/docs/modules/ROOT/pages/asciidoctorjs-plugin.adoc b/docs/modules/appendices/pages/asciidoctorjs-plugin.adoc
similarity index 94%
rename from docs/modules/ROOT/pages/asciidoctorjs-plugin.adoc
rename to docs/modules/appendices/pages/asciidoctorjs-plugin.adoc
index 1f8325f71..cb0577d0c 100644
--- a/docs/modules/ROOT/pages/asciidoctorjs-plugin.adoc
+++ b/docs/modules/appendices/pages/asciidoctorjs-plugin.adoc
@@ -1,4 +1,4 @@
-= Working with Asciidoctor.js instead
+= Working with Asciidoctor.js
 
 Instead of {asciidoctorj-name}, {asciidoctorjs-url}[{asciidoctorjs-name}] can be used as a rendering engine from 3.0.