Refactors IndividualName class