Have you tried realthunders freecad fork?
I've recently been told that it would be vastly better than upstream due to massive fixes in the hierarchy/timeline, making changes much more likely to work.
I haven't tested it though, so no Idea if it's actually true. https://github.com/realthunder/FreeCAD/releases
/e: FreeCAD upstream is tackling the topological naming Problem as well though!
https://github.com/orgs/FreeCAD/projects/2/views/1
It will just still take some time.