Fixes some field names in the comment output