KCINFR-979: fixing file renames after rebase