rebasing renames is a pain