WP-3163-1 Label and help text changes