[FIXED JENKINS-22165] Improved labels.