WP-3509: update class name and feature.