diff --git a/source/blender/animrig/ANIM_animdata.hh b/source/blender/animrig/ANIM_animdata.hh
index e09343f5957..7902f036ab2 100644
--- a/source/blender/animrig/ANIM_animdata.hh
+++ b/source/blender/animrig/ANIM_animdata.hh
@@ -18,7 +18,7 @@ namespace blender::animrig {
  * Delete the F-Curve from the given AnimData block (if possible),
  * as appropriate according to animation context.
  */
-void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *fcu);
+void animdata_fcurve_delete(bAnimContext *ac, AnimData *adt, FCurve *fcu);
 
 /**
  * Unlink the action from animdata if it's empty.
@@ -26,6 +26,6 @@ void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *f
  * If the action has no F-Curves, unlink it from AnimData if it did not
  * come from a NLA Strip being tweaked.
  */
-bool ANIM_remove_empty_action_from_animdata(AnimData *adt);
+bool animdata_remove_empty_action(AnimData *adt);
 
 }  // namespace blender::animrig
\ No newline at end of file
diff --git a/source/blender/animrig/intern/animdata.cc b/source/blender/animrig/intern/animdata.cc
index 3a7ea86355c..539cefd8aa6 100644
--- a/source/blender/animrig/intern/animdata.cc
+++ b/source/blender/animrig/intern/animdata.cc
@@ -20,7 +20,7 @@ namespace blender::animrig {
 /** \name Public F-Curves API
  * \{ */
 
-void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *fcu)
+void animdata_fcurve_delete(bAnimContext *ac, AnimData *adt, FCurve *fcu)
 {
   /* - if no AnimData, we've got nowhere to remove the F-Curve from
    *   (this doesn't guarantee that the F-Curve is in there, but at least we tried
@@ -68,14 +68,14 @@ void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *f
      * channel list that are empty, and linger around long after the data they
      * are for has disappeared (and probably won't come back).
      */
-    ANIM_remove_empty_action_from_animdata(adt);
+    animdata_remove_empty_action(adt);
   }
 
   /* free the F-Curve itself */
   BKE_fcurve_free(fcu);
 }
 
-bool ANIM_remove_empty_action_from_animdata(AnimData *adt)
+bool animdata_remove_empty_action(AnimData *adt)
 {
   if (adt->action != nullptr) {
     bAction *act = adt->action;
diff --git a/source/blender/animrig/intern/fcurve.cc b/source/blender/animrig/intern/fcurve.cc
index a31559b530c..67f1e67888e 100644
--- a/source/blender/animrig/intern/fcurve.cc
+++ b/source/blender/animrig/intern/fcurve.cc
@@ -33,7 +33,7 @@ bool delete_keyframe_fcurve(AnimData *adt, FCurve *fcu, float cfra)
 
   /* Empty curves get automatically deleted. */
   if (BKE_fcurve_is_empty(fcu)) {
-    ANIM_fcurve_delete_from_animdata(nullptr, adt, fcu);
+    animdata_fcurve_delete(nullptr, adt, fcu);
   }
 
   return true;
diff --git a/source/blender/animrig/intern/keyframing.cc b/source/blender/animrig/intern/keyframing.cc
index 601cd1071f7..51f21080676 100644
--- a/source/blender/animrig/intern/keyframing.cc
+++ b/source/blender/animrig/intern/keyframing.cc
@@ -937,7 +937,7 @@ int clear_keyframe(Main *bmain,
       continue;
     }
 
-    ANIM_fcurve_delete_from_animdata(nullptr, adt, fcu);
+    animdata_fcurve_delete(nullptr, adt, fcu);
 
     key_count++;
   }
diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc
index 7c6c2f1a00d..60bc6ddf025 100644
--- a/source/blender/editors/animation/anim_channels_edit.cc
+++ b/source/blender/editors/animation/anim_channels_edit.cc
@@ -2136,7 +2136,7 @@ static int animchannels_delete_exec(bContext *C, wmOperator * /*op*/)
         FCurve *fcu = (FCurve *)ale->data;
 
         /* try to free F-Curve */
-        blender::animrig::ANIM_fcurve_delete_from_animdata(&ac, adt, fcu);
+        blender::animrig::animdata_fcurve_delete(&ac, adt, fcu);
         tag_update_animation_element(ale);
         break;
       }
diff --git a/source/blender/editors/animation/keyframes_general.cc b/source/blender/editors/animation/keyframes_general.cc
index 94496024b13..05a55412f69 100644
--- a/source/blender/editors/animation/keyframes_general.cc
+++ b/source/blender/editors/animation/keyframes_general.cc
@@ -228,7 +228,7 @@ void clean_fcurve(bAnimContext *ac,
       /* check if curve is really unused and if it is, return signal for deletion */
       if (BKE_fcurve_is_empty(fcu)) {
         AnimData *adt = ale->adt;
-        blender::animrig::ANIM_fcurve_delete_from_animdata(ac, adt, fcu);
+        blender::animrig::animdata_fcurve_delete(ac, adt, fcu);
         ale->key_data = nullptr;
       }
     }
diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc
index dd574e4e396..e427625e5eb 100644
--- a/source/blender/editors/animation/keyframing.cc
+++ b/source/blender/editors/animation/keyframing.cc
@@ -628,14 +628,14 @@ static int clear_anim_v3d_exec(bContext *C, wmOperator * /*op*/)
 
         /* delete F-Curve completely */
         if (can_delete) {
-          blender::animrig::ANIM_fcurve_delete_from_animdata(nullptr, adt, fcu);
+          blender::animrig::animdata_fcurve_delete(nullptr, adt, fcu);
           DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
           changed = true;
         }
       }
 
       /* Delete the action itself if it is empty. */
-      if (blender::animrig::ANIM_remove_empty_action_from_animdata(adt)) {
+      if (blender::animrig::animdata_remove_empty_action(adt)) {
         changed = true;
       }
     }
diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc
index a07be36bb76..ee06603dd72 100644
--- a/source/blender/editors/space_action/action_edit.cc
+++ b/source/blender/editors/space_action/action_edit.cc
@@ -1111,7 +1111,7 @@ static bool delete_action_keys(bAnimContext *ac)
 
       /* Only delete curve too if it won't be doing anything anymore */
       if (BKE_fcurve_is_empty(fcu)) {
-        blender::animrig::ANIM_fcurve_delete_from_animdata(ac, adt, fcu);
+        blender::animrig::animdata_fcurve_delete(ac, adt, fcu);
         ale->key_data = nullptr;
       }
     }
diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc
index 7eb058244a7..4caa05c7d82 100644
--- a/source/blender/editors/space_graph/graph_edit.cc
+++ b/source/blender/editors/space_graph/graph_edit.cc
@@ -766,7 +766,7 @@ static bool delete_graph_keys(bAnimContext *ac)
 
     /* Only delete curve too if it won't be doing anything anymore. */
     if (BKE_fcurve_is_empty(fcu)) {
-      blender::animrig::ANIM_fcurve_delete_from_animdata(ac, adt, fcu);
+      blender::animrig::animdata_fcurve_delete(ac, adt, fcu);
       ale->key_data = nullptr;
     }
   }