diff --git a/crates/fj-core/src/topology/mod.rs b/crates/fj-core/src/topology/mod.rs
index 1b6bed7a9..c874d4839 100644
--- a/crates/fj-core/src/topology/mod.rs
+++ b/crates/fj-core/src/topology/mod.rs
@@ -14,14 +14,15 @@
 
 mod any_object;
 mod is_object;
-mod kinds;
 mod object_set;
+mod objects;
 mod stores;
 
 pub use self::{
     any_object::{AboutToBeStored, AnyObject, Bare, Form, Stored},
     is_object::IsObject,
-    kinds::{
+    object_set::{ObjectSet, ObjectSetIntoIter, ObjectSetIter},
+    objects::{
         curve::Curve,
         cycle::Cycle,
         face::{Face, Handedness},
@@ -33,6 +34,5 @@ pub use self::{
         surface::Surface,
         vertex::Vertex,
     },
-    object_set::{ObjectSet, ObjectSetIntoIter, ObjectSetIter},
     stores::{Objects, Surfaces},
 };
diff --git a/crates/fj-core/src/topology/kinds/curve.rs b/crates/fj-core/src/topology/objects/curve.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/curve.rs
rename to crates/fj-core/src/topology/objects/curve.rs
diff --git a/crates/fj-core/src/topology/kinds/cycle.rs b/crates/fj-core/src/topology/objects/cycle.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/cycle.rs
rename to crates/fj-core/src/topology/objects/cycle.rs
diff --git a/crates/fj-core/src/topology/kinds/face.rs b/crates/fj-core/src/topology/objects/face.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/face.rs
rename to crates/fj-core/src/topology/objects/face.rs
diff --git a/crates/fj-core/src/topology/kinds/half_edge.rs b/crates/fj-core/src/topology/objects/half_edge.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/half_edge.rs
rename to crates/fj-core/src/topology/objects/half_edge.rs
diff --git a/crates/fj-core/src/topology/kinds/mod.rs b/crates/fj-core/src/topology/objects/mod.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/mod.rs
rename to crates/fj-core/src/topology/objects/mod.rs
diff --git a/crates/fj-core/src/topology/kinds/region.rs b/crates/fj-core/src/topology/objects/region.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/region.rs
rename to crates/fj-core/src/topology/objects/region.rs
diff --git a/crates/fj-core/src/topology/kinds/shell.rs b/crates/fj-core/src/topology/objects/shell.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/shell.rs
rename to crates/fj-core/src/topology/objects/shell.rs
diff --git a/crates/fj-core/src/topology/kinds/sketch.rs b/crates/fj-core/src/topology/objects/sketch.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/sketch.rs
rename to crates/fj-core/src/topology/objects/sketch.rs
diff --git a/crates/fj-core/src/topology/kinds/solid.rs b/crates/fj-core/src/topology/objects/solid.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/solid.rs
rename to crates/fj-core/src/topology/objects/solid.rs
diff --git a/crates/fj-core/src/topology/kinds/surface.rs b/crates/fj-core/src/topology/objects/surface.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/surface.rs
rename to crates/fj-core/src/topology/objects/surface.rs
diff --git a/crates/fj-core/src/topology/kinds/vertex.rs b/crates/fj-core/src/topology/objects/vertex.rs
similarity index 100%
rename from crates/fj-core/src/topology/kinds/vertex.rs
rename to crates/fj-core/src/topology/objects/vertex.rs