diff --git a/source/blender/editors/sculpt_paint/brushes/brushes.hh b/source/blender/editors/sculpt_paint/brushes/brushes.hh
index e19fc8b85a6..9945761e239 100644
--- a/source/blender/editors/sculpt_paint/brushes/brushes.hh
+++ b/source/blender/editors/sculpt_paint/brushes/brushes.hh
@@ -25,7 +25,7 @@ class Node;
 namespace blender::ed::sculpt_paint::brushes {
 
 /** Represents the result of one or more BVH queries to find a brush's affected nodes. */
-struct NodeMaskResult {
+struct CursorSampleResult {
   IndexMask node_mask;
 
   /* For planar brushes, the plane center and normal are calculated based on the original cursor
@@ -53,10 +53,10 @@ void do_clay_strips_brush(const Depsgraph &depsgraph,
                           const float3 &plane_normal,
                           const float3 &plane_center);
 namespace clay_strips {
-NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
-                              Object &ob,
-                              const Brush &brush,
-                              IndexMaskMemory &memory);
+CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
+                                  Object &ob,
+                                  const Brush &brush,
+                                  IndexMaskMemory &memory);
 }
 void do_clay_thumb_brush(const Depsgraph &depsgraph,
                          const Sculpt &sd,
@@ -129,10 +129,10 @@ void do_plane_brush(const Depsgraph &depsgraph,
                     const float3 &plane_center);
 
 namespace plane {
-NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
-                              Object &ob,
-                              const Brush &brush,
-                              IndexMaskMemory &memory);
+CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
+                                  Object &ob,
+                                  const Brush &brush,
+                                  IndexMaskMemory &memory);
 }
 
 void do_grab_brush(const Depsgraph &depsgraph,
diff --git a/source/blender/editors/sculpt_paint/brushes/clay_strips.cc b/source/blender/editors/sculpt_paint/brushes/clay_strips.cc
index 91cbc725825..285b4c4796a 100644
--- a/source/blender/editors/sculpt_paint/brushes/clay_strips.cc
+++ b/source/blender/editors/sculpt_paint/brushes/clay_strips.cc
@@ -338,10 +338,10 @@ void do_clay_strips_brush(const Depsgraph &depsgraph,
 }
 
 namespace clay_strips {
-NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
-                              Object &object,
-                              const Brush &brush,
-                              IndexMaskMemory &memory)
+CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
+                                  Object &object,
+                                  const Brush &brush,
+                                  IndexMaskMemory &memory)
 {
   const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(object);
   const SculptSession &ss = *object.sculpt;
diff --git a/source/blender/editors/sculpt_paint/brushes/plane.cc b/source/blender/editors/sculpt_paint/brushes/plane.cc
index 3a584bcc982..711a0803bce 100644
--- a/source/blender/editors/sculpt_paint/brushes/plane.cc
+++ b/source/blender/editors/sculpt_paint/brushes/plane.cc
@@ -465,10 +465,10 @@ void do_plane_brush(const Depsgraph &depsgraph,
 }
 
 namespace plane {
-NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
-                              Object &ob,
-                              const Brush &brush,
-                              IndexMaskMemory &memory)
+CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
+                                  Object &ob,
+                                  const Brush &brush,
+                                  IndexMaskMemory &memory)
 {
   const SculptSession &ss = *ob.sculpt;
   const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(ob);
diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc
index 736ad0debc9..edf1810811d 100644
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@ -3133,10 +3133,10 @@ static bool brush_type_needs_all_pbvh_nodes(const Brush &brush)
 }
 
 /** Calculates the nodes that a brush will influence. */
-static brushes::NodeMaskResult calc_brush_node_mask(const Depsgraph &depsgraph,
-                                                    Object &ob,
-                                                    const Brush &brush,
-                                                    IndexMaskMemory &memory)
+static brushes::CursorSampleResult calc_brush_node_mask(const Depsgraph &depsgraph,
+                                                        Object &ob,
+                                                        const Brush &brush,
+                                                        IndexMaskMemory &memory)
 {
   const SculptSession &ss = *ob.sculpt;
   const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(ob);
@@ -3233,7 +3233,7 @@ static void do_brush_action(const Depsgraph &depsgraph,
     }
   }
 
-  const brushes::NodeMaskResult node_mask_result = calc_brush_node_mask(
+  const brushes::CursorSampleResult node_mask_result = calc_brush_node_mask(
       depsgraph, ob, brush, memory);
   const IndexMask node_mask = node_mask_result.node_mask;