Rename fields.  Add comments.