WP-2871: update wrapper class name,