WP-3160-1 More label and help text changes