CAL-210 fix some labels the recent review in CAL-521