diff --git a/crates/fj-core/src/geometry/geometry.rs b/crates/fj-core/src/geometry/geometry.rs
index ec2ef34ae..914ea501b 100644
--- a/crates/fj-core/src/geometry/geometry.rs
+++ b/crates/fj-core/src/geometry/geometry.rs
@@ -22,7 +22,7 @@ pub struct Geometry {
     vertex: BTreeMap<Handle<Vertex>, VertexGeom>,
 
     curves: BTreeMap<Handle<Curve>, CurveGeom2>,
-    surface_generators: BTreeMap<Handle<Surface>, SurfaceGenerator>,
+    surface_generators: BTreeMap<Handle<Surface>, SurfaceGeom>,
 
     space_2d: Handle<Surface>,
 
@@ -73,7 +73,7 @@ impl Geometry {
 
         self_.define_surface_inner_2(
             self_.xy_plane.clone(),
-            SurfaceGenerator {
+            SurfaceGeom {
                 generator: Box::new(SweptCurve {
                     u: Path::x_axis(),
                     v: Vector::unit_y(),
@@ -83,7 +83,7 @@ impl Geometry {
         );
         self_.define_surface_inner_2(
             self_.xz_plane.clone(),
-            SurfaceGenerator {
+            SurfaceGeom {
                 generator: Box::new(SweptCurve {
                     u: Path::x_axis(),
                     v: Vector::unit_z(),
@@ -93,7 +93,7 @@ impl Geometry {
         );
         self_.define_surface_inner_2(
             self_.yz_plane.clone(),
-            SurfaceGenerator {
+            SurfaceGeom {
                 generator: Box::new(SweptCurve {
                     u: Path::y_axis(),
                     v: Vector::unit_z(),
@@ -149,7 +149,7 @@ impl Geometry {
     pub(crate) fn define_surface_inner_2(
         &mut self,
         surface: Handle<Surface>,
-        geometry: SurfaceGenerator,
+        geometry: SurfaceGeom,
     ) {
         if surface == self.space_2d {
             panic!("Attempting to define geometry for 2D space");
@@ -216,7 +216,7 @@ impl Geometry {
     pub fn generator_for_surface(
         &self,
         surface: &Handle<Surface>,
-    ) -> Option<&SurfaceGenerator> {
+    ) -> Option<&SurfaceGeom> {
         self.surface_generators.get(surface)
     }
 
@@ -314,7 +314,7 @@ pub enum CurveGeom2 {
 ///
 /// Surface are represented by triangle meshes, their uniform intermediate
 /// representation.
-pub struct SurfaceGenerator {
+pub struct SurfaceGeom {
     /// # A generator for surface geometry
     pub generator: Box<dyn GenTriMesh>,
 
diff --git a/crates/fj-core/src/geometry/mod.rs b/crates/fj-core/src/geometry/mod.rs
index bfd61b972..e8a7f913d 100644
--- a/crates/fj-core/src/geometry/mod.rs
+++ b/crates/fj-core/src/geometry/mod.rs
@@ -13,9 +13,7 @@ mod vertex;
 
 pub use self::{
     boundary::{CurveBoundary, CurveBoundaryElement},
-    geometry::{
-        CurveGeom, CurveGeom2, Geometry, LocalCurveGeom, SurfaceGenerator,
-    },
+    geometry::{CurveGeom, CurveGeom2, Geometry, LocalCurveGeom, SurfaceGeom},
     path::Path,
     tolerance::{InvalidTolerance, Tolerance},
     vertex::{LocalVertexGeom, VertexGeom},
diff --git a/crates/fj-core/src/layers/geometry.rs b/crates/fj-core/src/layers/geometry.rs
index 7a6bcf3a5..f3e21fac4 100644
--- a/crates/fj-core/src/layers/geometry.rs
+++ b/crates/fj-core/src/layers/geometry.rs
@@ -3,7 +3,7 @@
 use crate::{
     geometry::{
         surfaces::SweptCurve, CurveGeom2, Geometry, LocalCurveGeom,
-        LocalVertexGeom, SurfaceGenerator,
+        LocalVertexGeom, SurfaceGeom,
     },
     storage::Handle,
     topology::{Curve, Surface, Vertex},
@@ -72,7 +72,7 @@ impl Layer<Geometry> {
     pub fn define_surface_2(
         &mut self,
         surface: Handle<Surface>,
-        generator: SurfaceGenerator,
+        generator: SurfaceGeom,
     ) {
         self.process_command(DefineSurface2 { surface, generator });
     }
@@ -178,7 +178,7 @@ impl Event<Geometry> for DefineSurface {
 /// Define the geometry of a surface
 pub struct DefineSurface2 {
     surface: Handle<Surface>,
-    generator: SurfaceGenerator,
+    generator: SurfaceGeom,
 }
 
 impl Command<Geometry> for DefineSurface2 {
diff --git a/crates/fj-core/src/operations/build/surface.rs b/crates/fj-core/src/operations/build/surface.rs
index 0a2771c37..89dccb6b9 100644
--- a/crates/fj-core/src/operations/build/surface.rs
+++ b/crates/fj-core/src/operations/build/surface.rs
@@ -2,7 +2,7 @@ use fj_math::{Point, Scalar, Vector};
 
 use crate::{
     geometry::{
-        repr::tri_mesh::TriMesh, surfaces::SweptCurve, Path, SurfaceGenerator,
+        repr::tri_mesh::TriMesh, surfaces::SweptCurve, Path, SurfaceGeom,
     },
     operations::insert::Insert,
     storage::Handle,
@@ -28,7 +28,7 @@ pub trait BuildSurface {
             .define_surface(surface.clone(), generator);
         core.layers.geometry.define_surface_2(
             surface.clone(),
-            SurfaceGenerator {
+            SurfaceGeom {
                 generator: Box::new(generator),
                 geometry: TriMesh::empty(),
             },
diff --git a/crates/fj-core/src/operations/transform/surface.rs b/crates/fj-core/src/operations/transform/surface.rs
index cf568e4a2..0e59b9132 100644
--- a/crates/fj-core/src/operations/transform/surface.rs
+++ b/crates/fj-core/src/operations/transform/surface.rs
@@ -4,7 +4,7 @@ use crate::{
     geometry::{
         repr::tri_mesh::TriMesh,
         surfaces::{SweptCurve, TransformedSurface},
-        SurfaceGenerator,
+        SurfaceGeom,
     },
     operations::insert::Insert,
     storage::Handle,
@@ -43,7 +43,7 @@ impl TransformObject for &Handle<Surface> {
 
                 core.layers.geometry.define_surface_2(
                     surface.clone(),
-                    SurfaceGenerator {
+                    SurfaceGeom {
                         generator: Box::new(TransformedSurface {
                             surface: self.clone(),
                             transform: *transform,