diff --git a/scripts/startup/bl_operators/wm.py b/scripts/startup/bl_operators/wm.py
index d4175405e44..51b1f0639fe 100644
--- a/scripts/startup/bl_operators/wm.py
+++ b/scripts/startup/bl_operators/wm.py
@@ -1886,6 +1886,11 @@ class WM_OT_properties_edit(Operator):
 
         self._update_blender_for_prop_change(context, item, name, prop_type_old, prop_type_new)
 
+        if name_old != name:
+            adt = getattr(item, "animation_data", None)
+            if adt is not None:
+                adt.fix_paths_rename_all(prefix="", old_name=name_old, new_name=name)
+
         return {'FINISHED'}
 
     def invoke(self, context, _event):
diff --git a/source/blender/makesrna/intern/rna_animation_api.cc b/source/blender/makesrna/intern/rna_animation_api.cc
index 8f3edb0d31f..f33c0da5300 100644
--- a/source/blender/makesrna/intern/rna_animation_api.cc
+++ b/source/blender/makesrna/intern/rna_animation_api.cc
@@ -20,6 +20,7 @@
 
 #ifdef RNA_RUNTIME
 
+#  include "BKE_animsys.h"
 #  include "BKE_context.hh"
 #  include "BKE_nla.h"
 #  include "BKE_report.hh"
@@ -57,6 +58,16 @@ static float rna_AnimData_nla_tweak_strip_time_to_scene(AnimData *adt, float fra
   return BKE_nla_tweakedit_remap(adt, frame, invert ? NLATIME_CONVERT_UNMAP : NLATIME_CONVERT_MAP);
 }
 
+void rna_id_animdata_fix_paths_rename_all(ID *id,
+                                          AnimData* /* adt */,
+                                          Main *bmain,
+                                          const char *prefix,
+                                          const char *oldName,
+                                          const char *newName)
+{
+  BKE_animdata_fix_paths_rename_all_ex(bmain, id, prefix, oldName, newName, 0, 0 , true);
+}
+
 #else
 
 void RNA_api_keyingset(StructRNA *srna)
@@ -92,6 +103,16 @@ void RNA_api_animdata(StructRNA *srna)
   parm = RNA_def_float(
       func, "result", 0.0, MINAFRAME, MAXFRAME, "", "Converted time", MINAFRAME, MAXFRAME);
   RNA_def_function_return(func, parm);
+
+  func = RNA_def_function(srna, "fix_paths_rename_all", "rna_id_animdata_fix_paths_rename_all");
+  RNA_def_string(func, "prefix", nullptr, MAX_IDPROP_NAME, "Prefix", "Name prefix");
+  RNA_def_string(func, "old_name", nullptr, MAX_IDPROP_NAME, "Old Name", "Old name");
+  RNA_def_string(func, "new_name", nullptr, MAX_IDPROP_NAME, "New Name", "New name");
+  RNA_def_function_ui_description(
+      func,
+      "Rename the property paths in the animation system, since properties are animated via "
+      "string paths, it's needed to keep them valid after properties has been renamed");
+  RNA_def_function_flag(func, FUNC_USE_MAIN | FUNC_USE_SELF_ID);
 }
 
 #endif