--- existing.json	2015-05-13 12:59:19.000000000 -0700
+++ genc.json	2015-05-13 12:54:02.000000000 -0700
@@ -1,12 +1,11 @@
 {
     "ad": "Andorra", 
-    "ae": "U.A.E.", 
+    "ae": "United Arab Emirates", 
     "af": "Afghanistan", 
     "ag": "Antigua and Barbuda", 
     "ai": "Anguilla", 
     "al": "Albania", 
     "am": "Armenia", 
-    "an": "Netherlands Antilles", 
     "ao": "Angola", 
     "aq": "Antarctica", 
     "ar": "Argentina", 
@@ -14,7 +13,6 @@
     "at": "Austria", 
     "au": "Australia", 
     "aw": "Aruba", 
-    "ax": "\u00c5land Islands", 
     "az": "Azerbaijan", 
     "ba": "Bosnia and Herzegovina", 
     "bb": "Barbados", 
@@ -25,12 +23,13 @@
     "bh": "Bahrain", 
     "bi": "Burundi", 
     "bj": "Benin", 
-    "bl": "Saint Barth\u00e9lemy", 
+    "bl": "Saint Barthelemy", 
     "bm": "Bermuda", 
-    "bn": "Brunei Darussalam", 
+    "bn": "Brunei", 
     "bo": "Bolivia", 
+    "bq": "Bonaire, Sint Eustatius, and Saba", 
     "br": "Brazil", 
-    "bs": "Bahamas", 
+    "bs": "Bahamas, The", 
     "bt": "Bhutan", 
     "bv": "Bouvet Island", 
     "bw": "Botswana", 
@@ -38,23 +37,26 @@
     "bz": "Belize", 
     "ca": "Canada", 
     "cc": "Cocos (Keeling) Islands", 
-    "cd": "Congo-Kinshasa", 
+    "cd": "Congo (Kinshasa)", 
     "cf": "Central African Republic", 
-    "cg": "Congo-Brazzaville", 
+    "cg": "Congo (Brazzaville)", 
     "ch": "Switzerland", 
-    "ci": "Ivory Coast", 
+    "ci": "C\u00f4te d\u2019Ivoire", 
     "ck": "Cook Islands", 
     "cl": "Chile", 
     "cm": "Cameroon", 
     "cn": "China", 
     "co": "Colombia", 
+    "cp": "Clipperton Island", 
     "cr": "Costa Rica", 
     "cu": "Cuba", 
-    "cv": "Cape Verde", 
+    "cv": "Cabo Verde", 
+    "cw": "Cura\u00e7ao", 
     "cx": "Christmas Island", 
     "cy": "Cyprus", 
     "cz": "Czech Republic", 
     "de": "Germany", 
+    "dg": "Diego Garcia", 
     "dj": "Djibouti", 
     "dk": "Denmark", 
     "dm": "Dominica", 
@@ -69,8 +71,8 @@
     "et": "Ethiopia", 
     "fi": "Finland", 
     "fj": "Fiji", 
-    "fk": "Falkland Islands (Malvinas)", 
-    "fm": "Micronesia", 
+    "fk": "Falkland Islands (Islas Malvinas)", 
+    "fm": "Micronesia, Federated States of", 
     "fo": "Faroe Islands", 
     "fr": "France", 
     "ga": "Gabon", 
@@ -82,12 +84,12 @@
     "gh": "Ghana", 
     "gi": "Gibraltar", 
     "gl": "Greenland", 
-    "gm": "Gambia", 
+    "gm": "Gambia, The", 
     "gn": "Guinea", 
     "gp": "Guadeloupe", 
     "gq": "Equatorial Guinea", 
     "gr": "Greece", 
-    "gs": "South Georgia and the South Sandwich Islands", 
+    "gs": "South Georgia and South Sandwich Islands", 
     "gt": "Guatemala", 
     "gu": "Guam", 
     "gw": "Guinea-Bissau", 
@@ -118,8 +120,8 @@
     "ki": "Kiribati", 
     "km": "Comoros", 
     "kn": "Saint Kitts and Nevis", 
-    "kp": "North Korea", 
-    "kr": "South Korea", 
+    "kp": "Korea, North", 
+    "kr": "Korea, South", 
     "kw": "Kuwait", 
     "ky": "Cayman Islands", 
     "kz": "Kazakhstan", 
@@ -141,11 +143,11 @@
     "mf": "Saint Martin", 
     "mg": "Madagascar", 
     "mh": "Marshall Islands", 
-    "mk": "Macedonia, F.Y.R. of", 
+    "mk": "Macedonia", 
     "ml": "Mali", 
-    "mm": "Myanmar", 
+    "mm": "Burma", 
     "mn": "Mongolia", 
-    "mo": "Macao", 
+    "mo": "Macau", 
     "mp": "Northern Mariana Islands", 
     "mq": "Martinique", 
     "mr": "Mauritania", 
@@ -178,17 +180,22 @@
     "pk": "Pakistan", 
     "pl": "Poland", 
     "pm": "Saint Pierre and Miquelon", 
-    "pn": "Pitcairn", 
+    "pn": "Pitcairn Islands", 
     "pr": "Puerto Rico", 
-    "ps": "Occupied Palestinian Territory", 
     "pt": "Portugal", 
     "pw": "Palau", 
     "py": "Paraguay", 
     "qa": "Qatar", 
+    "qm": "Midway Islands", 
+    "qs": "Bassas da India", 
+    "qu": "Juan de Nova Island", 
+    "qw": "Wake Island", 
+    "qx": "Glorioso Islands", 
+    "qz": "Akrotiri", 
     "re": "Reunion", 
     "ro": "Romania", 
     "rs": "Serbia", 
-    "ru": "Russian Federation", 
+    "ru": "Russia", 
     "rw": "Rwanda", 
     "sa": "Saudi Arabia", 
     "sb": "Solomon Islands", 
@@ -196,22 +203,23 @@
     "sd": "Sudan", 
     "se": "Sweden", 
     "sg": "Singapore", 
-    "sh": "Saint Helena", 
+    "sh": "Saint Helena, Ascension, and Tristan da Cunha", 
     "si": "Slovenia", 
-    "sj": "Svalbard and Jan Mayen", 
     "sk": "Slovakia", 
     "sl": "Sierra Leone", 
     "sm": "San Marino", 
     "sn": "Senegal", 
     "so": "Somalia", 
     "sr": "Suriname", 
+    "ss": "South Sudan", 
     "st": "Sao Tome and Principe", 
     "sv": "El Salvador", 
+    "sx": "Sint Maarten", 
     "sy": "Syria", 
     "sz": "Swaziland", 
     "tc": "Turks and Caicos Islands", 
     "td": "Chad", 
-    "tf": "French Southern Territories", 
+    "tf": "French Southern and Antarctic Lands", 
     "tg": "Togo", 
     "th": "Thailand", 
     "tj": "Tajikistan", 
@@ -227,19 +235,37 @@
     "tz": "Tanzania", 
     "ua": "Ukraine", 
     "ug": "Uganda", 
-    "um": "United States Minor Outlying Islands", 
     "us": "United States", 
     "uy": "Uruguay", 
     "uz": "Uzbekistan", 
     "va": "Vatican City", 
     "vc": "Saint Vincent and the Grenadines", 
     "ve": "Venezuela", 
-    "vg": "British Virgin Islands", 
-    "vi": "U.S. Virgin Islands", 
+    "vg": "Virgin Islands, British", 
+    "vi": "Virgin Islands, U.S.", 
     "vn": "Vietnam", 
     "vu": "Vanuatu", 
     "wf": "Wallis and Futuna", 
     "ws": "Samoa", 
+    "xa": "Ashmore and Cartier Islands", 
+    "xb": "Baker Island", 
+    "xc": "Coral Sea Islands", 
+    "xd": "Dhekelia", 
+    "xe": "Europa Island", 
+    "xg": "Gaza Strip", 
+    "xh": "Howland Island", 
+    "xj": "Jan Mayen", 
+    "xk": "Kosovo", 
+    "xl": "Palmyra Atoll", 
+    "xm": "Kingman Reef", 
+    "xp": "Paracel Islands", 
+    "xq": "Jarvis Island", 
+    "xr": "Svalbard", 
+    "xs": "Spratly Islands", 
+    "xt": "Tromelin Island", 
+    "xu": "Johnston Atoll", 
+    "xv": "Navassa Island", 
+    "xw": "West Bank", 
     "ye": "Yemen", 
     "yt": "Mayotte", 
     "za": "South Africa",