Fix the renaming madness