WP-3304: align name fields.
WP-3304: align affiliation fields.