diff --git a/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java
index 4aa26eb5296..0204eec2edd 100644
--- a/src/java.base/share/classes/java/util/LocaleISOData.java
+++ b/src/java.base/share/classes/java/util/LocaleISOData.java
@@ -253,7 +253,7 @@ class LocaleISOData {
         + "BL" + "BLM"  // Saint Barth\u00e9lemy
         + "BM" + "BMU"  // Bermuda
         + "BN" + "BRN"  // Brunei Darussalam
-        + "BO" + "BOL"  // Bolivia, Republic of
+        + "BO" + "BOL"  // Bolivia, Plurinational State of
         + "BQ" + "BES"  // Bonaire, Sint Eustatius and Saba
         + "BR" + "BRA"  // Brazil, Federative Republic of
         + "BS" + "BHS"  // Bahamas, Commonwealth of the
@@ -292,11 +292,11 @@ class LocaleISOData {
         + "EE" + "EST"  // Estonia
         + "EG" + "EGY"  // Egypt, Arab Republic of
         + "EH" + "ESH"  // Western Sahara
-        + "ER" + "ERI"  // Eritrea
+        + "ER" + "ERI"  // Eritrea, State of
         + "ES" + "ESP"  // Spain, Spanish State
         + "ET" + "ETH"  // Ethiopia
         + "FI" + "FIN"  // Finland, Republic of
-        + "FJ" + "FJI"  // Fiji, Republic of the Fiji Islands
+        + "FJ" + "FJI"  // Fiji, Republic of
         + "FK" + "FLK"  // Falkland Islands (Malvinas)
         + "FM" + "FSM"  // Micronesia, Federated States of
         + "FO" + "FRO"  // Faeroe Islands
@@ -306,7 +306,7 @@ class LocaleISOData {
         + "GD" + "GRD"  // Grenada
         + "GE" + "GEO"  // Georgia
         + "GF" + "GUF"  // French Guiana
-        + "GG" + "GGY"  // Guernsey
+        + "GG" + "GGY"  // Guernsey, Bailiwick of
         + "GH" + "GHA"  // Ghana, Republic of
         + "GI" + "GIB"  // Gibraltar
         + "GL" + "GRL"  // Greenland
@@ -325,7 +325,7 @@ class LocaleISOData {
         + "HN" + "HND"  // Honduras, Republic of
         + "HR" + "HRV"  // Hrvatska (Croatia)
         + "HT" + "HTI"  // Haiti, Republic of
-        + "HU" + "HUN"  // Hungary, Hungarian People's Republic
+        + "HU" + "HUN"  // Hungary
         + "ID" + "IDN"  // Indonesia, Republic of
         + "IE" + "IRL"  // Ireland
         + "IL" + "ISR"  // Israel, State of
@@ -336,7 +336,7 @@ class LocaleISOData {
         + "IR" + "IRN"  // Iran, Islamic Republic of
         + "IS" + "ISL"  // Iceland, Republic of
         + "IT" + "ITA"  // Italy, Italian Republic
-        + "JE" + "JEY"  // Jersey
+        + "JE" + "JEY"  // Jersey, Bailiwick of
         + "JM" + "JAM"  // Jamaica
         + "JO" + "JOR"  // Jordan, Hashemite Kingdom of
         + "JP" + "JPN"  // Japan
@@ -361,17 +361,17 @@ class LocaleISOData {
         + "LT" + "LTU"  // Lithuania
         + "LU" + "LUX"  // Luxembourg, Grand Duchy of
         + "LV" + "LVA"  // Latvia
-        + "LY" + "LBY"  // Libyan Arab Jamahiriya
+        + "LY" + "LBY"  // Libya
         + "MA" + "MAR"  // Morocco, Kingdom of
         + "MC" + "MCO"  // Monaco, Principality of
         + "MD" + "MDA"  // Moldova, Republic of
-        + "ME" + "MNE"  // Montenegro, Republic of
-        + "MF" + "MAF"  // Saint Martin
+        + "ME" + "MNE"  // Montenegro
+        + "MF" + "MAF"  // Saint Martin (French part)
         + "MG" + "MDG"  // Madagascar, Republic of
         + "MH" + "MHL"  // Marshall Islands
         + "MK" + "MKD"  // Macedonia, the former Yugoslav Republic of
         + "ML" + "MLI"  // Mali, Republic of
-        + "MM" + "MMR"  // Myanmar
+        + "MM" + "MMR"  // Myanmar, Republic of the Union of
         + "MN" + "MNG"  // Mongolia, Mongolian People's Republic
         + "MO" + "MAC"  // Macao, Special Administrative Region of China
         + "MP" + "MNP"  // Northern Mariana Islands
@@ -395,7 +395,7 @@ class LocaleISOData {
         + "NO" + "NOR"  // Norway, Kingdom of
         + "NP" + "NPL"  // Nepal, Federal Democratic Republic of
         + "NR" + "NRU"  // Nauru, Republic of
-        + "NU" + "NIU"  // Niue, Republic of
+        + "NU" + "NIU"  // Niue
         + "NZ" + "NZL"  // New Zealand
         + "OM" + "OMN"  // Oman, Sultanate of
         + "PA" + "PAN"  // Panama, Republic of
@@ -408,7 +408,7 @@ class LocaleISOData {
         + "PM" + "SPM"  // St. Pierre and Miquelon
         + "PN" + "PCN"  // Pitcairn Island
         + "PR" + "PRI"  // Puerto Rico
-        + "PS" + "PSE"  // Palestinian Territory, Occupied
+        + "PS" + "PSE"  // Palestine, State of
         + "PT" + "PRT"  // Portugal, Portuguese Republic
         + "PW" + "PLW"  // Palau
         + "PY" + "PRY"  // Paraguay, Republic of
@@ -421,10 +421,10 @@ class LocaleISOData {
         + "SA" + "SAU"  // Saudi Arabia, Kingdom of
         + "SB" + "SLB"  // Solomon Islands
         + "SC" + "SYC"  // Seychelles, Republic of
-        + "SD" + "SDN"  // Sudan, Democratic Republic of the
+        + "SD" + "SDN"  // Sudan, Republic of the
         + "SE" + "SWE"  // Sweden, Kingdom of
         + "SG" + "SGP"  // Singapore, Republic of
-        + "SH" + "SHN"  // St. Helena
+        + "SH" + "SHN"  // Saint Helena, Ascension and Tristan da Cunha
         + "SI" + "SVN"  // Slovenia
         + "SJ" + "SJM"  // Svalbard & Jan Mayen Islands
         + "SK" + "SVK"  // Slovakia (Slovak Republic)
@@ -433,7 +433,7 @@ class LocaleISOData {
         + "SN" + "SEN"  // Senegal, Republic of
         + "SO" + "SOM"  // Somalia, Somali Republic
         + "SR" + "SUR"  // Suriname, Republic of
-        + "SS" + "SSD"  // South Sudan
+        + "SS" + "SSD"  // South Sudan, Republic of
         + "ST" + "STP"  // Sao Tome and Principe, Democratic Republic of
         + "SV" + "SLV"  // El Salvador, Republic of
         + "SX" + "SXM"  // Sint Maarten (Dutch part)