changed affiliation and unit field names