Added support for currency names in addition to currency codes for country info. Renamed currencyShort to currencyCodes