[*] fix field names