Changed field names to reflect proper terminology.