WP-2187: reflect class name change.