WP-3260 Label changes