WP-2813 update class name