Index: extract_countrynames.sql
===================================================================
--- extract_countrynames.sql    (revision 18824)
+++ extract_countrynames.sql    (working copy)
@@ -3,6 +3,6 @@

 alter table worldboundaries add column name keyvalue[];

-update worldboundaries set name = country_name.name from country_name where upper(worldboundaries.country_code) = upper(country_name.country_code);
+update worldboundaries set name = country_name.name from country_name where upper(worldboundaries.fips_cntry) = upper(country_name.country_code);

 update place set country_code = country_name.country_code from country_name where osm_type = 'R' and admin_level < 4 and type = 'administrative' and place.country_code is null and (get_name_by_language(place.name,ARRAY['name']) = get_name_by_language(country_name.name,ARRAY['name']));