Fixed some field names