WP-4491: change class names and add wrappers.