diff --git a/content/geometry/general.adoc b/content/geometry/general.adoc
index 8b2dc19e..b3fe8bc2 100644
--- a/content/geometry/general.adoc
+++ b/content/geometry/general.adoc
@@ -103,7 +103,7 @@ By static transformations, these coordinate frames may be synchronized with refe
 |===
 
 
-Besides reference coordinate frames, _3D assets_ may incorporate other local coordinate frames, see xref:../geometry/object-classes.adoc[Object classes].
+Besides reference coordinate frames, _3D assets_ may incorporate other local coordinate frames, see xref:../geometry/object-classes-introduction.adoc[Object classes].
 
 == Naming conventions
 
diff --git a/content/geometry/geometry-index.adoc b/content/geometry/geometry-index.adoc
index 67fef918..4cf7c954 100644
--- a/content/geometry/geometry-index.adoc
+++ b/content/geometry/geometry-index.adoc
@@ -2,7 +2,7 @@
 
 * xref:geometry/introduction.adoc[leveloffset=+1]
 * xref:geometry/general.adoc[leveloffset=+1]
-* xref:geometry/object-classes.adoc[leveloffset=+1]
+* xref:geometry/object-classes-introduction.adoc[leveloffset=+1]
 * xref:geometry/file-format-support.adoc[leveloffset=+1]
 * xref:geometry/asset-schema.adoc[leveloffset=+1]
 * xref:geometry/mapping-schema.adoc[leveloffset=+1]
diff --git a/content/geometry/object-classes.adoc b/content/geometry/object-classes-introduction.adoc
similarity index 86%
rename from content/geometry/object-classes.adoc
rename to content/geometry/object-classes-introduction.adoc
index 608a4d6d..1bc48a98 100644
--- a/content/geometry/object-classes.adoc
+++ b/content/geometry/object-classes-introduction.adoc
@@ -1,6 +1,5 @@
-= Object classes
+= Introduction
 
-== Introduction
 In {THIS_STANDARD}, an object class is a collection of similar objects.
 Examples of object classes are vehicles, humans, and road networks.
 Each instance of an object class is described by the same properties, but has
@@ -8,8 +7,8 @@ individual property values.
 
 The {THIS_STANDARD} standard supports the following object classes:
 
-* xref:../geometry/object-vehicle/vehicle-index.adoc[Vehicle] 
-* xref:../geometry/object-human/human-index.adoc[Human] 
+* xref:../geometry/object-vehicle/vehicle-index.adoc[Vehicle]
+* xref:../geometry/object-human/human-index.adoc[Human]
 * xref:../geometry/object-environment/environment-index.adoc[Environment]
 * xref:../geometry/object-other/other-index.adoc[Other]
 
diff --git a/content/index.adoc b/content/index.adoc
index 6495189e..f6399422 100644
--- a/content/index.adoc
+++ b/content/index.adoc
@@ -41,7 +41,7 @@ include::use-cases/use-cases.adoc[leveloffset=+1]
 = Geometry
 include::geometry/introduction.adoc[leveloffset=+1]
 include::geometry/general.adoc[leveloffset=+1]
-include::geometry/object-classes.adoc[leveloffset=+1]
+include::geometry/object-classes-introduction.adoc[leveloffset=+1]
 include::geometry/file-format-support.adoc[leveloffset=+1]
 include::geometry/asset-schema.adoc[leveloffset=+1]
 include::geometry/mapping-schema.adoc[leveloffset=+1]
diff --git a/content/nav-openmaterial.adoc b/content/nav-openmaterial.adoc
index f6911345..7c36bba9 100644
--- a/content/nav-openmaterial.adoc
+++ b/content/nav-openmaterial.adoc
@@ -18,7 +18,8 @@ include::use-cases/use-cases.adoc[leveloffset=+1]
 == 7 Geometry
 include::geometry/introduction.adoc[leveloffset=+2]
 include::geometry/general.adoc[leveloffset=+2]
-include::geometry/object-classes.adoc[leveloffset=+2]
+=== 7.3 Object classes
+include::geometry/object-classes-introduction.adoc[leveloffset=+3]
 include::geometry/object-vehicle/vehicle-index.adoc[leveloffset=+3]
 include::geometry/object-human/human-index.adoc[leveloffset=+3]
 include::geometry/object-environment/environment-index.adoc[leveloffset=+3]