The rest of the renaming.