Changed variable names for i18n module