Renaming correct keys