WP-3499: adjust affiliations order and commas.
WP-3499: change class name.