Fix/get rid of some largely unnecessary fields.
Build up fields containing the complete name, first name last.