More work on label refactoring in translation files.