Rename these private fields to match the new name?