WP-2973: change wrapper to fieldset, change label names.