fix key names