Fix bad merged renaming.