Support staging/unstaging renames