Rename fields to make more sense