Renamed fields to be more self-explanatory.