Fix bad key names