diff --git a/frontend/app/constants/countries.js b/frontend/app/constants/countries.js
index 68a65b000..9927066da 100644
--- a/frontend/app/constants/countries.js
+++ b/frontend/app/constants/countries.js
@@ -30,7 +30,7 @@ export default {
   BL: 'Saint Barthélemy',
   BM: 'Bermuda',
   BN: 'Brunei Darussalam',
-  BO: 'Bolivia, Plurinational State Of',
+  BO: 'Bolivia',
   BQ: 'Bonaire, Saint Eustatius And Saba',
   BR: 'Brazil',
   BS: 'Bahamas',
@@ -41,10 +41,10 @@ export default {
   BY: 'Belarus',
   BZ: 'Belize',
   CA: 'Canada',
-  CC: 'Cocos (Keeling) Islands',
-  CD: 'Democratic Republic Of Congo',
+  CC: 'Cocos Islands',
+  CD: 'Congo',
   CF: 'Central African Republic',
-  CG: 'Republic Of Congo',
+  CG: 'Congo',
   CH: 'Switzerland',
   CI: "Côte d'Ivoire",
   CK: 'Cook Islands',
@@ -62,7 +62,7 @@ export default {
   CX: 'Christmas Island',
   CY: 'Cyprus',
   CZ: 'Czech Republic',
-  DD: 'German Democratic Republic',
+  DD: 'Germany',
   DE: 'Germany',
   DG: 'Diego Garcia',
   DJ: 'Djibouti',
@@ -82,7 +82,7 @@ export default {
   FI: 'Finland',
   FJ: 'Fiji',
   FK: 'Falkland Islands',
-  FM: 'Micronesia, Federated States Of',
+  FM: 'Micronesia',
   FO: 'Faroe Islands',
   FQ: 'French Southern and Antarctic Territories',
   FR: 'France',
@@ -121,7 +121,7 @@ export default {
   IN: 'India',
   IO: 'British Indian Ocean Territory',
   IQ: 'Iraq',
-  IR: 'Iran, Islamic Republic Of',
+  IR: 'Iran',
   IS: 'Iceland',
   IT: 'Italy',
   JE: 'Jersey',
@@ -135,12 +135,12 @@ export default {
   KI: 'Kiribati',
   KM: 'Comoros',
   KN: 'Saint Kitts And Nevis',
-  KP: "Korea, Democratic People's Republic Of",
-  KR: 'Korea, Republic Of',
+  KP: "Korea",
+  KR: 'Korea',
   KW: 'Kuwait',
   KY: 'Cayman Islands',
   KZ: 'Kazakhstan',
-  LA: "Lao People's Democratic Republic",
+  LA: "Laos",
   LB: 'Lebanon',
   LC: 'Saint Lucia',
   LI: 'Liechtenstein',
@@ -159,7 +159,7 @@ export default {
   MG: 'Madagascar',
   MH: 'Marshall Islands',
   MI: 'Midway Islands',
-  MK: 'Macedonia, The Former Yugoslav Republic Of',
+  MK: 'Macedonia',
   ML: 'Mali',
   MM: 'Myanmar',
   MN: 'Mongolia',
@@ -192,7 +192,7 @@ export default {
   NZ: 'New Zealand',
   OM: 'Oman',
   PA: 'Panama',
-  PC: 'Pacific Islands, Trust Territory of the',
+  PC: 'Pacific Islands',
   PE: 'Peru',
   PF: 'French Polynesia',
   PG: 'Papua New Guinea',
@@ -202,7 +202,7 @@ export default {
   PM: 'Saint Pierre And Miquelon',
   PN: 'Pitcairn',
   PR: 'Puerto Rico',
-  PS: 'Palestinian Territory, Occupied',
+  PS: 'Palestine',
   PT: 'Portugal',
   PU: 'U.S. Miscellaneous Pacific Islands',
   PW: 'Palau',
@@ -245,7 +245,7 @@ export default {
   TH: 'Thailand',
   TJ: 'Tajikistan',
   TK: 'Tokelau',
-  TL: 'Timor-Leste, Democratic Republic of',
+  TL: 'Timor-Leste',
   TM: 'Turkmenistan',
   TN: 'Tunisia',
   TO: 'Tonga',
@@ -254,7 +254,7 @@ export default {
   TT: 'Trinidad And Tobago',
   TV: 'Tuvalu',
   TW: 'Taiwan',
-  TZ: 'Tanzania, United Republic Of',
+  TZ: 'Tanzania',
   UA: 'Ukraine',
   UG: 'Uganda',
   UM: 'United States Minor Outlying Islands',
@@ -263,17 +263,17 @@ export default {
   UZ: 'Uzbekistan',
   VA: 'Vatican City State',
   VC: 'Saint Vincent And The Grenadines',
-  VD: 'Viet-Nam, Democratic Republic of',
-  VE: 'Venezuela, Bolivarian Republic Of',
+  VD: 'VietNam',
+  VE: 'Venezuela',
   VG: 'Virgin Islands (British)',
   VI: 'Virgin Islands (US)',
-  VN: 'Viet Nam',
+  VN: 'VietNam',
   VU: 'Vanuatu',
   WF: 'Wallis And Futuna',
   WK: 'Wake Island',
   WS: 'Samoa',
   XK: 'Kosovo',
-  YD: 'Yemen, Democratic',
+  YD: 'Yemen',
   YE: 'Yemen',
   YT: 'Mayotte',
   YU: 'Yugoslavia',