diff --git a/akka-docs/src/main/paradox/index-actors.md b/akka-docs/src/main/paradox/index-actors.md
index 8bd4e0d35e..e9b5d178c6 100644
--- a/akka-docs/src/main/paradox/index-actors.md
+++ b/akka-docs/src/main/paradox/index-actors.md
@@ -32,11 +32,7 @@ To use Classic Akka Actors, you must add the following dependency in your projec
 * [routing](routing.md)
 * [fsm](fsm.md)
 * [persistence](persistence.md)
-* [persistence-schema-evolution](persistence-schema-evolution.md)
-* [persistence-query](persistence-query.md)
-* [persistence-query-leveldb](persistence-query-leveldb.md)
 * [persistence-fsm](persistence-fsm.md)
-* [persistence-journals](persistence-journals.md)
 * [testing](testing.md)
 
 @@@
diff --git a/akka-docs/src/main/paradox/index-cluster.md b/akka-docs/src/main/paradox/index-cluster.md
index 91b7c1ae9b..468fe05a0f 100644
--- a/akka-docs/src/main/paradox/index-cluster.md
+++ b/akka-docs/src/main/paradox/index-cluster.md
@@ -15,7 +15,6 @@ For the new API see @ref[Cluster](typed/index-cluster.md).
 
 @@@ index
 
-* [common/cluster](common/cluster.md)
 * [cluster-usage](cluster-usage.md)
 * [cluster-routing](cluster-routing.md)
 * [cluster-singleton](cluster-singleton.md)
@@ -24,5 +23,6 @@ For the new API see @ref[Cluster](typed/index-cluster.md).
 * [cluster-sharding](cluster-sharding.md)
 * [cluster-metrics](cluster-metrics.md)
 * [distributed-data](distributed-data.md)
+* [coordination](coordination.md)
 
 @@@
diff --git a/akka-docs/src/main/paradox/index.md b/akka-docs/src/main/paradox/index.md
index 1381dbae73..9f555d6c75 100644
--- a/akka-docs/src/main/paradox/index.md
+++ b/akka-docs/src/main/paradox/index.md
@@ -8,11 +8,10 @@
 * [guide/index](typed/guide/index.md)
 * [general/index](general/index.md)
 * [index-actors](typed/index.md)
-* [persistence](typed/persistence.md)
 * [index-cluster](typed/index-cluster.md)
+* [persistence](typed/persistence.md)
 * [stream/index](stream/index.md)
 * [discovery](discovery/index.md)
-* [coordination](coordination.md)
 * [index-utilities](index-utilities.md)
 * [common/other-modules](common/other-modules.md)
 * [additional/deploy](additional/deploy.md)
diff --git a/akka-docs/src/main/paradox/persistence-schema-evolution.md b/akka-docs/src/main/paradox/persistence-schema-evolution.md
index c9f7278aec..407c1540c1 100644
--- a/akka-docs/src/main/paradox/persistence-schema-evolution.md
+++ b/akka-docs/src/main/paradox/persistence-schema-evolution.md
@@ -1,4 +1,4 @@
-# Persistence - Schema Evolution
+# Schema Evolution for Event Sourced Actors
 
 ## Dependency
 
diff --git a/akka-docs/src/main/paradox/typed/index-cluster.md b/akka-docs/src/main/paradox/typed/index-cluster.md
index 3179014953..44d30e9e90 100644
--- a/akka-docs/src/main/paradox/typed/index-cluster.md
+++ b/akka-docs/src/main/paradox/typed/index-cluster.md
@@ -4,6 +4,7 @@
 
 @@@ index
 
+* [cluster-specification](../common/cluster.md)
 * [cluster](cluster.md)
 * [distributed-data](distributed-data.md)
 * [cluster-singleton](cluster-singleton.md)
@@ -15,5 +16,6 @@
 * [cluster-dc](../cluster-dc.md)
 * [remoting-artery](../remoting-artery.md)
 * [remoting](../remoting.md)
+* [coordination](../coordination.md)
 
 @@@
diff --git a/akka-docs/src/main/paradox/typed/persistence-snapshot.md b/akka-docs/src/main/paradox/typed/persistence-snapshot.md
index fb3a76dbf1..c9bf2b2fff 100644
--- a/akka-docs/src/main/paradox/typed/persistence-snapshot.md
+++ b/akka-docs/src/main/paradox/typed/persistence-snapshot.md
@@ -1,8 +1,8 @@
-# Persistence - snapshotting
+# Snapshotting
 
 ## Snapshots
 
-As you model your domain using @ref:[persistent actors](persistence.md), you may notice that some actors may be
+As you model your domain using @ref:[EventSourced actors](persistence.md), you may notice that some actors may be
 prone to accumulating extremely long event logs and experiencing long recovery times. Sometimes, the right approach
 may be to split out into a set of shorter lived actors. However, when this is not an option, you can use snapshots
 to reduce recovery times drastically.
diff --git a/akka-docs/src/main/paradox/typed/persistence-style.md b/akka-docs/src/main/paradox/typed/persistence-style.md
index c8a52c136a..ebc9998a76 100644
--- a/akka-docs/src/main/paradox/typed/persistence-style.md
+++ b/akka-docs/src/main/paradox/typed/persistence-style.md
@@ -1,4 +1,4 @@
-# Persistence - coding style
+# Style Guide 
 
 ## Event handlers in the state
 
diff --git a/akka-docs/src/main/paradox/typed/persistence.md b/akka-docs/src/main/paradox/typed/persistence.md
index 2ae137e478..92a558535b 100644
--- a/akka-docs/src/main/paradox/typed/persistence.md
+++ b/akka-docs/src/main/paradox/typed/persistence.md
@@ -1,9 +1,13 @@
-# Persistence
+# Event Sourcing
 
 @@@ index
 
-* [Persistence - coding style](persistence-style.md)
-* [Persistence - snapshotting](persistence-snapshot.md)
+* [Persistence coding style](persistence-style.md)
+* [Persistence snapshotting](persistence-snapshot.md)
+* [Persistence schema evolution](../persistence-schema-evolution.md)
+* [Persistence query](../persistence-query.md)
+* [Persistence query LevelDB](../persistence-query-leveldb.md)
+* [Persistence Journals](../persistence-journals.md)
 
 @@@