changed some field names