Update field names and change state_iso_code varchar(6), country_iso_code char(2).