Improve normalization of names.
Improve handling of the 'confirmation' field.