Rename all the things
Re-add that which was renamed