Renamed fields, corrected format.