Refactoring l10n names module