diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
index 5c4cfc920..323a569d1 100644
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -18,10 +18,10 @@
 - [Design and Data Model](design/design.md)
   - [Overview](design/overview.md)
   - [The Store Layer](design/store/store.md)
-    - [Store Objects](design/store/entries.md)
+    - [Store Objects](design/store/objects.md)
     - [Store Paths](design/store/paths.md)
     - [Nix Archives](design/store/nar.md)
-    - [Content-Addressing Store Objects](design/store/entry-ca.md)
+    - [Content-Addressing Store Objects](design/store/object-ca.md)
     - [Derivations](design/store/drvs/drvs.md)
       - [Input-Addressing](design/store/drvs/ia.md)
       - [Content-Addressing (Experimental)](design/store/drvs/ca.md)
diff --git a/doc/manual/src/design/store/building.md b/doc/manual/src/design/store/building.md
index f97b74952..f4f2649a3 100644
--- a/doc/manual/src/design/store/building.md
+++ b/doc/manual/src/design/store/building.md
@@ -2,7 +2,7 @@
 
 ## Scanning for references
 
-Before in the section on [store objects](../entries.md), we talked abstractly about scanning for references.
+Before in the section on [store objects](../objects.md), we talked abstractly about scanning for references.
 Now we can make this concrete.
 
 After the derivation's command is run, Nix needs to process the "raw" output directories to turn them into legit store objects.
diff --git a/doc/manual/src/design/store/entry-ca.md b/doc/manual/src/design/store/object-ca.md
similarity index 100%
rename from doc/manual/src/design/store/entry-ca.md
rename to doc/manual/src/design/store/object-ca.md
diff --git a/doc/manual/src/design/store/entries.md b/doc/manual/src/design/store/objects.md
similarity index 100%
rename from doc/manual/src/design/store/entries.md
rename to doc/manual/src/design/store/objects.md