Fix key names