Fixing key names