diff --git a/core/includes/standard.inc b/core/includes/standard.inc
index 808073f..a473c48 100644
--- a/core/includes/standard.inc
+++ b/core/includes/standard.inc
@@ -6,14 +6,18 @@
  */
 
 /**
- * Get an array of all country code => country name pairs.
+ * Returns an array of all country code => country name pairs.
  *
- * Get an array of all country code => country name pairs as laid out
- * in ISO 3166-1 alpha-2. Originally from the location project
- * (http://drupal.org/project/location).
+ * Returns an array of all country code => country name pairs using country
+ * alpha2 codes and English short names as defined by the ISO 3166-1 standard.
+ *
+ * The original version of this function was derived from
+ * @link http://drupal.org/project/location the location project @endlink 
  *
  * @return
  *   An array of country code => country name pairs.
+ *
+ * @see http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
  */
 function standard_country_list() {
   static $countries;
@@ -31,7 +35,6 @@ function standard_country_list() {
     'AI' => $t('Anguilla'),
     'AL' => $t('Albania'),
     'AM' => $t('Armenia'),
-    'AN' => $t('Netherlands Antilles'),
     'AO' => $t('Angola'),
     'AQ' => $t('Antarctica'),
     'AR' => $t('Argentina'),
@@ -39,7 +42,7 @@ function standard_country_list() {
     'AT' => $t('Austria'),
     'AU' => $t('Australia'),
     'AW' => $t('Aruba'),
-    'AX' => $t('Aland Islands'),
+    'AX' => $t('Åland Islands'),
     'AZ' => $t('Azerbaijan'),
     'BA' => $t('Bosnia and Herzegovina'),
     'BB' => $t('Barbados'),
@@ -52,8 +55,9 @@ function standard_country_list() {
     'BJ' => $t('Benin'),
     'BL' => $t('Saint Barthélemy'),
     'BM' => $t('Bermuda'),
-    'BN' => $t('Brunei'),
-    'BO' => $t('Bolivia'),
+    'BN' => $t('Brunei Darussalam'),
+    'BO' => $t('Bolivia, Plurinational State of'),
+    'BQ' => $t('Bonaire, Saint Eustatius and Saba'),
     'BR' => $t('Brazil'),
     'BS' => $t('Bahamas'),
     'BT' => $t('Bhutan'),
@@ -63,11 +67,11 @@ function standard_country_list() {
     'BZ' => $t('Belize'),
     'CA' => $t('Canada'),
     'CC' => $t('Cocos (Keeling) Islands'),
-    'CD' => $t('Congo (Kinshasa)'),
+    'CD' => $t('Congo, The Democratic Republic of the'),
     'CF' => $t('Central African Republic'),
-    'CG' => $t('Congo (Brazzaville)'),
+    'CG' => $t('Congo'),
     'CH' => $t('Switzerland'),
-    'CI' => $t('Ivory Coast'),
+    'CI' => $t("Côte d'Ivoire"),
     'CK' => $t('Cook Islands'),
     'CL' => $t('Chile'),
     'CM' => $t('Cameroon'),
@@ -95,8 +99,8 @@ function standard_country_list() {
     'ET' => $t('Ethiopia'),
     'FI' => $t('Finland'),
     'FJ' => $t('Fiji'),
-    'FK' => $t('Falkland Islands'),
-    'FM' => $t('Micronesia'),
+    'FK' => $t('Falkland Islands (Malvinas)'),
+    'FM' => $t('Micronesia, Federated States of'),
     'FO' => $t('Faroe Islands'),
     'FR' => $t('France'),
     'GA' => $t('Gabon'),
@@ -118,7 +122,7 @@ function standard_country_list() {
     'GU' => $t('Guam'),
     'GW' => $t('Guinea-Bissau'),
     'GY' => $t('Guyana'),
-    'HK' => $t('Hong Kong S.A.R., China'),
+    'HK' => $t('Hong Kong'),
     'HM' => $t('Heard Island and McDonald Islands'),
     'HN' => $t('Honduras'),
     'HR' => $t('Croatia'),
@@ -131,7 +135,7 @@ function standard_country_list() {
     'IN' => $t('India'),
     'IO' => $t('British Indian Ocean Territory'),
     'IQ' => $t('Iraq'),
-    'IR' => $t('Iran'),
+    'IR' => $t('Iran, Islamic Republic of'),
     'IS' => $t('Iceland'),
     'IT' => $t('Italy'),
     'JE' => $t('Jersey'),
@@ -144,12 +148,12 @@ function standard_country_list() {
     'KI' => $t('Kiribati'),
     'KM' => $t('Comoros'),
     'KN' => $t('Saint Kitts and Nevis'),
-    'KP' => $t('North Korea'),
-    'KR' => $t('South Korea'),
+    'KP' => $t("Korea, Democratic People's Republic of"),
+    'KR' => $t('Korea, Republic of'),
     'KW' => $t('Kuwait'),
     'KY' => $t('Cayman Islands'),
     'KZ' => $t('Kazakhstan'),
-    'LA' => $t('Laos'),
+    'LA' => $t("Lao People's Democratic Republic"),
     'LB' => $t('Lebanon'),
     'LC' => $t('Saint Lucia'),
     'LI' => $t('Liechtenstein'),
@@ -159,19 +163,19 @@ function standard_country_list() {
     'LT' => $t('Lithuania'),
     'LU' => $t('Luxembourg'),
     'LV' => $t('Latvia'),
-    'LY' => $t('Libya'),
+    'LY' => $t('Libyan Arab Jamahiriya'),
     'MA' => $t('Morocco'),
     'MC' => $t('Monaco'),
-    'MD' => $t('Moldova'),
+    'MD' => $t('Moldova, Republic of'),
     'ME' => $t('Montenegro'),
     'MF' => $t('Saint Martin (French part)'),
     'MG' => $t('Madagascar'),
     'MH' => $t('Marshall Islands'),
-    'MK' => $t('Macedonia'),
+    'MK' => $t('Macedonia, The Former Yugoslav Republic of'),
     'ML' => $t('Mali'),
     'MM' => $t('Myanmar'),
     'MN' => $t('Mongolia'),
-    'MO' => $t('Macao S.A.R., China'),
+    'MO' => $t('Macao'),
     'MP' => $t('Northern Mariana Islands'),
     'MQ' => $t('Martinique'),
     'MR' => $t('Mauritania'),
@@ -206,15 +210,15 @@ function standard_country_list() {
     'PM' => $t('Saint Pierre and Miquelon'),
     'PN' => $t('Pitcairn'),
     'PR' => $t('Puerto Rico'),
-    'PS' => $t('Palestinian Territory'),
+    'PS' => $t('Palestinian Territory, Occupied'),
     'PT' => $t('Portugal'),
     'PW' => $t('Palau'),
     'PY' => $t('Paraguay'),
     'QA' => $t('Qatar'),
-    'RE' => $t('Reunion'),
+    'RE' => $t('Réunion'),
     'RO' => $t('Romania'),
     'RS' => $t('Serbia'),
-    'RU' => $t('Russia'),
+    'RU' => $t('Russian Federation'),
     'RW' => $t('Rwanda'),
     'SA' => $t('Saudi Arabia'),
     'SB' => $t('Solomon Islands'),
@@ -222,7 +226,7 @@ function standard_country_list() {
     'SD' => $t('Sudan'),
     'SE' => $t('Sweden'),
     'SG' => $t('Singapore'),
-    'SH' => $t('Saint Helena'),
+    'SH' => $t('Saint Helena, Ascension and Tristan da Cunha'),
     'SI' => $t('Slovenia'),
     'SJ' => $t('Svalbard and Jan Mayen'),
     'SK' => $t('Slovakia'),
@@ -233,7 +237,8 @@ function standard_country_list() {
     'SR' => $t('Suriname'),
     'ST' => $t('Sao Tome and Principe'),
     'SV' => $t('El Salvador'),
-    'SY' => $t('Syria'),
+    'SX' => $t('Sint Maarten (Dutch part)'),
+    'SY' => $t('Syrian Arab Republic'),
     'SZ' => $t('Swaziland'),
     'TC' => $t('Turks and Caicos Islands'),
     'TD' => $t('Chad'),
@@ -249,20 +254,20 @@ function standard_country_list() {
     'TR' => $t('Turkey'),
     'TT' => $t('Trinidad and Tobago'),
     'TV' => $t('Tuvalu'),
-    'TW' => $t('Taiwan'),
-    'TZ' => $t('Tanzania'),
+    'TW' => $t('Taiwan, Province of China'),
+    'TZ' => $t('Tanzania, United Republic of'),
     'UA' => $t('Ukraine'),
     'UG' => $t('Uganda'),
     'UM' => $t('United States Minor Outlying Islands'),
     'US' => $t('United States'),
     'UY' => $t('Uruguay'),
     'UZ' => $t('Uzbekistan'),
-    'VA' => $t('Vatican'),
+    'VA' => $t('Holy See (Vatican City State)'),
     'VC' => $t('Saint Vincent and the Grenadines'),
-    'VE' => $t('Venezuela'),
-    'VG' => $t('British Virgin Islands'),
-    'VI' => $t('U.S. Virgin Islands'),
-    'VN' => $t('Vietnam'),
+    'VE' => $t('Venezuela, Bolivarian Republic of'),
+    'VG' => $t('Virgin Islands, British'),
+    'VI' => $t('Virgin Islands, U.S.'),
+    'VN' => $t('Viet Nam'),
     'VU' => $t('Vanuatu'),
     'WF' => $t('Wallis and Futuna'),
     'WS' => $t('Samoa'),
@@ -280,7 +285,7 @@ function standard_country_list() {
 }
 
 /**
- * Some common languages with their English and native names.
+ * Defines some common languages with their English and native names.
  *
  * Language codes are defined by the W3C language tags document for
  * interoperability. Language codes typically have a language and optionally,
@@ -296,8 +301,8 @@ function standard_country_list() {
  * right to left). See http://drupal.org/node/128866#comment-528929.
  *
  * @return
- *   An array of language code to language name information.
- *   Language name information itself is an array of English and native names.
+ *   An array with language codes as keys and array(English name, native name)
+ *   as the values.
  */
 function standard_language_list() {
   return array(