cleanup

25 files changed, 231 insertions, 189 deletions

diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
index 46105b1b25a..eef94c51251 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_clamp.cc
@@ -20,7 +20,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_clamp_node {
+namespace blender::nodes::attribute_clamp_legacy_node {
 
 static void geo_node_attribute_clamp_declare(NodeDeclarationBuilder &b)
 {
@@ -262,7 +262,7 @@ static void geo_node_attribute_clamp_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_clamp_node
+}  // namespace blender::nodes::attribute_clamp_legacy_node
 
 void register_node_type_geo_attribute_clamp()
 {
@@ -270,12 +270,15 @@ void register_node_type_geo_attribute_clamp()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_CLAMP, "Attribute Clamp", NODE_CLASS_ATTRIBUTE, 0);
-  node_type_init(&ntype, blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_init);
-  node_type_update(&ntype, blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_update);
-  ntype.declare = blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_declare;
+  node_type_init(&ntype,
+                 blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_init);
+  node_type_update(&ntype,
+                   blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_update);
+  ntype.declare = blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_exec;
-  ntype.draw_buttons = blender::nodes::attribute_clamp_node::geo_node_attribute_clamp_layout;
+      blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_exec;
+  ntype.draw_buttons =
+      blender::nodes::attribute_clamp_legacy_node::geo_node_attribute_clamp_layout;
   node_type_storage(
       &ntype, "NodeAttributeClamp", node_free_standard_storage, node_copy_standard_storage);
   nodeRegisterType(&ntype);
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
index 4817b1d9985..e25008135c3 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_color_ramp.cc
@@ -23,7 +23,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_color_ramp_node {
+namespace blender::nodes::attribute_color_ramp_legacy_node {
 
 static void geo_node_attribute_color_ramp_declare(NodeDeclarationBuilder &b)
 {
@@ -119,7 +119,7 @@ static void geo_node_attribute_color_ramp_exec(GeoNodeExecParams params)
   params.set_output("Geometry", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes::attribute_color_ramp_node
+}  // namespace blender::nodes::attribute_color_ramp_legacy_node
 
 void register_node_type_geo_attribute_color_ramp()
 {
@@ -132,13 +132,15 @@ void register_node_type_geo_attribute_color_ramp()
                      0);
   node_type_storage(
       &ntype, "NodeAttributeColorRamp", node_free_standard_storage, node_copy_standard_storage);
-  node_type_init(&ntype,
-                 blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_init);
+  node_type_init(
+      &ntype,
+      blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_init);
   node_type_size_preset(&ntype, NODE_SIZE_LARGE);
-  ntype.declare = blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_declare;
+  ntype.declare =
+      blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_exec;
+      blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_exec;
   ntype.draw_buttons =
-      blender::nodes::attribute_color_ramp_node::geo_node_attribute_color_ramp_layout;
+      blender::nodes::attribute_color_ramp_legacy_node::geo_node_attribute_color_ramp_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
index 9d8d5dab127..c097ce596ef 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_combine_xyz.cc
@@ -19,7 +19,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_combine_xyz_node {
+namespace blender::nodes::attribute_combine_xyz_legacy_node {
 
 static void geo_node_attribute_combine_xyz_declare(NodeDeclarationBuilder &b)
 {
@@ -130,7 +130,7 @@ static void geo_node_attribute_combine_xyz_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_combine_xyz_node
+}  // namespace blender::nodes::attribute_combine_xyz_legacy_node
 
 void register_node_type_geo_attribute_combine_xyz()
 {
@@ -141,18 +141,20 @@ void register_node_type_geo_attribute_combine_xyz()
                      "Attribute Combine XYZ",
                      NODE_CLASS_ATTRIBUTE,
                      0);
-  node_type_init(&ntype,
-                 blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_init);
+  node_type_init(
+      &ntype,
+      blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_init);
   node_type_update(
-      &ntype, blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_update);
+      &ntype,
+      blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_update);
   node_type_storage(
       &ntype, "NodeAttributeCombineXYZ", node_free_standard_storage, node_copy_standard_storage);
 
   ntype.declare =
-      blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_declare;
+      blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_exec;
+      blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_exec;
   ntype.draw_buttons =
-      blender::nodes::attribute_combine_xyz_node::geo_node_attribute_combine_xyz_layout;
+      blender::nodes::attribute_combine_xyz_legacy_node::geo_node_attribute_combine_xyz_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
index fb9ed3485f1..98aa29b45d9 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_compare.cc
@@ -21,7 +21,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_compare_node {
+namespace blender::nodes::attribute_compare_legacy_node {
 
 static void geo_node_attribute_compare_declare(NodeDeclarationBuilder &b)
 {
@@ -341,7 +341,7 @@ static void geo_node_attribute_compare_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_compare_node
+}  // namespace blender::nodes::attribute_compare_legacy_node
 
 void register_node_type_geo_attribute_compare()
 {
@@ -349,14 +349,17 @@ void register_node_type_geo_attribute_compare()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_COMPARE, "Attribute Compare", NODE_CLASS_ATTRIBUTE, 0);
-  ntype.declare = blender::nodes::attribute_compare_node::geo_node_attribute_compare_declare;
+  ntype.declare =
+      blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_compare_node::geo_node_attribute_compare_exec;
-  ntype.draw_buttons = blender::nodes::attribute_compare_node::geo_node_attribute_compare_layout;
-  node_type_update(&ntype,
-                   blender::nodes::attribute_compare_node::geo_node_attribute_compare_update);
+      blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_exec;
+  ntype.draw_buttons =
+      blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_layout;
+  node_type_update(
+      &ntype, blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_update);
   node_type_storage(
       &ntype, "NodeAttributeCompare", node_free_standard_storage, node_copy_standard_storage);
-  node_type_init(&ntype, blender::nodes::attribute_compare_node::geo_node_attribute_compare_init);
+  node_type_init(&ntype,
+                 blender::nodes::attribute_compare_legacy_node::geo_node_attribute_compare_init);
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
index 97eb72b4e32..0109d45db15 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_curve_map.cc
@@ -24,7 +24,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_curve_map_node {
+namespace blender::nodes::attribute_curve_map_legacy_node {
 
 static void geo_node_attribute_curve_map_declare(NodeDeclarationBuilder &b)
 {
@@ -204,7 +204,7 @@ static void geo_node_attribute_curve_map_exec(GeoNodeExecParams params)
   params.set_output("Geometry", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes::attribute_curve_map_node
+}  // namespace blender::nodes::attribute_curve_map_legacy_node
 
 void register_node_type_geo_attribute_curve_map()
 {
@@ -212,20 +212,22 @@ void register_node_type_geo_attribute_curve_map()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_CURVE_MAP, "Attribute Curve Map", NODE_CLASS_ATTRIBUTE, 0);
-  node_type_update(&ntype,
-                   blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_update);
-  node_type_init(&ntype,
-                 blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_init);
+  node_type_update(
+      &ntype,
+      blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_update);
+  node_type_init(
+      &ntype, blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_init);
   node_type_size_preset(&ntype, NODE_SIZE_LARGE);
   node_type_storage(
       &ntype,
       "NodeAttributeCurveMap",
-      blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_free_storage,
-      blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_copy_storage);
-  ntype.declare = blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_declare;
+      blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_free_storage,
+      blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_copy_storage);
+  ntype.declare =
+      blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_exec;
+      blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_exec;
   ntype.draw_buttons =
-      blender::nodes::attribute_curve_map_node::geo_node_attribute_curve_map_layout;
+      blender::nodes::attribute_curve_map_legacy_node::geo_node_attribute_curve_map_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc
index a88f16a1117..6cc45525efe 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_fill.cc
@@ -19,7 +19,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_fill_node {
+namespace blender::nodes::attribute_fill_legacy_node {
 
 static void geo_node_attribute_fill_declare(NodeDeclarationBuilder &b)
 {
@@ -146,7 +146,7 @@ static void geo_node_attribute_fill_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_fill_node
+}  // namespace blender::nodes::attribute_fill_legacy_node
 
 void register_node_type_geo_attribute_fill()
 {
@@ -154,10 +154,12 @@ void register_node_type_geo_attribute_fill()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_FILL, "Attribute Fill", NODE_CLASS_ATTRIBUTE, 0);
-  node_type_init(&ntype, blender::nodes::attribute_fill_node::geo_node_attribute_fill_init);
-  node_type_update(&ntype, blender::nodes::attribute_fill_node::geo_node_attribute_fill_update);
-  ntype.geometry_node_execute = blender::nodes::attribute_fill_node::geo_node_attribute_fill_exec;
-  ntype.draw_buttons = blender::nodes::attribute_fill_node::geo_node_attribute_fill_layout;
-  ntype.declare = blender::nodes::attribute_fill_node::geo_node_attribute_fill_declare;
+  node_type_init(&ntype, blender::nodes::attribute_fill_legacy_node::geo_node_attribute_fill_init);
+  node_type_update(&ntype,
+                   blender::nodes::attribute_fill_legacy_node::geo_node_attribute_fill_update);
+  ntype.geometry_node_execute =
+      blender::nodes::attribute_fill_legacy_node::geo_node_attribute_fill_exec;
+  ntype.draw_buttons = blender::nodes::attribute_fill_legacy_node::geo_node_attribute_fill_layout;
+  ntype.declare = blender::nodes::attribute_fill_legacy_node::geo_node_attribute_fill_declare;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc
index 62b06e20c89..f1a7da0bdea 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_map_range.cc
@@ -22,7 +22,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_map_range_node {
+namespace blender::nodes::attribute_map_range_legacy_node {
 
 static void geo_node_attribute_map_range_declare(NodeDeclarationBuilder &b)
 {
@@ -413,7 +413,7 @@ static void geo_node_attribute_map_range_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_map_range_node
+}  // namespace blender::nodes::attribute_map_range_legacy_node
 
 void register_node_type_geo_attribute_map_range()
 {
@@ -422,14 +422,17 @@ void register_node_type_geo_attribute_map_range()
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_MAP_RANGE, "Attribute Map Range", NODE_CLASS_ATTRIBUTE, 0);
   ntype.geometry_node_execute =
-      blender::nodes::attribute_map_range_node::geo_node_attribute_map_range_exec;
-  node_type_init(&ntype,
-                 blender::nodes::attribute_map_range_node::geo_node_attribute_map_range_init);
-  node_type_update(&ntype,
-                   blender::nodes::attribute_map_range_node::geo_node_attribute_map_range_update);
+      blender::nodes::attribute_map_range_legacy_node::geo_node_attribute_map_range_exec;
+  node_type_init(
+      &ntype, blender::nodes::attribute_map_range_legacy_node::geo_node_attribute_map_range_init);
+  node_type_update(
+      &ntype,
+      blender::nodes::attribute_map_range_legacy_node::geo_node_attribute_map_range_update);
   node_type_storage(
       &ntype, "NodeAttributeMapRange", node_free_standard_storage, node_copy_standard_storage);
-  ntype.declare = blender::nodes::attribute_map_range_node::geo_node_attribute_map_range_declare;
-  ntype.draw_buttons = blender::nodes::attribute_map_range_node::fn_attribute_map_range_layout;
+  ntype.declare =
+      blender::nodes::attribute_map_range_legacy_node::geo_node_attribute_map_range_declare;
+  ntype.draw_buttons =
+      blender::nodes::attribute_map_range_legacy_node::fn_attribute_map_range_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc
index 947e3eb2c6d..fd76f098f21 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_math.cc
@@ -25,7 +25,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_math_node {
+namespace blender::nodes::attribute_math_legacy_node {
 
 static void geo_node_attribute_math_declare(NodeDeclarationBuilder &b)
 {
@@ -295,7 +295,7 @@ static void geo_node_attribute_math_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_math_node
+}  // namespace blender::nodes::attribute_math_legacy_node
 
 void register_node_type_geo_attribute_math()
 {
@@ -303,12 +303,14 @@ void register_node_type_geo_attribute_math()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_MATH, "Attribute Math", NODE_CLASS_ATTRIBUTE, 0);
-  ntype.declare = blender::nodes::attribute_math_node::geo_node_attribute_math_declare;
-  ntype.geometry_node_execute = blender::nodes::attribute_math_node::geo_node_attribute_math_exec;
-  ntype.draw_buttons = blender::nodes::attribute_math_node::geo_node_attribute_math_layout;
-  node_type_label(&ntype, blender::nodes::attribute_math_node::geo_node_math_label);
-  node_type_update(&ntype, blender::nodes::attribute_math_node::geo_node_attribute_math_update);
-  node_type_init(&ntype, blender::nodes::attribute_math_node::geo_node_attribute_math_init);
+  ntype.declare = blender::nodes::attribute_math_legacy_node::geo_node_attribute_math_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::attribute_math_legacy_node::geo_node_attribute_math_exec;
+  ntype.draw_buttons = blender::nodes::attribute_math_legacy_node::geo_node_attribute_math_layout;
+  node_type_label(&ntype, blender::nodes::attribute_math_legacy_node::geo_node_math_label);
+  node_type_update(&ntype,
+                   blender::nodes::attribute_math_legacy_node::geo_node_attribute_math_update);
+  node_type_init(&ntype, blender::nodes::attribute_math_legacy_node::geo_node_attribute_math_init);
   node_type_storage(
       &ntype, "NodeAttributeMath", node_free_standard_storage, node_copy_standard_storage);
   nodeRegisterType(&ntype);
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc
index 77926e84e2f..915a4ad8e33 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_mix.cc
@@ -25,7 +25,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_mix_node {
+namespace blender::nodes::attribute_mix_legacy_node {
 
 static void geo_node_mix_attribute_declare(NodeDeclarationBuilder &b)
 {
@@ -238,19 +238,21 @@ static void geo_node_attribute_mix_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_mix_node
+}  // namespace blender::nodes::attribute_mix_legacy_node
 
 void register_node_type_geo_attribute_mix()
 {
   static bNodeType ntype;
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_MIX, "Attribute Mix", NODE_CLASS_ATTRIBUTE, 0);
-  node_type_init(&ntype, blender::nodes::attribute_mix_node::geo_node_attribute_mix_init);
-  node_type_update(&ntype, blender::nodes::attribute_mix_node::geo_node_attribute_mix_update);
-  ntype.declare = blender::nodes::attribute_mix_node::geo_node_mix_attribute_declare;
-  ntype.draw_buttons = blender::nodes::attribute_mix_node::geo_node_attribute_mix_layout;
+  node_type_init(&ntype, blender::nodes::attribute_mix_legacy_node::geo_node_attribute_mix_init);
+  node_type_update(&ntype,
+                   blender::nodes::attribute_mix_legacy_node::geo_node_attribute_mix_update);
+  ntype.declare = blender::nodes::attribute_mix_legacy_node::geo_node_mix_attribute_declare;
+  ntype.draw_buttons = blender::nodes::attribute_mix_legacy_node::geo_node_attribute_mix_layout;
   node_type_storage(
       &ntype, "NodeAttributeMix", node_free_standard_storage, node_copy_standard_storage);
-  ntype.geometry_node_execute = blender::nodes::attribute_mix_node::geo_node_attribute_mix_exec;
+  ntype.geometry_node_execute =
+      blender::nodes::attribute_mix_legacy_node::geo_node_attribute_mix_exec;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
index 77c4d21a234..28b5786d9db 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_sample_texture.cc
@@ -28,7 +28,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_sample_texture_node {
+namespace blender::nodes::attribute_sample_texture_legacy_node {
 
 static void geo_node_attribute_sample_texture_declare(NodeDeclarationBuilder &b)
 {
@@ -119,7 +119,7 @@ static void geo_node_attribute_sample_texture_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_sample_texture_node
+}  // namespace blender::nodes::attribute_sample_texture_legacy_node
 
 void register_node_type_geo_sample_texture()
 {
@@ -131,9 +131,9 @@ void register_node_type_geo_sample_texture()
                      NODE_CLASS_ATTRIBUTE,
                      0);
   node_type_size_preset(&ntype, NODE_SIZE_LARGE);
-  ntype.declare =
-      blender::nodes::attribute_sample_texture_node::geo_node_attribute_sample_texture_declare;
+  ntype.declare = blender::nodes::attribute_sample_texture_legacy_node::
+      geo_node_attribute_sample_texture_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_sample_texture_node::geo_node_attribute_sample_texture_exec;
+      blender::nodes::attribute_sample_texture_legacy_node::geo_node_attribute_sample_texture_exec;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
index a32956de858..5d9a1b6eac5 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_separate_xyz.cc
@@ -19,7 +19,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_separate_xyz_node {
+namespace blender::nodes::attribute_separate_xyz_legacy_node {
 
 static void geo_node_attribute_separate_xyz_declare(NodeDeclarationBuilder &b)
 {
@@ -151,7 +151,7 @@ static void geo_node_attribute_separate_xyz_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_separate_xyz_node
+}  // namespace blender::nodes::attribute_separate_xyz_legacy_node
 
 void register_node_type_geo_attribute_separate_xyz()
 {
@@ -163,16 +163,18 @@ void register_node_type_geo_attribute_separate_xyz()
                      NODE_CLASS_ATTRIBUTE,
                      0);
   ntype.declare =
-      blender::nodes::attribute_separate_xyz_node::geo_node_attribute_separate_xyz_declare;
+      blender::nodes::attribute_separate_xyz_legacy_node::geo_node_attribute_separate_xyz_declare;
   node_type_init(
-      &ntype, blender::nodes::attribute_separate_xyz_node::geo_node_attribute_separate_xyz_init);
+      &ntype,
+      blender::nodes::attribute_separate_xyz_legacy_node::geo_node_attribute_separate_xyz_init);
   node_type_update(
-      &ntype, blender::nodes::attribute_separate_xyz_node::geo_node_attribute_separate_xyz_update);
+      &ntype,
+      blender::nodes::attribute_separate_xyz_legacy_node::geo_node_attribute_separate_xyz_update);
   node_type_storage(
       &ntype, "NodeAttributeSeparateXYZ", node_free_standard_storage, node_copy_standard_storage);
   ntype.geometry_node_execute =
-      blender::nodes::attribute_separate_xyz_node::geo_node_attribute_separate_xyz_exec;
+      blender::nodes::attribute_separate_xyz_legacy_node::geo_node_attribute_separate_xyz_exec;
   ntype.draw_buttons =
-      blender::nodes::attribute_separate_xyz_node::geo_node_attribute_separate_xyz_layout;
+      blender::nodes::attribute_separate_xyz_legacy_node::geo_node_attribute_separate_xyz_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
index 3a9cd52661a..b15e4360c85 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
@@ -29,7 +29,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::attribute_transfer_legacy_node {
 
 static void geo_node_attribute_transfer_declare(NodeDeclarationBuilder &b)
 {
@@ -510,7 +510,7 @@ static void geo_node_attribute_transfer_exec(GeoNodeExecParams params)
   params.set_output("Geometry", dst_geometry_set);
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::attribute_transfer_legacy_node
 
 void register_node_type_geo_legacy_attribute_transfer()
 {
@@ -518,13 +518,17 @@ void register_node_type_geo_legacy_attribute_transfer()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER, "Attribute Transfer", NODE_CLASS_ATTRIBUTE, 0);
-  node_type_init(&ntype, blender::nodes::geo_node_attribute_transfer_init);
+  node_type_init(&ntype,
+                 blender::nodes::attribute_transfer_legacy_node::geo_node_attribute_transfer_init);
   node_type_storage(&ntype,
                     "NodeGeometryAttributeTransfer",
                     node_free_standard_storage,
                     node_copy_standard_storage);
-  ntype.declare = blender::nodes::geo_node_attribute_transfer_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_attribute_transfer_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_attribute_transfer_layout;
+  ntype.declare =
+      blender::nodes::attribute_transfer_legacy_node::geo_node_attribute_transfer_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::attribute_transfer_legacy_node::geo_node_attribute_transfer_exec;
+  ntype.draw_buttons =
+      blender::nodes::attribute_transfer_legacy_node::geo_node_attribute_transfer_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc
index 85b7b1330fc..b5127a5a678 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_math.cc
@@ -26,7 +26,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::attribute_vector_math_node {
+namespace blender::nodes::attribute_vector_math_legacy_node {
 
 static void geo_node_attribute_vector_math_declare(NodeDeclarationBuilder &b)
 {
@@ -549,7 +549,7 @@ static void geo_node_attribute_vector_math_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
-}  // namespace blender::nodes::attribute_vector_math_node
+}  // namespace blender::nodes::attribute_vector_math_legacy_node
 
 void register_node_type_geo_attribute_vector_math()
 {
@@ -561,16 +561,19 @@ void register_node_type_geo_attribute_vector_math()
                      NODE_CLASS_ATTRIBUTE,
                      0);
   ntype.declare =
-      blender::nodes::attribute_vector_math_node::geo_node_attribute_vector_math_declare;
+      blender::nodes::attribute_vector_math_legacy_node::geo_node_attribute_vector_math_declare;
   ntype.geometry_node_execute =
-      blender::nodes::attribute_vector_math_node::geo_node_attribute_vector_math_exec;
+      blender::nodes::attribute_vector_math_legacy_node::geo_node_attribute_vector_math_exec;
   ntype.draw_buttons =
-      blender::nodes::attribute_vector_math_node::geo_node_attribute_vector_math_layout;
-  node_type_label(&ntype, blender::nodes::attribute_vector_math_node::geo_node_vector_math_label);
+      blender::nodes::attribute_vector_math_legacy_node::geo_node_attribute_vector_math_layout;
+  node_type_label(&ntype,
+                  blender::nodes::attribute_vector_math_legacy_node::geo_node_vector_math_label);
   node_type_update(
-      &ntype, blender::nodes::attribute_vector_math_node::geo_node_attribute_vector_math_update);
-  node_type_init(&ntype,
-                 blender::nodes::attribute_vector_math_node::geo_node_attribute_vector_math_init);
+      &ntype,
+      blender::nodes::attribute_vector_math_legacy_node::geo_node_attribute_vector_math_update);
+  node_type_init(
+      &ntype,
+      blender::nodes::attribute_vector_math_legacy_node::geo_node_attribute_vector_math_init);
   node_type_storage(
       &ntype, "NodeAttributeVectorMath", node_free_standard_storage, node_copy_standard_storage);
 
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
index ed32379aabd..55c42d6d5b6 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_vector_rotate.cc
@@ -21,7 +21,7 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
-namespace blender::nodes::attribute_vector_rotate_node {
+namespace blender::nodes::attribute_vector_rotate_legacy_node {
 
 static void geo_node_attribute_vector_rotate_declare(NodeDeclarationBuilder &b)
 {
@@ -325,7 +325,7 @@ static void geo_node_attribute_vector_rotate_exec(GeoNodeExecParams params)
   params.set_output("Geometry", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes::attribute_vector_rotate_node
+}  // namespace blender::nodes::attribute_vector_rotate_legacy_node
 
 void register_node_type_geo_attribute_vector_rotate()
 {
@@ -336,19 +336,20 @@ void register_node_type_geo_attribute_vector_rotate()
                      "Attribute Vector Rotate",
                      NODE_CLASS_ATTRIBUTE,
                      0);
-  node_type_update(
-      &ntype,
-      blender::nodes::attribute_vector_rotate_node::geo_node_attribute_vector_rotate_update);
+  node_type_update(&ntype,
+                   blender::nodes::attribute_vector_rotate_legacy_node::
+                       geo_node_attribute_vector_rotate_update);
   node_type_init(
-      &ntype, blender::nodes::attribute_vector_rotate_node::geo_node_attribute_vector_rotate_init);
+      &ntype,
+      blender::nodes::attribute_vector_rotate_legacy_node::geo_node_attribute_vector_rotate_init);
   node_type_size(&ntype, 165, 100, 600);
   node_type_storage(
       &ntype, "NodeAttributeVectorRotate", node_free_standard_storage, node_copy_standard_storage);
   ntype.geometry_node_execute =
-      blender::nodes::attribute_vector_rotate_node::geo_node_attribute_vector_rotate_exec;
+      blender::nodes::attribute_vector_rotate_legacy_node::geo_node_attribute_vector_rotate_exec;
   ntype.draw_buttons =
-      blender::nodes::attribute_vector_rotate_node::geo_node_attribute_vector_rotate_layout;
-  ntype.declare =
-      blender::nodes::attribute_vector_rotate_node::geo_node_attribute_vector_rotate_declare;
+      blender::nodes::attribute_vector_rotate_legacy_node::geo_node_attribute_vector_rotate_layout;
+  ntype.declare = blender::nodes::attribute_vector_rotate_legacy_node::
+      geo_node_attribute_vector_rotate_declare;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc
index 9d23019e1e1..ebc3b5c6de5 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_endpoints.cc
@@ -25,7 +25,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::curve_endpoints_node {
+namespace blender::nodes::curve_endpoints_legacy_node {
 
 static void geo_node_curve_endpoints_declare(NodeDeclarationBuilder &b)
 {
@@ -206,7 +206,7 @@ static void geo_node_curve_endpoints_exec(GeoNodeExecParams params)
   params.set_output("End Points", std::move(end_result));
 }
 
-}  // namespace blender::nodes::curve_endpoints_node
+}  // namespace blender::nodes::curve_endpoints_legacy_node
 
 void register_node_type_geo_legacy_curve_endpoints()
 {
@@ -214,9 +214,9 @@ void register_node_type_geo_legacy_curve_endpoints()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_CURVE_ENDPOINTS, "Curve Endpoints", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::curve_endpoints_node::geo_node_curve_endpoints_declare;
+  ntype.declare = blender::nodes::curve_endpoints_legacy_node::geo_node_curve_endpoints_declare;
   ntype.geometry_node_execute =
-      blender::nodes::curve_endpoints_node::geo_node_curve_endpoints_exec;
+      blender::nodes::curve_endpoints_legacy_node::geo_node_curve_endpoints_exec;
 
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
index b3850256f47..15ab04928b6 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_curve_select_by_handle_type.cc
@@ -23,7 +23,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes::select_by_handle_type_node {
+namespace blender::nodes::select_by_handle_type_legacy_node {
 
 static void geo_node_select_by_handle_type_declare(NodeDeclarationBuilder &b)
 {
@@ -121,7 +121,7 @@ static void geo_node_select_by_handle_type_exec(GeoNodeExecParams params)
   params.set_output("Geometry", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes::select_by_handle_type_node
+}  // namespace blender::nodes::select_by_handle_type_legacy_node
 
 void register_node_type_geo_legacy_select_by_handle_type()
 {
@@ -133,18 +133,18 @@ void register_node_type_geo_legacy_select_by_handle_type()
                      NODE_CLASS_GEOMETRY,
                      0);
   ntype.declare =
-      blender::nodes::select_by_handle_type_node::geo_node_select_by_handle_type_declare;
+      blender::nodes::select_by_handle_type_legacy_node::geo_node_select_by_handle_type_declare;
   ntype.geometry_node_execute =
-      blender::nodes::select_by_handle_type_node::geo_node_select_by_handle_type_exec;
-  node_type_init(
-      &ntype,
-      blender::nodes::select_by_handle_type_node::geo_node_curve_select_by_handle_type_init);
+      blender::nodes::select_by_handle_type_legacy_node::geo_node_select_by_handle_type_exec;
+  node_type_init(&ntype,
+                 blender::nodes::select_by_handle_type_legacy_node::
+                     geo_node_curve_select_by_handle_type_init);
   node_type_storage(&ntype,
                     "NodeGeometryCurveSelectHandles",
                     node_free_standard_storage,
                     node_copy_standard_storage);
-  ntype.draw_buttons =
-      blender::nodes::select_by_handle_type_node::geo_node_curve_select_by_handle_type_layout;
+  ntype.draw_buttons = blender::nodes::select_by_handle_type_legacy_node::
+      geo_node_curve_select_by_handle_type_layout;
 
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc
index dd972ad5e85..45803801646 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_delete_geometry.cc
@@ -29,19 +29,19 @@
 using blender::bke::CustomDataAttributes;
 
 /* Code from the mask modifier in MOD_mask.cc. */
-extern void copy_masked_vertices_to_new_mesh(const Mesh &src_mesh,
-                                             Mesh &dst_mesh,
-                                             blender::Span<int> vertex_map);
-extern void copy_masked_edges_to_new_mesh(const Mesh &src_mesh,
-                                          Mesh &dst_mesh,
-                                          blender::Span<int> vertex_map,
-                                          blender::Span<int> edge_map);
-extern void copy_masked_polys_to_new_mesh(const Mesh &src_mesh,
-                                          Mesh &dst_mesh,
-                                          blender::Span<int> vertex_map,
-                                          blender::Span<int> edge_map,
-                                          blender::Span<int> masked_poly_indices,
-                                          blender::Span<int> new_loop_starts);
+void copy_masked_vertices_to_new_mesh(const Mesh &src_mesh,
+                                      Mesh &dst_mesh,
+                                      blender::Span<int> vertex_map);
+void copy_masked_edges_to_new_mesh(const Mesh &src_mesh,
+                                   Mesh &dst_mesh,
+                                   blender::Span<int> vertex_map,
+                                   blender::Span<int> edge_map);
+void copy_masked_polys_to_new_mesh(const Mesh &src_mesh,
+                                   Mesh &dst_mesh,
+                                   blender::Span<int> vertex_map,
+                                   blender::Span<int> edge_map,
+                                   blender::Span<int> masked_poly_indices,
+                                   blender::Span<int> new_loop_starts);
 
 namespace blender::nodes::delete_geometry_legacy_node {
 
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc
index 295cd05fd01..1a73f5cbfc0 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_subdivision_surface.cc
@@ -23,7 +23,7 @@
 #include "UI_resources.h"
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::subdivision_surface_legacy_node {
 
 static void geo_node_subdivision_surface_declare(NodeDeclarationBuilder &b)
 {
@@ -126,7 +126,7 @@ static void geo_node_subdivision_surface_exec(GeoNodeExecParams params)
   params.set_output("Geometry", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::subdivision_surface_legacy_node
 
 void register_node_type_geo_legacy_subdivision_surface()
 {
@@ -134,10 +134,14 @@ void register_node_type_geo_legacy_subdivision_surface()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_SUBDIVISION_SURFACE, "Subdivision Surface", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_subdivision_surface_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_subdivision_surface_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_subdivision_surface_layout;
-  node_type_init(&ntype, blender::nodes::geo_node_subdivision_surface_init);
+  ntype.declare =
+      blender::nodes::subdivision_surface_legacy_node::geo_node_subdivision_surface_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::subdivision_surface_legacy_node::geo_node_subdivision_surface_exec;
+  ntype.draw_buttons =
+      blender::nodes::subdivision_surface_legacy_node::geo_node_subdivision_surface_layout;
+  node_type_init(
+      &ntype, blender::nodes::subdivision_surface_legacy_node::geo_node_subdivision_surface_init);
   node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
   node_type_storage(&ntype,
                     "NodeGeometrySubdivisionSurface",
diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
index 4ac155d2f57..5bfbc0d4a28 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
@@ -32,19 +32,19 @@
 using blender::bke::CustomDataAttributes;
 
 /* Code from the mask modifier in MOD_mask.cc. */
-extern void copy_masked_vertices_to_new_mesh(const Mesh &src_mesh,
-                                             Mesh &dst_mesh,
-                                             blender::Span<int> vertex_map);
-extern void copy_masked_edges_to_new_mesh(const Mesh &src_mesh,
-                                          Mesh &dst_mesh,
-                                          blender::Span<int> vertex_map,
-                                          blender::Span<int> edge_map);
-extern void copy_masked_polys_to_new_mesh(const Mesh &src_mesh,
-                                          Mesh &dst_mesh,
-                                          blender::Span<int> vertex_map,
-                                          blender::Span<int> edge_map,
-                                          blender::Span<int> masked_poly_indices,
-                                          blender::Span<int> new_loop_starts);
+void copy_masked_vertices_to_new_mesh(const Mesh &src_mesh,
+                                      Mesh &dst_mesh,
+                                      blender::Span<int> vertex_map);
+void copy_masked_edges_to_new_mesh(const Mesh &src_mesh,
+                                   Mesh &dst_mesh,
+                                   blender::Span<int> vertex_map,
+                                   blender::Span<int> edge_map);
+void copy_masked_polys_to_new_mesh(const Mesh &src_mesh,
+                                   Mesh &dst_mesh,
+                                   blender::Span<int> vertex_map,
+                                   blender::Span<int> edge_map,
+                                   blender::Span<int> masked_poly_indices,
+                                   blender::Span<int> new_loop_starts);
 
 namespace blender::nodes::delete_geometry_node {
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc
index 11865c635b8..07136b098bc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_curve.cc
@@ -18,7 +18,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::mesh_to_curve_node {
 
 static void geo_node_legacy_mesh_to_curve_declare(NodeDeclarationBuilder &b)
 {
@@ -56,14 +56,15 @@ static void geo_node_legacy_mesh_to_curve_exec(GeoNodeExecParams params)
   params.set_output("Curve", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::mesh_to_curve_node
 
 void register_node_type_geo_mesh_to_curve()
 {
   static bNodeType ntype;
 
   geo_node_type_base(&ntype, GEO_NODE_MESH_TO_CURVE, "Mesh to Curve", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_legacy_mesh_to_curve_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_legacy_mesh_to_curve_exec;
+  ntype.declare = blender::nodes::mesh_to_curve_node::geo_node_legacy_mesh_to_curve_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::mesh_to_curve_node::geo_node_legacy_mesh_to_curve_exec;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc
index 92911e89f59..2e1ad431c71 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc
@@ -26,7 +26,7 @@
 
 using blender::Array;
 
-namespace blender::nodes {
+namespace blender::nodes::mesh_to_points_node {
 
 static void geo_node_mesh_to_points_declare(NodeDeclarationBuilder &b)
 {
@@ -172,17 +172,17 @@ static void geo_node_mesh_to_points_exec(GeoNodeExecParams params)
   params.set_output("Points", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::mesh_to_points_node
 
 void register_node_type_geo_mesh_to_points()
 {
   static bNodeType ntype;
 
   geo_node_type_base(&ntype, GEO_NODE_MESH_TO_POINTS, "Mesh to Points", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_mesh_to_points_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_mesh_to_points_exec;
-  node_type_init(&ntype, blender::nodes::geo_node_mesh_to_points_init);
-  ntype.draw_buttons = blender::nodes::geo_node_mesh_to_points_layout;
+  ntype.declare = blender::nodes::mesh_to_points_node::geo_node_mesh_to_points_declare;
+  ntype.geometry_node_execute = blender::nodes::mesh_to_points_node::geo_node_mesh_to_points_exec;
+  node_type_init(&ntype, blender::nodes::mesh_to_points_node::geo_node_mesh_to_points_init);
+  ntype.draw_buttons = blender::nodes::mesh_to_points_node::geo_node_mesh_to_points_layout;
   node_type_storage(
       &ntype, "NodeGeometryMeshToPoints", node_free_standard_storage, node_copy_standard_storage);
   nodeRegisterType(&ntype);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
index 312ea7df919..e0d65021299 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
@@ -28,7 +28,7 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
-namespace blender::nodes {
+namespace blender::nodes::points_to_volume_node {
 
 static void geo_node_points_to_volume_declare(NodeDeclarationBuilder &b)
 {
@@ -253,7 +253,7 @@ static void geo_node_points_to_volume_exec(GeoNodeExecParams params)
 #endif
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::points_to_volume_node
 
 void register_node_type_geo_points_to_volume()
 {
@@ -266,10 +266,12 @@ void register_node_type_geo_points_to_volume()
                     node_free_standard_storage,
                     node_copy_standard_storage);
   node_type_size(&ntype, 170, 120, 700);
-  node_type_init(&ntype, blender::nodes::geo_node_points_to_volume_init);
-  node_type_update(&ntype, blender::nodes::geo_node_points_to_volume_update);
-  ntype.declare = blender::nodes::geo_node_points_to_volume_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_points_to_volume_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_points_to_volume_layout;
+  node_type_init(&ntype, blender::nodes::points_to_volume_node::geo_node_points_to_volume_init);
+  node_type_update(&ntype,
+                   blender::nodes::points_to_volume_node::geo_node_points_to_volume_update);
+  ntype.declare = blender::nodes::points_to_volume_node::geo_node_points_to_volume_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::points_to_volume_node::geo_node_points_to_volume_exec;
+  ntype.draw_buttons = blender::nodes::points_to_volume_node::geo_node_points_to_volume_layout;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc
index a16fb712b13..9f0ba8395f5 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_separate_components.cc
@@ -16,9 +16,9 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::separate_components_node {
 
-static void geo_node_join_geometry_declare(NodeDeclarationBuilder &b)
+static void geo_node_separate_components_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Geometry>(N_("Geometry"));
   b.add_output<decl::Geometry>(N_("Mesh"));
@@ -61,7 +61,7 @@ static void geo_node_separate_components_exec(GeoNodeExecParams params)
   params.set_output("Instances", instances);
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::separate_components_node
 
 void register_node_type_geo_separate_components()
 {
@@ -69,7 +69,8 @@ void register_node_type_geo_separate_components()
 
   geo_node_type_base(
       &ntype, GEO_NODE_SEPARATE_COMPONENTS, "Separate Components", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_join_geometry_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_separate_components_exec;
+  ntype.declare = blender::nodes::separate_components_node::geo_node_separate_components_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::separate_components_node::geo_node_separate_components_exec;
   nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
index 2b3430a5ed0..721b013ea89 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
@@ -27,7 +27,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::subdivision_surface_node {
 
 static void geo_node_subdivision_surface_declare(NodeDeclarationBuilder &b)
 {
@@ -145,7 +145,7 @@ static void geo_node_subdivision_surface_exec(GeoNodeExecParams params)
   params.set_output("Mesh", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::subdivision_surface_node
 
 void register_node_type_geo_subdivision_surface()
 {
@@ -153,10 +153,13 @@ void register_node_type_geo_subdivision_surface()
 
   geo_node_type_base(
       &ntype, GEO_NODE_SUBDIVISION_SURFACE, "Subdivision Surface", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_subdivision_surface_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_subdivision_surface_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_subdivision_surface_layout;
-  node_type_init(&ntype, blender::nodes::geo_node_subdivision_surface_init);
+  ntype.declare = blender::nodes::subdivision_surface_node::geo_node_subdivision_surface_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::subdivision_surface_node::geo_node_subdivision_surface_exec;
+  ntype.draw_buttons =
+      blender::nodes::subdivision_surface_node::geo_node_subdivision_surface_layout;
+  node_type_init(&ntype,
+                 blender::nodes::subdivision_surface_node::geo_node_subdivision_surface_init);
   node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
   node_type_storage(&ntype,
                     "NodeGeometrySubdivisionSurface",
diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
index 416d502dc59..21c58608aa5 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
@@ -35,7 +35,7 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
-namespace blender::nodes {
+namespace blender::nodes::volume_to_mesh_node {
 
 static void geo_node_volume_to_mesh_declare(NodeDeclarationBuilder &b)
 {
@@ -192,20 +192,20 @@ static void geo_node_volume_to_mesh_exec(GeoNodeExecParams params)
   params.set_output("Mesh", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::volume_to_mesh_node
 
 void register_node_type_geo_volume_to_mesh()
 {
   static bNodeType ntype;
 
   geo_node_type_base(&ntype, GEO_NODE_VOLUME_TO_MESH, "Volume to Mesh", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_volume_to_mesh_declare;
+  ntype.declare = blender::nodes::volume_to_mesh_node::geo_node_volume_to_mesh_declare;
   node_type_storage(
       &ntype, "NodeGeometryVolumeToMesh", node_free_standard_storage, node_copy_standard_storage);
   node_type_size(&ntype, 170, 120, 700);
-  node_type_init(&ntype, blender::nodes::geo_node_volume_to_mesh_init);
-  node_type_update(&ntype, blender::nodes::geo_node_volume_to_mesh_update);
-  ntype.geometry_node_execute = blender::nodes::geo_node_volume_to_mesh_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_volume_to_mesh_layout;
+  node_type_init(&ntype, blender::nodes::volume_to_mesh_node::geo_node_volume_to_mesh_init);
+  node_type_update(&ntype, blender::nodes::volume_to_mesh_node::geo_node_volume_to_mesh_update);
+  ntype.geometry_node_execute = blender::nodes::volume_to_mesh_node::geo_node_volume_to_mesh_exec;
+  ntype.draw_buttons = blender::nodes::volume_to_mesh_node::geo_node_volume_to_mesh_layout;
   nodeRegisterType(&ntype);
 }