Fix wrongly named keys