Change names to person/people