Generalize branch renaming