WP-3303: Relabel and reorder taxonomy fields.