Some more renaming of labels