diff --git a/book/source/01-intro.md b/book/source/about.md
similarity index 100%
rename from book/source/01-intro.md
rename to book/source/about.md
diff --git a/book/source/24-acknowledgements.md b/book/source/acknowledgements.md
similarity index 100%
rename from book/source/24-acknowledgements.md
rename to book/source/acknowledgements.md
diff --git a/book/source/13-armor.md b/book/source/armor.md
similarity index 100%
rename from book/source/13-armor.md
rename to book/source/armor.md
diff --git a/book/source/a-artifacts.md b/book/source/artifacts.md
similarity index 100%
rename from book/source/a-artifacts.md
rename to book/source/artifacts.md
diff --git a/book/source/04-certificates.md b/book/source/certificates.md
similarity index 100%
rename from book/source/04-certificates.md
rename to book/source/certificates.md
diff --git a/book/source/12-compression.md b/book/source/compression.md
similarity index 100%
rename from book/source/12-compression.md
rename to book/source/compression.md
diff --git a/book/source/03-cryptography.md b/book/source/cryptography.md
similarity index 100%
rename from book/source/03-cryptography.md
rename to book/source/cryptography.md
diff --git a/book/source/11-decryption.md b/book/source/decryption.md
similarity index 100%
rename from book/source/11-decryption.md
rename to book/source/decryption.md
diff --git a/book/source/10-encryption.md b/book/source/encryption.md
similarity index 100%
rename from book/source/10-encryption.md
rename to book/source/encryption.md
diff --git a/book/source/23-glossary.md b/book/source/glossary.md
similarity index 100%
rename from book/source/23-glossary.md
rename to book/source/glossary.md
diff --git a/book/source/index.md b/book/source/index.md
index c038169..9270cd2 100644
--- a/book/source/index.md
+++ b/book/source/index.md
@@ -12,23 +12,23 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 :maxdepth: 2
 :glob:
 
-01-intro.md
-02-highlevel.md
-03-cryptography.md
-04-certificates.md
-05-private.md
-06-signatures.md
-07-signing_data.md
-08-signing_components.md
-09-verification.md
-10-encryption.md
-11-decryption.md
-12-compression.md
-13-armor.md
-14-pitfalls.md
-15-policy.md
-16-versions.md
-17-migration.md
+about.md
+openpgp.md
+cryptography.md
+certificates.md
+private.md
+signatures.md
+signing_data.md
+signing_components.md
+verification.md
+encryption.md
+decryption.md
+compression.md
+armor.md
+pitfalls.md
+policy.md
+versions.md
+migration.md
 
 adv/certificates.md
 adv/private_keys.md
@@ -41,8 +41,8 @@ zoom/private_keys.md
 zoom/signatures.md
 zoom/encyption.md
 
-23-glossary.md
-24-acknowledgements.md
+glossary.md
+acknowledgements.md
 
-a-artifacts.md
+artifacts.md
 ```
diff --git a/book/source/17-migration.md b/book/source/migration.md
similarity index 100%
rename from book/source/17-migration.md
rename to book/source/migration.md
diff --git a/book/source/02-highlevel.md b/book/source/openpgp.md
similarity index 100%
rename from book/source/02-highlevel.md
rename to book/source/openpgp.md
diff --git a/book/source/14-pitfalls.md b/book/source/pitfalls.md
similarity index 100%
rename from book/source/14-pitfalls.md
rename to book/source/pitfalls.md
diff --git a/book/source/15-policy.md b/book/source/policy.md
similarity index 100%
rename from book/source/15-policy.md
rename to book/source/policy.md
diff --git a/book/source/05-private.md b/book/source/private.md
similarity index 100%
rename from book/source/05-private.md
rename to book/source/private.md
diff --git a/book/source/06-signatures.md b/book/source/signatures.md
similarity index 100%
rename from book/source/06-signatures.md
rename to book/source/signatures.md
diff --git a/book/source/08-signing_components.md b/book/source/signing_components.md
similarity index 100%
rename from book/source/08-signing_components.md
rename to book/source/signing_components.md
diff --git a/book/source/07-signing_data.md b/book/source/signing_data.md
similarity index 100%
rename from book/source/07-signing_data.md
rename to book/source/signing_data.md
diff --git a/book/source/09-verification.md b/book/source/verification.md
similarity index 100%
rename from book/source/09-verification.md
rename to book/source/verification.md
diff --git a/book/source/16-versions.md b/book/source/versions.md
similarity index 100%
rename from book/source/16-versions.md
rename to book/source/versions.md