Found the bug in the renaming workflow. It was introduced in the refactoring before (yes, I need tests!). Some more refactorings.