diff --git a/spring-shell-docs/modules/ROOT/nav.adoc b/spring-shell-docs/modules/ROOT/nav.adoc
index c260be16..9d9dc267 100644
--- a/spring-shell-docs/modules/ROOT/nav.adoc
+++ b/spring-shell-docs/modules/ROOT/nav.adoc
@@ -40,8 +40,8 @@
 ** xref:options/label.adoc[]
 ** xref:options/types.adoc[]
 ** xref:options/naming.adoc[]
-* xref:using-shell-completion.adoc[]
-* xref:using-shell-building.adoc[]
+* xref:completion.adoc[]
+* xref:building.adoc[]
 * xref:components/index.adoc[]
 ** xref:components/flow/index.adoc[]
 ** xref:components/ui/index.adoc[]
@@ -72,7 +72,7 @@
 ** xref:customization/commandnotfound.adoc[]
 ** xref:customization/singlecommand.adoc[]
 ** xref:customization/contextclose.adoc[]
-* xref:using-shell-execution.adoc[]
+* xref:execution.adoc[]
 * xref:testing/index.adoc[]
 ** xref:testing/basics.adoc[]
 ** xref:testing/settings.adoc[]
@@ -85,7 +85,7 @@
 *** xref:appendices/techintro/commandcatalog.adoc[]
 *** xref:appendices/techintro/theming.adoc[]
 *** xref:appendices/techintro/searchalgorithm.adoc[]
-** xref:appendices-debugging.adoc[]
+** xref:appendices/debugging/index.adoc[]
 ** xref:appendices/tui/index.adoc[]
 *** xref:appendices/tui/viewdev.adoc[]
 *** xref:appendices/tui/catalog.adoc[]
\ No newline at end of file
diff --git a/spring-shell-docs/modules/ROOT/pages/appendices-debugging.adoc b/spring-shell-docs/modules/ROOT/pages/appendices/debugging/index.adoc
similarity index 100%
rename from spring-shell-docs/modules/ROOT/pages/appendices-debugging.adoc
rename to spring-shell-docs/modules/ROOT/pages/appendices/debugging/index.adoc
diff --git a/spring-shell-docs/modules/ROOT/pages/using-shell-building.adoc b/spring-shell-docs/modules/ROOT/pages/building.adoc
similarity index 100%
rename from spring-shell-docs/modules/ROOT/pages/using-shell-building.adoc
rename to spring-shell-docs/modules/ROOT/pages/building.adoc
diff --git a/spring-shell-docs/modules/ROOT/pages/commands/interactionmode.adoc b/spring-shell-docs/modules/ROOT/pages/commands/interactionmode.adoc
index 11a42107..baec8007 100644
--- a/spring-shell-docs/modules/ROOT/pages/commands/interactionmode.adoc
+++ b/spring-shell-docs/modules/ROOT/pages/commands/interactionmode.adoc
@@ -2,10 +2,10 @@
 = Interaction Mode
 :page-section-summary-toc: 1
 
-ifndef::snippets[:snippets: ../../test/java/org/springframework/shell/docs]
+ifndef::snippets[:snippets: ../../../../src/test/java/org/springframework/shell/docs]
 
 Command registration can define `InteractionMode` which is used to hide commands
-depending which mode shell is executing. More about that in xref:using-shell-execution.adoc#using-shell-execution-interactionmode[Interaction Mode].
+depending which mode shell is executing. More about that in xref:execution.adoc#using-shell-execution-interactionmode[Interaction Mode].
 
 You can define it with `CommandRegisration`.
 
diff --git a/spring-shell-docs/modules/ROOT/pages/using-shell-completion.adoc b/spring-shell-docs/modules/ROOT/pages/completion.adoc
similarity index 100%
rename from spring-shell-docs/modules/ROOT/pages/using-shell-completion.adoc
rename to spring-shell-docs/modules/ROOT/pages/completion.adoc
diff --git a/spring-shell-docs/modules/ROOT/pages/using-shell-execution.adoc b/spring-shell-docs/modules/ROOT/pages/execution.adoc
similarity index 95%
rename from spring-shell-docs/modules/ROOT/pages/using-shell-execution.adoc
rename to spring-shell-docs/modules/ROOT/pages/execution.adoc
index 83543ecc..75c90293 100644
--- a/spring-shell-docs/modules/ROOT/pages/using-shell-execution.adoc
+++ b/spring-shell-docs/modules/ROOT/pages/execution.adoc
@@ -14,7 +14,7 @@ simple command-line tool without requiring customization.
 
 Currently, interactive mode is entered if any command line options are passed when starting
 or running a shell from a command line. This works especially well when a shell application
-is compiled with xref:using-shell-building.adoc#native[Native Support].
+is compiled with xref:building.adoc#native[Native Support].
 
 Some commands may not have any useful meanings when they run in interactive mode
 or (conversely) in non-interactive mode. For example, a built-in `exit` command would