WP-1965: change classes.