WP-3499: change class name.