Some label name changes