SONARJAVA-460 Small updates on labels