Fix up the renaming