fixes localeService and renaming