Rename GeocodedCity to City and GeocodedCountry to Country.