Changing i18n names to be more accurate