rename message fields for clarity