More label name fixes