Update field names to reflect R12 usage