Fix keys (rename and add)