Fix aws key names in data dict