Rename some fields to make more sense.