Minor changes to names and fields.