diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.cc b/source/blender/bmesh/intern/bmesh_mesh_validate.cc
index b1e2f803786..037aff3ecad 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_validate.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_validate.cc
@@ -55,7 +55,7 @@ template<> struct blender::DefaultHash<blender::Set<const BMVert *>> {
   }
 };
 
-bool BM_mesh_validate(BMesh *bm)
+bool BM_mesh_is_valid(BMesh *bm)
 {
   blender::Map<blender::OrderedEdge, BMEdge *> edge_hash;
   edge_hash.reserve(bm->totedge);
diff --git a/source/blender/bmesh/intern/bmesh_mesh_validate.hh b/source/blender/bmesh/intern/bmesh_mesh_validate.hh
index 88003c6fe8f..66408090a71 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_validate.hh
+++ b/source/blender/bmesh/intern/bmesh_mesh_validate.hh
@@ -16,4 +16,4 @@
  *
  * \return true when the mesh is valid.
  */
-bool BM_mesh_validate(BMesh *bm);
+bool BM_mesh_is_valid(BMesh *bm);
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.cc b/source/blender/bmesh/tools/bmesh_decimate_collapse.cc
index 081a75ce8aa..8f43e32d519 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.cc
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.cc
@@ -1053,7 +1053,7 @@ static bool bm_edge_collapse(BMesh *bm,
     }
 #endif
 
-    // BM_mesh_validate(bm);
+    // BM_mesh_is_valid(bm);
 
     return true;
   }
@@ -1109,7 +1109,7 @@ static bool bm_edge_collapse(BMesh *bm,
     }
 #endif
 
-    // BM_mesh_validate(bm);
+    // BM_mesh_is_valid(bm);
 
     return true;
   }
@@ -1523,7 +1523,7 @@ void BM_mesh_decimate_collapse(BMesh *bm,
   BLI_heap_free(eheap, nullptr);
 
   /* testing only */
-  // BM_mesh_validate(bm);
+  // BM_mesh_is_valid(bm);
 
   /* quiet release build warning */
   (void)tot_edge_orig;
diff --git a/source/blender/editors/mesh/editmesh_undo.cc b/source/blender/editors/mesh/editmesh_undo.cc
index 2fd35913162..3fe30ed1610 100644
--- a/source/blender/editors/mesh/editmesh_undo.cc
+++ b/source/blender/editors/mesh/editmesh_undo.cc
@@ -853,7 +853,7 @@ static void *undomesh_from_editmesh(UndoMesh *um,
   }
 
   /* Uncomment for troubleshooting. */
-  // BM_mesh_validate(em->bm);
+  // BM_mesh_is_valid(em->bm);
 
   CustomData_MeshMasks cd_mask_extra{};
   cd_mask_extra.vmask = CD_MASK_SHAPE_KEYINDEX;
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc
index 6d2946794c7..d4bdf7b26ba 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.cc
+++ b/source/blender/modifiers/intern/MOD_edgesplit.cc
@@ -97,7 +97,7 @@ Mesh *doEdgeSplit(const Mesh *mesh, EdgeSplitModifierData *emd)
   BM_mesh_edgesplit(bm, false, true, false);
 
   /* Uncomment for troubleshooting. */
-  // BM_mesh_validate(bm);
+  // BM_mesh_is_valid(bm);
 
   result = BKE_mesh_from_bmesh_for_eval_nomain(bm, nullptr, mesh);
   BM_mesh_free(bm);
diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc
index 6a37c0c06e1..0fe64678ab8 100644
--- a/source/blender/python/bmesh/bmesh_py_types.cc
+++ b/source/blender/python/bmesh/bmesh_py_types.cc
@@ -4387,7 +4387,7 @@ int bpy_bm_generic_valid_check(BPy_BMGeneric *self)
  * function where the actual error will be caused by
  * the previous action. */
 #if 0
-    if (BM_mesh_validate(self->bm) == false) {
+    if (BM_mesh_is_valid(self->bm) == false) {
       PyErr_Format(
           PyExc_ReferenceError, "BMesh used by %.200s has become invalid", Py_TYPE(self)->tp_name);
       return -1;