First pass at updating to latest field names.