Fix key renaming