diff --git a/source/connect.txt b/source/connect.txt
index cf477ad..046cacc 100644
--- a/source/connect.txt
+++ b/source/connect.txt
@@ -22,12 +22,12 @@ Connect to MongoDB
    :titlesonly:
    :maxdepth: 1
 
-   /connect-to-mongo/create-a-mongo-client/
-   /connect-to-mongo/choose-connection-target/
-   /connect-to-mongo/connection-options/
-   /connect-to-mongo/tls/
-   /connect-to-mongo/network-compression
-   /connect-to-mongo/stable-api/
+   Create a MongoClient </connect-to-mongo/create-a-mongo-client/>
+   Choose a Connection Target </connect-to-mongo/choose-connection-target/>
+   Connection URI Options </connect-to-mongo/connection-options/>
+   TLS/SSL </connect-to-mongo/tls/>
+   Compress Network Traffic </connect-to-mongo/network-compression>
+   Stable API </connect-to-mongo/stable-api/>
 
 Overview
 --------
diff --git a/source/data-formats.txt b/source/data-formats.txt
index b2e597f..767d26a 100644
--- a/source/data-formats.txt
+++ b/source/data-formats.txt
@@ -21,7 +21,7 @@ Specialized Data Formats
    :titlesonly:
    :maxdepth: 1
 
-   /data-formats/time-series
+   Time Series </data-formats/time-series>
 
 Overview
 --------
diff --git a/source/getting-started.txt b/source/getting-started.txt
index da32f59..688c223 100644
--- a/source/getting-started.txt
+++ b/source/getting-started.txt
@@ -20,11 +20,11 @@ Get Started
 
 .. toctree::
 
-   /get-started/download-and-install/
-   /get-started/create-a-deployment/
-   /get-started/create-a-connection-string/
-   /get-started/connect-to-mongodb/
-   /get-started/next-steps/
+   Download & Install </get-started/download-and-install/>
+   Create a Deployment </get-started/create-a-deployment/>
+   Create a Connection String </get-started/create-a-connection-string/>
+   Connect </get-started/connect-to-mongodb/>
+   Next Steps </get-started/next-steps/>
 
 Overview
 --------
diff --git a/source/index.txt b/source/index.txt
index 86006f6..e2ce5bd 100644
--- a/source/index.txt
+++ b/source/index.txt
@@ -22,24 +22,24 @@ MongoDB Java Reactive Streams Documentation
    :maxdepth: 1
 
    Get Started </getting-started>
-   /connect
-   /db-coll
-   /write-data-to-mongo
-   /read-data-from-mongo
-   /indexes
-   /aggregation
-   /secure-your-data
-   /read-write-configuration
-   /data-formats
-   /logging
-   /monitoring
-   /validate-signatures
-   /pojo-examples
-   /custom-implementations
-   /whats-new
-   /issues-and-help
-   /compatibility
-   /upgrade
+   Connect </connect>
+   Databases & Collections </db-coll>
+   Write Data </write-data-to-mongo>
+   Read Data </read-data-from-mongo>
+   Indexes </indexes>
+   Aggregation </aggregation>
+   Security </secure-your-data>
+   Replica Set Operations </read-write-configuration>
+   Data Formats </data-formats>
+   Logging </logging>
+   Monitor Your Deployment </monitoring>
+   Validate Driver Signatures </validate-signatures>
+   POJO CRUD Examples </pojo-examples>
+   Custom Subscribers </custom-implementations>
+   What's New </whats-new>
+   Issues & Help </issues-and-help>
+   Compatibility </compatibility>
+   Upgrade </upgrade>
    API Documentation <{+api+}/mongodb-driver-reactivestreams/>
 
 Overview
diff --git a/source/read-data-from-mongo.txt b/source/read-data-from-mongo.txt
index 67b67a7..72cfed7 100644
--- a/source/read-data-from-mongo.txt
+++ b/source/read-data-from-mongo.txt
@@ -22,17 +22,17 @@ Read Data From MongoDB
     :titlesonly:
     :maxdepth: 1   
 
-    /read/specify-a-query
-    /read/retrieve-data
-    /read/specify-fields-return
-    /read/specify-documents-to-return
-    /read/count-documents
-    /read/distinct
-    /read/cursors
-    /read/read-preference
-    /read/text-search
-    /read/geo
-    /read/change-streams
+    Query </read/specify-a-query>
+    Retrieve Data </read/retrieve-data>
+    Specify Fields to Return </read/specify-fields-return>
+    Specify Documents to Return </read/specify-documents-to-return>
+    Count Documents </read/count-documents>
+    Distinct Field Values </read/distinct>
+    Data Cursors </read/cursors>
+    Read Preference </read/read-preference>
+    Text Search </read/text-search>
+    Geospatial Search </read/geo>
+    Monitor Data Changes </read/change-streams>
     
 Overview
 --------
diff --git a/source/secure-your-data.txt b/source/secure-your-data.txt
index 6954277..7d50df0 100644
--- a/source/secure-your-data.txt
+++ b/source/secure-your-data.txt
@@ -22,9 +22,9 @@ Secure Your Data
     :titlesonly:
     :maxdepth: 1
 
-    /security/auth
-    /security/enterprise-authentication
-    /security/encrypt
+    Authentication </security/auth>
+    Enterprise Authentication </security/enterprise-authentication>
+    In-Use Encryption </security/encrypt>
 
 Overview
 --------
diff --git a/source/write-data-to-mongo.txt b/source/write-data-to-mongo.txt
index 2f0c5b9..48218c7 100644
--- a/source/write-data-to-mongo.txt
+++ b/source/write-data-to-mongo.txt
@@ -22,15 +22,15 @@ Write Data to MongoDB
     :titlesonly:
     :maxdepth: 1
 
-    /write/insert-documents
-    /write/write-update-documents
-    /write/replace-documents
-    /write/write-delete-documents
-    /write/bulk-writes
-    /write/transactions
-    /write/store-large-docs
-    /write/write-concern
-    /write/run-command
+    Insert </write/insert-documents>
+    Update </write/write-update-documents>
+    Replace </write/replace-documents>
+    Delete </write/write-delete-documents>
+    Bulk Write </write/bulk-writes>
+    Transactions </write/transactions>
+    GridFS </write/store-large-docs>
+    Write Concern </write/write-concern>
+    Run a Database Command </write/run-command>
 
 Overview
 --------